From 6a3561cb87f4f2997be584e696d7a289658a2e1b Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Mon, 5 Aug 2019 22:40:21 +0200 Subject: [PATCH] ui: Change mouse cursor to pointer on graph and code view contents (issue #715) --- src/lib_gui/qt/element/code/QtCodeField.cpp | 2 ++ src/lib_gui/qt/graphics/base/QtLineItemBase.cpp | 2 ++ src/lib_gui/qt/graphics/graph/QtGraphEdge.cpp | 3 +++ src/lib_gui/qt/graphics/graph/QtGraphNode.cpp | 2 ++ src/lib_gui/qt/graphics/graph/QtGraphNodeAccess.cpp | 2 ++ src/lib_gui/qt/graphics/graph/QtGraphNodeText.cpp | 4 ++++ 6 files changed, 15 insertions(+) diff --git a/src/lib_gui/qt/element/code/QtCodeField.cpp b/src/lib_gui/qt/element/code/QtCodeField.cpp index e7ecb619..e0577232 100644 --- a/src/lib_gui/qt/element/code/QtCodeField.cpp +++ b/src/lib_gui/qt/element/code/QtCodeField.cpp @@ -563,6 +563,8 @@ void QtCodeField::setHoveredAnnotations(const std::vector& an m_hoveredAnnotations = annotations; + viewport()->setCursor(annotations.size() ? Qt::PointingHandCursor : Qt::ArrowCursor); + if (annotations.size()) { std::vector tokenIds; diff --git a/src/lib_gui/qt/graphics/base/QtLineItemBase.cpp b/src/lib_gui/qt/graphics/base/QtLineItemBase.cpp index 27f291fd..f72f836a 100644 --- a/src/lib_gui/qt/graphics/base/QtLineItemBase.cpp +++ b/src/lib_gui/qt/graphics/base/QtLineItemBase.cpp @@ -1,6 +1,7 @@ #include "QtLineItemBase.h" #include +#include #include QtLineItemBase::QtLineItemBase(QGraphicsItem* parent) @@ -12,6 +13,7 @@ QtLineItemBase::QtLineItemBase(QGraphicsItem* parent) , m_route(ROUTE_ANY) { this->setAcceptHoverEvents(true); + this->setCursor(Qt::PointingHandCursor); } QtLineItemBase::~QtLineItemBase() diff --git a/src/lib_gui/qt/graphics/graph/QtGraphEdge.cpp b/src/lib_gui/qt/graphics/graph/QtGraphEdge.cpp index 292a85e1..838ad223 100644 --- a/src/lib_gui/qt/graphics/graph/QtGraphEdge.cpp +++ b/src/lib_gui/qt/graphics/graph/QtGraphEdge.cpp @@ -1,5 +1,6 @@ #include "QtGraphEdge.h" +#include #include #include @@ -50,6 +51,8 @@ QtGraphEdge::QtGraphEdge( , m_mousePos(0.0f, 0.0f) , m_mouseMoved(false) { + this->setCursor(Qt::PointingHandCursor); + if (m_direction == TokenComponentAggregation::DIRECTION_BACKWARD) { QtGraphNode* temp = m_owner; diff --git a/src/lib_gui/qt/graphics/graph/QtGraphNode.cpp b/src/lib_gui/qt/graphics/graph/QtGraphNode.cpp index 313b4cf8..d6a4f5a3 100644 --- a/src/lib_gui/qt/graphics/graph/QtGraphNode.cpp +++ b/src/lib_gui/qt/graphics/graph/QtGraphNode.cpp @@ -1,6 +1,7 @@ #include "QtGraphNode.h" #include +#include #include #include #include @@ -42,6 +43,7 @@ void QtGraphNode::hideNode() QtGraphNode::QtGraphNode() { this->setPen(QPen(Qt::transparent)); + this->setCursor(Qt::PointingHandCursor); m_text = new QGraphicsSimpleTextItem(this); m_rect = new QtRoundedRectItem(this); diff --git a/src/lib_gui/qt/graphics/graph/QtGraphNodeAccess.cpp b/src/lib_gui/qt/graphics/graph/QtGraphNodeAccess.cpp index bc9f3862..ffbf1183 100644 --- a/src/lib_gui/qt/graphics/graph/QtGraphNodeAccess.cpp +++ b/src/lib_gui/qt/graphics/graph/QtGraphNodeAccess.cpp @@ -1,6 +1,7 @@ #include "QtGraphNodeAccess.h" #include +#include #include #include @@ -19,6 +20,7 @@ QtGraphNodeAccess::QtGraphNodeAccess(AccessKind accessKind) { std::wstring accessString = TokenComponentAccess::getAccessString(m_accessKind); this->setName(accessString); + this->setCursor(Qt::ArrowCursor); m_text->hide(); std::wstring iconFileName; diff --git a/src/lib_gui/qt/graphics/graph/QtGraphNodeText.cpp b/src/lib_gui/qt/graphics/graph/QtGraphNodeText.cpp index 47e1ae5a..be0ff493 100644 --- a/src/lib_gui/qt/graphics/graph/QtGraphNodeText.cpp +++ b/src/lib_gui/qt/graphics/graph/QtGraphNodeText.cpp @@ -1,8 +1,12 @@ #include "QtGraphNodeText.h" +#include + QtGraphNodeText::QtGraphNodeText(const std::wstring& name, int fontSizeDiff) : m_fontSizeDiff(fontSizeDiff) { + this->setCursor(Qt::ArrowCursor); + setName(name); }