From ef2384ad57c7e7ea40937cced6e6210fd371a978 Mon Sep 17 00:00:00 2001 From: Andrew den Exter Date: Mon, 25 Jul 2011 16:28:07 +1000 Subject: Update cursor position when selection is reversed. A reversed selection will have the same resolved start and end positions but a different cursor position so testing the end points alone doesn't guarantee the selection is the same. Task-number: QTBUG-19456 Reviewed-by: Martin Jones Change-Id: I516e5a501ec878d673f21e54d688fd2d21b624ef Reviewed-on: http://codereview.qt.nokia.com/2080 Reviewed-by: Qt Sanity Bot Reviewed-by: Andrew den Exter --- src/gui/widgets/qlinecontrol.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/gui') diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/widgets/qlinecontrol.cpp index 84674a51d3..550b5cf947 100644 --- a/src/gui/widgets/qlinecontrol.cpp +++ b/src/gui/widgets/qlinecontrol.cpp @@ -281,27 +281,27 @@ void QLineControl::setSelection(int start, int length) } if (length > 0) { - if (start == m_selstart && start + length == m_selend) - return; + m_selDirty |= (start != m_selstart || start + length != m_selend); m_selstart = start; m_selend = qMin(start + length, (int)m_text.length()); m_cursor = m_selend; } else if (length < 0){ - if (start == m_selend && start + length == m_selstart) - return; + m_selDirty |= (start != m_selend || start + length != m_selstart); m_selstart = qMax(start + length, 0); m_selend = start; m_cursor = m_selstart; } else if (m_selstart != m_selend) { + m_selDirty = true; m_selstart = 0; m_selend = 0; m_cursor = start; } else { m_cursor = start; - emitCursorPositionChanged(); - return; } - emit selectionChanged(); + if (m_selDirty) { + m_selDirty = false; + emit selectionChanged(); + } emitCursorPositionChanged(); } -- cgit v1.2.3