Kaydet (Commit) 44c87a5d authored tarafından Julien Nabet's avatar Julien Nabet Kaydeden (comit) Caolán McNamara

tdf#81813: Typing to select value in dropdown resets after space character

Change-Id: I6972cdad9708a46bb8338590312196e55c4f8778
Reviewed-on: https://gerrit.libreoffice.org/15024Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst eb61e1c0
...@@ -1357,6 +1357,7 @@ bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) ...@@ -1357,6 +1357,7 @@ bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt )
bool bCtrl = aKeyCode.IsMod1() || aKeyCode.IsMod3(); bool bCtrl = aKeyCode.IsMod1() || aKeyCode.IsMod3();
bool bMod2 = aKeyCode.IsMod2(); bool bMod2 = aKeyCode.IsMod2();
bool bDone = false; bool bDone = false;
bool bHandleKey = false;
switch( aKeyCode.GetCode() ) switch( aKeyCode.GetCode() )
{ {
...@@ -1572,7 +1573,7 @@ bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) ...@@ -1572,7 +1573,7 @@ bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt )
} }
bDone = true; bDone = true;
} }
maQuickSelectionEngine.Reset(); bHandleKey = true;
} }
break; break;
...@@ -1595,18 +1596,21 @@ bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) ...@@ -1595,18 +1596,21 @@ bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt )
maQuickSelectionEngine.Reset(); maQuickSelectionEngine.Reset();
bDone = true; bDone = true;
break;
} }
} else
// fall through intentional
default:
{
if ( !IsReadOnly() )
{ {
bDone = maQuickSelectionEngine.HandleKeyEvent( rKEvt ); bHandleKey = true;
} }
} }
break; break;
default:
bHandleKey = true;
break;
}
if (bHandleKey && !IsReadOnly())
{
bDone = maQuickSelectionEngine.HandleKeyEvent( rKEvt );
} }
if ( ( nSelect != LISTBOX_ENTRY_NOTFOUND ) if ( ( nSelect != LISTBOX_ENTRY_NOTFOUND )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment