QmlDesigner: Refactor AbstractFormEditorTool::topMovableFormEditorItem

Change-Id: If3292bd55f5efcde27b374b3902e9bf0b0678356
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp

@@ -139,12 +139,16 @@ QGraphicsItem *AbstractFormEditorTool::topMovableGraphicsItem(const QList<QGraph
 
     return 0;
 }
-FormEditorItem *AbstractFormEditorTool::topMovableFormEditorItem(const QList<QGraphicsItem*> &itemList)
+FormEditorItem *AbstractFormEditorTool::topMovableFormEditorItem(const QList<QGraphicsItem*> &itemList, bool selectOnlyContentItems)
 {
     foreach (QGraphicsItem *item, itemList) {
         FormEditorItem *formEditorItem = FormEditorItem::fromQGraphicsItem(item);
         if (formEditorItem
-           && (formEditorItem->qmlItemNode().instanceHasShowContent()))
+                && formEditorItem->qmlItemNode().isValid()
+                && !formEditorItem->qmlItemNode().instanceIsInLayoutable()
+                && formEditorItem->qmlItemNode().instanceIsMovable()
+                && formEditorItem->qmlItemNode().modelIsMovable()
+                && (formEditorItem->qmlItemNode().instanceHasShowContent() || !selectOnlyContentItems))
             return formEditorItem;
     }
 

src/plugins/qmldesigner/components/formeditor/abstractformeditortool.h

@@ -90,7 +90,7 @@ public:
     QList<FormEditorItem*> items() const;
 
     static QGraphicsItem* topMovableGraphicsItem(const QList<QGraphicsItem*> &itemList);
-    static FormEditorItem* topMovableFormEditorItem(const QList<QGraphicsItem*> &itemList);
+    static FormEditorItem* topMovableFormEditorItem(const QList<QGraphicsItem*> &itemList, bool selectOnlyContentItems);
     bool topItemIsMovable(const QList<QGraphicsItem*> &itemList);
     bool topSelectedItemIsMovable(const QList<QGraphicsItem*> &itemList);
     bool topItemIsResizeHandle(const QList<QGraphicsItem*> &itemList);