From 7640875f9d09b6b8748089e4b5915e717e4c37ff Mon Sep 17 00:00:00 2001 From: cc9cii Date: Tue, 7 Oct 2014 10:34:30 +1100 Subject: [PATCH] More cleanup. --- apps/opencs/view/render/pagedworldspacewidget.cpp | 15 ++++++++------- apps/opencs/view/render/scenewidget.cpp | 1 - 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp index b397aa7bb..03e5e1427 100644 --- a/apps/opencs/view/render/pagedworldspacewidget.cpp +++ b/apps/opencs/view/render/pagedworldspacewidget.cpp @@ -117,17 +117,18 @@ bool CSVRender::PagedWorldspaceWidget::adjustCells() void CSVRender::PagedWorldspaceWidget::mouseReleaseEvent (QMouseEvent *event) { - std::list::iterator iter = mTextOverlays.begin(); - for(; iter != mTextOverlays.end(); ++iter) + if(event->button() == Qt::RightButton) { - if(mDisplayCellCoord && - (*iter)->isEnabled() && (*iter)->container().contains(event->x(), event->y())) + std::list::iterator iter = mTextOverlays.begin(); + for(; iter != mTextOverlays.end(); ++iter) { - std::cout << "clicked: " << (*iter)->getCaption() << std::endl; + if(mDisplayCellCoord && + (*iter)->isEnabled() && (*iter)->container().contains(event->x(), event->y())) + { + std::cout << "clicked: " << (*iter)->getCaption() << std::endl; + } } } - - SceneWidget::mouseReleaseEvent(event); } void CSVRender::PagedWorldspaceWidget::updateOverlay() diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp index 486db6a15..d58ac8ec3 100644 --- a/apps/opencs/view/render/scenewidget.cpp +++ b/apps/opencs/view/render/scenewidget.cpp @@ -18,7 +18,6 @@ #include "navigation.hpp" #include "lighting.hpp" -#include "elements.hpp" // FIXME: for testing only namespace CSVRender {