diff options
author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-07-06 16:05:33 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-24 07:53:05 +0200 |
commit | 919b60b4fcc72fdcd5dc0e80e642f922da17cd96 (patch) | |
tree | a76188afdfa613a1199e8650354578f1027714e6 /src/quick/items/qquicktextinput_p_p.h | |
parent | dbe4d2010816f1f22f48f3f5bce0d15d3ad7a7e2 (diff) |
Fix restoration of cursor position and selection after undo/redo.
If a text selection was deleted, the selection should be restored by an
undo, but not if the selection was part of an atomic operation like
the DeleteStartOfWord key sequence.
Change-Id: Ia37f29c78f6367c60377c539c4e394e014485a49
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Diffstat (limited to 'src/quick/items/qquicktextinput_p_p.h')
-rw-r--r-- | src/quick/items/qquicktextinput_p_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/quick/items/qquicktextinput_p_p.h b/src/quick/items/qquicktextinput_p_p.h index 0cc0846a5e..e147c17d96 100644 --- a/src/quick/items/qquicktextinput_p_p.h +++ b/src/quick/items/qquicktextinput_p_p.h @@ -435,6 +435,11 @@ private: inline void separate() { m_separator = true; } + bool separateSelection(); + void deleteStartOfWord(); + void deleteEndOfWord(); + void deleteEndOfLine(); + enum ValidatorState { #ifndef QT_NO_VALIDATOR InvalidInput = QValidator::Invalid, |