From 5f7969d08a87fe9a43fa989bfae0cebc9aa698f6 Mon Sep 17 00:00:00 2001
From: Lasse Holmstedt <lasse.holmstedt@nokia.com>
Date: Tue, 3 Aug 2010 09:45:11 +0200
Subject: [PATCH] QML Observer: Go into context dbl click only if using
selection tool
---
src/libs/qmljsdebugger/qdeclarativedesignview.cpp | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/libs/qmljsdebugger/qdeclarativedesignview.cpp b/src/libs/qmljsdebugger/qdeclarativedesignview.cpp
index 07ea92ac469..be7c1ebf608 100644
--- a/src/libs/qmljsdebugger/qdeclarativedesignview.cpp
+++ b/src/libs/qmljsdebugger/qdeclarativedesignview.cpp
@@ -107,6 +107,8 @@ QDeclarativeDesignView::QDeclarativeDesignView(QWidget *parent) :
connect(data->subcomponentEditorTool, SIGNAL(contextPathChanged(QStringList)), qmlDesignDebugServer(), SLOT(contextPathUpdated(QStringList)));
data->createToolbar();
+
+ data->_q_changeToSingleSelectTool();
}
QDeclarativeDesignView::~QDeclarativeDesignView()
@@ -277,6 +279,13 @@ void QDeclarativeDesignView::mouseDoubleClickEvent(QMouseEvent *event)
QDeclarativeView::mouseDoubleClickEvent(event);
return;
}
+
+ if (data->currentToolMode != Constants::SelectionToolMode
+ && data->currentToolMode != Constants::MarqueeSelectionToolMode)
+ {
+ return;
+ }
+
QGraphicsItem *itemToEnter = 0;
QList<QGraphicsItem*> itemList = items(event->pos());
data->filterForSelection(itemList);
--
GitLab