m_pressAndHoldTimer.setInterval(Constants::PressAndHoldTimeout);
connect(&m_pressAndHoldTimer, SIGNAL(timeout()), SLOT(zoomTo100()));
enable(true);
+ inspector->addToUnselectableItems(m_hoverHighlight);
}
InspectTool::~InspectTool()
{
m_mousePosition = event->posF();
m_pressAndHoldTimer.stop();
- if (event->button() == Qt::LeftButton)
+ if (event->button() == Qt::LeftButton && !m_dragStarted) {
selectItem();
+ m_hoverHighlight->setVisible(false);
+ }
}
void InspectTool::mouseDoubleClickEvent(QMouseEvent *event)
{
m_mousePosition = event->posF();
m_pressAndHoldTimer.stop();
- if (event->button() == Qt::LeftButton)
+ if (event->button() == Qt::LeftButton) {
selectNextItem();
+ m_hoverHighlight->setVisible(false);
+ }
}
void InspectTool::mouseMoveEvent(QMouseEvent *event)
if (!item || item == m_lastClickedItem) {
m_hoverHighlight->setVisible(false);
} else {
+ if (item->parentItem())
+ m_hoverHighlight->setParentItem(item->parentItem());
+ else
+ m_hoverHighlight->setParentItem(inspector()->overlay());
m_hoverHighlight->setItem(item);
m_hoverHighlight->setVisible(true);
}
/*
* Collects all the items at the given position, from top to bottom.
*/
-static void collectItemsAt(QQuickItem *item, const QPointF &pos, QQuickItem *overlay,
+static void collectItemsAt(QQuickItem *item, const QPointF &pos,
+ const QList<QQuickItem *> &unselectableItems,
QList<QQuickItem *> &resultList)
{
- if (item == overlay)
+ if (unselectableItems.contains(item))
return;
if (item->flags() & QQuickItem::ItemClipsChildrenToShape) {
QList<QQuickItem *> children = QQuickItemPrivate::get(item)->paintOrderChildItems();
for (int i = children.count() - 1; i >= 0; --i) {
QQuickItem *child = children.at(i);
- collectItemsAt(child, item->mapToItem(child, pos), overlay, resultList);
+ collectItemsAt(child, item->mapToItem(child, pos), unselectableItems, resultList);
}
if (!QRectF(0, 0, item->width(), item->height()).contains(pos))
* Returns the first visible item at the given position, or 0 when no such
* child exists.
*/
-static QQuickItem *itemAt(QQuickItem *item, const QPointF &pos, QQuickItem *overlay)
+static QQuickItem *itemAt(QQuickItem *item, const QPointF &pos,
+ const QList<QQuickItem *> &unselectableItems)
{
- if (item == overlay)
+ if (unselectableItems.contains(item))
return 0;
if (!item->isVisible() || item->opacity() == 0.0)
QList<QQuickItem *> children = QQuickItemPrivate::get(item)->paintOrderChildItems();
for (int i = children.count() - 1; i >= 0; --i) {
QQuickItem *child = children.at(i);
- if (QQuickItem *betterCandidate = itemAt(child, item->mapToItem(child, pos), overlay))
+ if (QQuickItem *betterCandidate = itemAt(child, item->mapToItem(child, pos),
+ unselectableItems))
return betterCandidate;
}
if (QQuickItem *root = view->rootItem())
m_overlay->setParentItem(root);
+ m_unselectableItems.append(m_overlay);
view->installEventFilter(this);
setCurrentTool(m_inspectTool);
}
setCurrentTool(m_inspectTool);
emit inspectToolActivated();
break;
+ default:
+ break;
}
}
QQuickItem *QQuickViewInspector::topVisibleItemAt(const QPointF &pos) const
{
QQuickItem *root = m_view->rootItem();
- return itemAt(root, root->mapFromScene(pos), m_overlay);
+ return itemAt(root, root->mapFromScene(pos), m_unselectableItems);
}
QList<QQuickItem *> QQuickViewInspector::itemsAt(const QPointF &pos) const
{
QQuickItem *root = m_view->rootItem();
QList<QQuickItem *> resultList;
- collectItemsAt(root, root->mapFromScene(pos), m_overlay, resultList);
+ collectItemsAt(root, root->mapFromScene(pos), m_unselectableItems,
+ resultList);
return resultList;
}
selectionChanged = true;
item.data()->disconnect(this);
m_selectedItems.removeOne(item);
+ m_unselectableItems.removeOne(m_highlightItems.value(item.data()));
delete m_highlightItems.take(item.data());
}
selectionChanged = true;
connect(item, SIGNAL(destroyed(QObject*)), this, SLOT(removeFromSelectedItems(QObject*)));
m_selectedItems.append(item);
- m_highlightItems.insert(item, new SelectionHighlight(item, m_overlay));
+ SelectionHighlight *selectionHighlightItem;
+ if (item->parentItem())
+ selectionHighlightItem = new SelectionHighlight(item, item->parentItem());
+ else
+ selectionHighlightItem = new SelectionHighlight(item, m_overlay);
+ m_unselectableItems.append(selectionHighlightItem);
+ m_highlightItems.insert(item, selectionHighlightItem);
}
return selectionChanged;
void QQuickViewInspector::removeFromSelectedItems(QObject *object)
{
if (QQuickItem *item = qobject_cast<QQuickItem*>(object)) {
- if (m_selectedItems.removeOne(item))
- delete m_highlightItems.take(item);
+ if (m_selectedItems.removeOne(item)) {
+ QQuickItem *highlightItem = m_highlightItems.take(item);
+ m_unselectableItems.removeOne(highlightItem);
+ delete highlightItem;
+ }
}
}
return constructedName;
}
+void QQuickViewInspector::addToUnselectableItems(QQuickItem *item)
+{
+ m_unselectableItems.append(item);
+}
+
} // namespace QtQuick2
} // namespace QmlJSDebugger