diff options
Diffstat (limited to 'src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp')
-rw-r--r-- | src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp index 796549f237..47b1519d9a 100644 --- a/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp @@ -81,6 +81,10 @@ InspectTool::InspectTool(QQuickViewInspector *inspector, QQuickView *view) : m_pressAndHoldTimer.setSingleShot(true); m_pressAndHoldTimer.setInterval(Constants::PressAndHoldTimeout); connect(&m_pressAndHoldTimer, SIGNAL(timeout()), SLOT(zoomTo100())); + //Timer to display selected item's name + m_nameDisplayTimer.setSingleShot(true); + m_nameDisplayTimer.setInterval(qApp->styleHints()->mouseDoubleClickInterval()); + connect(&m_nameDisplayTimer, SIGNAL(timeout()), SLOT(showSelectedItemName())); enable(true); } @@ -259,10 +263,13 @@ void InspectTool::touchEvent(QTouchEvent *event) m_tapEvent = false; bool doubleTap = event->timestamp() - m_touchTimestamp < static_cast<ulong>(qApp->styleHints()->mouseDoubleClickInterval()); - if (doubleTap) + if (doubleTap) { + m_nameDisplayTimer.stop(); selectNextItem(); - else + } + else { selectItem(); + } m_touchTimestamp = event->timestamp(); } m_didPressAndHold = false; @@ -387,6 +394,7 @@ void InspectTool::selectNextItem() else m_lastItem = items[0]; inspector()->setSelectedItems(QList<QQuickItem*>() << m_lastItem); + showSelectedItemName(); break; } } @@ -396,11 +404,14 @@ void InspectTool::selectItem() { if (!inspector()->topVisibleItemAt(m_mousePosition)) return; - if (m_lastClickedItem == inspector()->topVisibleItemAt(m_mousePosition)) + if (m_lastClickedItem == inspector()->topVisibleItemAt(m_mousePosition)) { + m_nameDisplayTimer.start(); return; + } m_lastClickedItem = inspector()->topVisibleItemAt(m_mousePosition); m_lastItem = m_lastClickedItem; inspector()->setSelectedItems(QList<QQuickItem*>() << m_lastClickedItem); + showSelectedItemName(); } QQuickViewInspector *InspectTool::inspector() const @@ -408,5 +419,10 @@ QQuickViewInspector *InspectTool::inspector() const return static_cast<QQuickViewInspector*>(AbstractTool::inspector()); } +void InspectTool::showSelectedItemName() +{ + inspector()->showSelectedItemName(m_lastItem, m_mousePosition); +} + } // namespace QtQuick2 } // namespace QmlJSDebugger |