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

Subject: QmlDesigner: prefer visible items when selecting

Browse Source 
Ensure nearestFormEditorItem() returns a visible FormEditorItem
before considering selection weight. Items without visual content
(e.g. MouseArea) remain treated as visible.

other refactorings:
- Remove redundant qmlItemNode.isValid() guard – helpers validate
  internally or its not necessary
- Early-continue when FormEditorItem is nullptr for clarity.
- Compare a single isVisible flag instead of nested if chains.

Task-number: QDS-14210
Change-Id: I772586c24b6cd61ef00add6633815b5d9b43b666
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Thomas Hartmann
2025-01-22 16:34:57 +01:00
committed by Tim Jenssen
parent 0bc56fec30
commit d07de22660
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp
View File

@@ -204,30 +204,40 @@ FormEditorItem *AbstractFormEditorTool::topMovableFormEditorItem(const QList<QGr
return nullptr; return nullptr;
} }
FormEditorItem* AbstractFormEditorTool::nearestFormEditorItem(const QPointF &point, const QList<QGraphicsItem*> &itemList) FormEditorItem *AbstractFormEditorTool::nearestFormEditorItem(const QPointF &point,
const QList<QGraphicsItem *> &itemList)
{ {
NanotraceHR::Tracer tracer{"abstract form editor tool nearest form editor item", category()}; NanotraceHR::Tracer tracer{"abstract form editor tool nearest form editor item", category()};
FormEditorItem *nearestItem = nullptr; FormEditorItem *nearestItem = nullptr;
for (QGraphicsItem *item : itemList) { for (QGraphicsItem *item : itemList) {
FormEditorItem *formEditorItem = FormEditorItem::fromQGraphicsItem(item); auto formEditorItem = FormEditorItem::fromQGraphicsItem(item);
if (!formEditorItem)
if (formEditorItem && formEditorItem->flowHitTest(point))
return formEditorItem;
if (!formEditorItem || !formEditorItem->qmlItemNode().isValid())
continue; continue;
if (formEditorItem->flowHitTest(point))
return formEditorItem;
if (formEditorItem->parentItem() && !formEditorItem->parentItem()->isContentVisible()) if (formEditorItem->parentItem() && !formEditorItem->parentItem()->isContentVisible())
continue; continue;
if (formEditorItem && ModelUtils::isThisOrAncestorLocked(formEditorItem->qmlItemNode().modelNode())) auto qmlItemNode = formEditorItem->qmlItemNode();
if (ModelUtils::isThisOrAncestorLocked(qmlItemNode.modelNode()))
continue; continue;
if (!nearestItem) if (!nearestItem) {
nearestItem = formEditorItem; nearestItem = formEditorItem;
else if (formEditorItem->selectionWeigth(point, 1) < nearestItem->selectionWeigth(point, 0)) continue;
}
bool isVisible = qmlItemNode.instanceIsVisible();
if (isVisible != nearestItem->qmlItemNode().instanceIsVisible()) {
if (isVisible)
nearestItem = formEditorItem; nearestItem = formEditorItem;
} else if (formEditorItem->selectionWeigth(point, 1) < nearestItem->selectionWeigth(point, 0)) {
nearestItem = formEditorItem;
}
} }
if (nearestItem && nearestItem->qmlItemNode().isInStackedContainer()) if (nearestItem && nearestItem->qmlItemNode().isInStackedContainer())