From b3ef7a71e224c874227a9682933800410196b9f3 Mon Sep 17 00:00:00 2001 From: cc9cii Date: Thu, 9 Oct 2014 05:56:44 +1100 Subject: [PATCH] Different implementation of update overlay fix. --- apps/opencs/view/render/pagedworldspacewidget.cpp | 7 ------- apps/opencs/view/render/pagedworldspacewidget.hpp | 4 ---- apps/opencs/view/render/worldspacewidget.cpp | 5 +++++ apps/opencs/view/render/worldspacewidget.hpp | 4 +++- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp index 318abb4b01..d818de79b2 100644 --- a/apps/opencs/view/render/pagedworldspacewidget.cpp +++ b/apps/opencs/view/render/pagedworldspacewidget.cpp @@ -455,13 +455,6 @@ CSVWidget::SceneToolToggle *CSVRender::PagedWorldspaceWidget::makeControlVisibil return mControlElements; } -void CSVRender::PagedWorldspaceWidget::elementSelectionChanged () -{ - WorldspaceWidget::elementSelectionChanged(); - - updateOverlay(); -} - void CSVRender::PagedWorldspaceWidget::cellDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight) { diff --git a/apps/opencs/view/render/pagedworldspacewidget.hpp b/apps/opencs/view/render/pagedworldspacewidget.hpp index 26b8a386a7..611ebd04bf 100644 --- a/apps/opencs/view/render/pagedworldspacewidget.hpp +++ b/apps/opencs/view/render/pagedworldspacewidget.hpp @@ -88,10 +88,6 @@ namespace CSVRender void cellSelectionChanged (const CSMWorld::CellSelection& selection); - protected slots: - - virtual void elementSelectionChanged(); - private slots: virtual void cellDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight); diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp index fa304dd829..da1c80c4dc 100644 --- a/apps/opencs/view/render/worldspacewidget.cpp +++ b/apps/opencs/view/render/worldspacewidget.cpp @@ -313,4 +313,9 @@ void CSVRender::WorldspaceWidget::elementSelectionChanged() { setVisibilityMask (getElementMask()); flagAsModified(); + updateOverlay(); +} + +void CSVRender::WorldspaceWidget::updateOverlay() +{ } diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp index 6204e7f02e..4830d772b9 100644 --- a/apps/opencs/view/render/worldspacewidget.hpp +++ b/apps/opencs/view/render/worldspacewidget.hpp @@ -88,6 +88,8 @@ namespace CSVRender CSMDoc::Document& getDocument(); + virtual void updateOverlay(); + private: void dragEnterEvent(QDragEnterEvent *event); @@ -125,7 +127,7 @@ namespace CSVRender protected slots: - virtual void elementSelectionChanged(); + void elementSelectionChanged(); signals: