feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Don't drop anymore in a layoutable

Browse Source 
The behavior to drop something in a layoutable is quite strange because
we don't support visual layouting at all.

Task-number: QTCREATORBUG-11543
Change-Id: I4d455d3a6f099edfeacbdb0def2e9e9c4489768c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
2014-02-24 16:42:11 +01:00
parent acbd1e3c60
commit b6ea314a55
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qmldesigner/components/formeditor/dragtool.cpp
View File

@@ -191,8 +191,11 @@ FormEditorItem* DragTool::calculateContainer(const QPointF &point, FormEditorIte
QList<QGraphicsItem *> list = scene()->items(point); QList<QGraphicsItem *> list = scene()->items(point);
foreach (QGraphicsItem *item, list) { foreach (QGraphicsItem *item, list) {
FormEditorItem *formEditorItem = FormEditorItem::fromQGraphicsItem(item); FormEditorItem *formEditorItem = FormEditorItem::fromQGraphicsItem(item);
if (formEditorItem && formEditorItem != currentItem && formEditorItem->isContainer() if (formEditorItem
&& !isAncestorOf(currentItem, formEditorItem)) && formEditorItem != currentItem
&& formEditorItem->isContainer()
&& !formEditorItem->qmlItemNode().modelNode().metaInfo().isLayoutable()
&& !isAncestorOf(currentItem, formEditorItem))
return formEditorItem; return formEditorItem;
} }