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

Change timing of the selection

Browse Source 
Task-number:   BAUHAUS-276
This commit is contained in:
Marco Bubke
2010-01-12 14:51:11 +01:00
parent cbf3b665bd
commit 3303e0bbd7
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/qmldesigner/components/formeditor/selectiontool.cpp
View File

@@ -41,6 +41,9 @@
namespace QmlDesigner { namespace QmlDesigner {
static const int s_startDragDistance = 20;
static const int s_startDragTime = 50;
SelectionTool::SelectionTool(FormEditorView *editorView) SelectionTool::SelectionTool(FormEditorView *editorView)
: AbstractFormEditorTool(editorView), : AbstractFormEditorTool(editorView),
m_rubberbandSelectionManipulator(editorView->scene()->manipulatorLayerItem(), editorView), m_rubberbandSelectionManipulator(editorView->scene()->manipulatorLayerItem(), editorView),
@@ -95,16 +98,16 @@ void SelectionTool::mouseMoveEvent(const QList<QGraphicsItem*> &/*itemList*/,
{ {
if (m_singleSelectionManipulator.isActive()) { if (m_singleSelectionManipulator.isActive()) {
QPointF mouseMovementVector = m_singleSelectionManipulator.beginPoint() - event->scenePos(); QPointF mouseMovementVector = m_singleSelectionManipulator.beginPoint() - event->scenePos();
if ((mouseMovementVector.toPoint().manhattanLength() > QApplication::startDragDistance()) if ((mouseMovementVector.toPoint().manhattanLength() > s_startDragDistance)
&& (m_mousePressTimer.elapsed() > QApplication::startDragTime())) { && (m_mousePressTimer.elapsed() > s_startDragTime)) {
m_singleSelectionManipulator.end(event->scenePos()); m_singleSelectionManipulator.end(event->scenePos());
view()->changeToMoveTool(m_singleSelectionManipulator.beginPoint()); view()->changeToMoveTool(m_singleSelectionManipulator.beginPoint());
return; return;
} }
} else if (m_rubberbandSelectionManipulator.isActive()) { } else if (m_rubberbandSelectionManipulator.isActive()) {
QPointF mouseMovementVector = m_rubberbandSelectionManipulator.beginPoint() - event->scenePos(); QPointF mouseMovementVector = m_rubberbandSelectionManipulator.beginPoint() - event->scenePos();
if ((mouseMovementVector.toPoint().manhattanLength() > QApplication::startDragDistance()) if ((mouseMovementVector.toPoint().manhattanLength() > s_startDragDistance)
&& (m_mousePressTimer.elapsed() > QApplication::startDragTime())) { && (m_mousePressTimer.elapsed() > s_startDragTime)) {
m_rubberbandSelectionManipulator.update(event->scenePos()); m_rubberbandSelectionManipulator.update(event->scenePos());
if (event->modifiers().testFlag(Qt::ControlModifier)) if (event->modifiers().testFlag(Qt::ControlModifier))
@@ -142,7 +145,7 @@ void SelectionTool::mouseReleaseEvent(const QList<QGraphicsItem*> &/*itemList*/,
else if (m_rubberbandSelectionManipulator.isActive()) { else if (m_rubberbandSelectionManipulator.isActive()) {
QPointF mouseMovementVector = m_rubberbandSelectionManipulator.beginPoint() - event->scenePos(); QPointF mouseMovementVector = m_rubberbandSelectionManipulator.beginPoint() - event->scenePos();
if (mouseMovementVector.toPoint().manhattanLength() < QApplication::startDragDistance()) { if (mouseMovementVector.toPoint().manhattanLength() < s_startDragDistance) {
m_singleSelectionManipulator.begin(event->scenePos()); m_singleSelectionManipulator.begin(event->scenePos());
if (event->modifiers().testFlag(Qt::ControlModifier)) if (event->modifiers().testFlag(Qt::ControlModifier))