diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-09-09 23:00:12 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-09-09 23:00:12 (GMT) |
| commit | 1a2fb9970093a9d0ee60ab10e843a30ec418fce6 (patch) | |
| tree | dc646835961630db2cc62cf171a6b83f49d2c46c /src/gui/text/qtextcontrol.cpp | |
| parent | d9828a18c4c81f89db2eb08087065497ab294952 (diff) | |
| parent | 62c5bafeec64ef5a81a9011b4cf377b5d1d20653 (diff) | |
| download | Qt-1a2fb9970093a9d0ee60ab10e843a30ec418fce6.zip Qt-1a2fb9970093a9d0ee60ab10e843a30ec418fce6.tar.gz Qt-1a2fb9970093a9d0ee60ab10e843a30ec418fce6.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'src/gui/text/qtextcontrol.cpp')
| -rw-r--r-- | src/gui/text/qtextcontrol.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp index bde2c34..aeeef85 100644 --- a/src/gui/text/qtextcontrol.cpp +++ b/src/gui/text/qtextcontrol.cpp @@ -1638,16 +1638,13 @@ void QTextControlPrivate::mouseMoveEvent(QEvent *e, Qt::MouseButton button, cons return; } - if (!mousePressed) - return; - const qreal mouseX = qreal(mousePos.x()); int newCursorPos = q->hitTest(mousePos, Qt::FuzzyHit); if (newCursorPos == -1) return; - if (wordSelectionEnabled && !selectedWordOnDoubleClick.hasSelection()) { + if (mousePressed && wordSelectionEnabled && !selectedWordOnDoubleClick.hasSelection()) { selectedWordOnDoubleClick = cursor; selectedWordOnDoubleClick.select(QTextCursor::WordUnderCursor); } @@ -1656,7 +1653,7 @@ void QTextControlPrivate::mouseMoveEvent(QEvent *e, Qt::MouseButton button, cons extendBlockwiseSelection(newCursorPos); else if (selectedWordOnDoubleClick.hasSelection()) extendWordwiseSelection(newCursorPos, mouseX); - else + else if (mousePressed) setCursorPosition(newCursorPos, QTextCursor::KeepAnchor); if (interactionFlags & Qt::TextEditable) { |