diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp index 53a20b5a133ed893b50c2c3d06e2d8708cada854..a60ef2fd7bd487338bf6d5fb0275f9fab35b6109 100644 --- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp +++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp @@ -42,7 +42,7 @@ static inline QString captionForModelNode(const ModelNode &modelNode) return modelNode.id(); } -static inline bool contains(const QmlItemNode &node, const QPoint &position) +static inline bool contains(const QmlItemNode &node, const QPointF &position) { return node.isValid() && node.instanceSceneTransform().mapRect(node.instanceBoundingRect()).contains(position); } @@ -346,7 +346,7 @@ public: foreach (const ModelNode &node, m_selectionContext.view()->allModelNodes()) { if (node != m_selectionContext.currentSingleSelectedNode() && node != parentNode - && contains(node, m_selectionContext.scenePos()) + && contains(node, m_selectionContext.scenePosition()) && !node.isRootNode()) { m_selectionContext.setTargetNode(node); QString what = QString(QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Select: %1")).arg(captionForModelNode(node)); diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu.cpp index 3af9adca2d72cc0671f1baa83d22c078855b4a6a..51b80734b1bd72cb13bfe4d80e83055139c200f8 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu.cpp +++ b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu.cpp @@ -94,7 +94,7 @@ void ModelNodeContextMenu::execute(const QPoint &position, bool selectionMenuBoo QMenu* mainMenu = new QMenu(); m_selectionContext.setShowSelectionTools(selectionMenuBool); - m_selectionContext.setScenePos(m_scenePos); + m_selectionContext.setScenePosition(m_scenePos); QSet factories = diff --git a/src/plugins/qmldesigner/components/componentcore/selectioncontext.cpp b/src/plugins/qmldesigner/components/componentcore/selectioncontext.cpp index 71673a101b48e12a51853baab5db9fe2b3296616..5c01a69debd590eddbcd372c8c7be43eec2cf576 100644 --- a/src/plugins/qmldesigner/components/componentcore/selectioncontext.cpp +++ b/src/plugins/qmldesigner/components/componentcore/selectioncontext.cpp @@ -101,12 +101,12 @@ bool SelectionContext::showSelectionTools() const return m_showSelectionTools; } -void SelectionContext::setScenePos(const QPoint &postition) +void SelectionContext::setScenePosition(const QPointF &postition) { m_scenePosition = postition; } -QPoint SelectionContext::scenePos() const +QPointF SelectionContext::scenePosition() const { return m_scenePosition; } diff --git a/src/plugins/qmldesigner/components/componentcore/selectioncontext.h b/src/plugins/qmldesigner/components/componentcore/selectioncontext.h index e2ad1b41527f63f282ce1ce234352f6af72e236e..e5a4705af4b492c076094cee35395898df5a328c 100644 --- a/src/plugins/qmldesigner/components/componentcore/selectioncontext.h +++ b/src/plugins/qmldesigner/components/componentcore/selectioncontext.h @@ -29,7 +29,7 @@ #include #include -#include +#include #ifndef SELECTIONCONTEXT_H #define SELECTIONCONTEXT_H @@ -58,8 +58,8 @@ public: void setShowSelectionTools(bool show); bool showSelectionTools() const; - void setScenePos(const QPoint &postition); - QPoint scenePos() const; + void setScenePosition(const QPointF &postition); + QPointF scenePosition() const; void setToggled(bool toggled); bool toggled() const; @@ -70,7 +70,7 @@ private: QWeakPointer m_view; ModelNode m_targetNode; bool m_showSelectionTools; - QPoint m_scenePosition; + QPointF m_scenePosition; bool m_toggled; };