diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2015-03-26 22:46:00 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-03-31 12:40:46 +0000 |
| commit | 44c87a5dc921ea6dd28fdc016c61aa62cfd4f4d6 (patch) | |
| tree | 48eeb76420343b1aaa2fd2f3a20376dfa902552e /vcl | |
| parent | eb61e1c00365337cde3aff45b5a9f362951abd62 (diff) | |
tdf#81813: Typing to select value in dropdown resets after space character
Change-Id: I6972cdad9708a46bb8338590312196e55c4f8778
Reviewed-on: https://gerrit.libreoffice.org/15024
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/control/ilstbox.cxx | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index 2ec92334e880..e5d29ea4a98e 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -1357,6 +1357,7 @@ bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) bool bCtrl = aKeyCode.IsMod1() || aKeyCode.IsMod3(); bool bMod2 = aKeyCode.IsMod2(); bool bDone = false; + bool bHandleKey = false; switch( aKeyCode.GetCode() ) { @@ -1572,7 +1573,7 @@ bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) } bDone = true; } - maQuickSelectionEngine.Reset(); + bHandleKey = true; } break; @@ -1595,18 +1596,21 @@ bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) maQuickSelectionEngine.Reset(); bDone = true; - break; } - } - // fall through intentional - default: - { - if ( !IsReadOnly() ) + else { - bDone = maQuickSelectionEngine.HandleKeyEvent( rKEvt ); + bHandleKey = true; } - } + } break; + + default: + bHandleKey = true; + break; + } + if (bHandleKey && !IsReadOnly()) + { + bDone = maQuickSelectionEngine.HandleKeyEvent( rKEvt ); } if ( ( nSelect != LISTBOX_ENTRY_NOTFOUND ) |