summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@digia.com>2013-09-04 13:11:54 +0200
committerMarco Bubke <marco.bubke@digia.com>2013-09-04 15:14:49 +0200
commit6cf4b5caad5d68f7921177610c96f47190cb208f (patch)
treee362c5671b155c755c62eb09d3bd43614f38498b
parentdf695c6a4fcca0b16e9df532cc9f82fca7f5910f (diff)
downloadqt-creator-6cf4b5caad5d68f7921177610c96f47190cb208f.tar.gz
QmlDesigner: Items should be only selected if the have no xy binding
In the rubber band selector. Change-Id: I132681870bc5ff75c43c0874bee9b7a76362e35e Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
-rw-r--r--src/plugins/qmldesigner/components/formeditor/rubberbandselectionmanipulator.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/qmldesigner/components/formeditor/rubberbandselectionmanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/rubberbandselectionmanipulator.cpp
index c6a3b4ba14..727da8ef84 100644
--- a/src/plugins/qmldesigner/components/formeditor/rubberbandselectionmanipulator.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/rubberbandselectionmanipulator.cpp
@@ -103,6 +103,7 @@ void RubberBandSelectionManipulator::select(SelectionType selectionType)
&& formEditorItem->qmlItemNode().isValid()
&& m_beginFormEditorItem->childItems().contains(formEditorItem)
&& formEditorItem->qmlItemNode().instanceIsMovable()
+ && formEditorItem->qmlItemNode().modelIsMovable()
&& !formEditorItem->qmlItemNode().instanceIsInLayoutable())
{
newNodeList.append(formEditorItem->qmlItemNode());
@@ -112,6 +113,7 @@ void RubberBandSelectionManipulator::select(SelectionType selectionType)
if (newNodeList.isEmpty()
&& m_beginFormEditorItem->qmlItemNode().isValid()
&& m_beginFormEditorItem->qmlItemNode().instanceIsMovable()
+ && m_beginFormEditorItem->qmlItemNode().modelIsMovable()
&& !m_beginFormEditorItem->qmlItemNode().instanceIsInLayoutable())
newNodeList.append(m_beginFormEditorItem->qmlItemNode());