From a810c0847c20fb3b0c65032fae6eaec7eedec6f3 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@digia.com>
Date: Wed, 4 Sep 2013 13:08:04 +0200
Subject: [PATCH] QmlDesigner: Only top items without xy bindings are movable
Change-Id: Ic90faca4ffe71fbc52e3c7110a3a524ca9cbba27
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
---
.../components/formeditor/abstractformeditortool.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp b/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp
index 875254ee49e..233e635d80e 100644
--- a/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp
@@ -103,6 +103,7 @@ bool AbstractFormEditorTool::topSelectedItemIsMovable(const QList<QGraphicsItem*
if (formEditorItem
&& selectedNodes.contains(formEditorItem->qmlItemNode())
&& formEditorItem->qmlItemNode().instanceIsMovable()
+ && formEditorItem->qmlItemNode().modelIsMovable()
&& !formEditorItem->qmlItemNode().instanceIsInLayoutable()
&& (formEditorItem->qmlItemNode().instanceHasShowContent()))
return true;
@@ -113,6 +114,7 @@ bool AbstractFormEditorTool::topSelectedItemIsMovable(const QList<QGraphicsItem*
if (formEditorItem
&& formEditorItem->qmlItemNode().isValid()
&& formEditorItem->qmlItemNode().instanceIsMovable()
+ && formEditorItem->qmlItemNode().modelIsMovable()
&& !formEditorItem->qmlItemNode().instanceIsInLayoutable()
&& selectedNodes.contains(formEditorItem->qmlItemNode()))
return true;
--
GitLab