svx/source/gallery2/galbrws2.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
New commits: commit 1cc819c340885aebd9a8031f34e405a9f689db83 Author: Jim Raykowski <rayk...@gmail.com> AuthorDate: Thu Nov 1 13:23:22 2018 -0800 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Fri Nov 2 07:22:52 2018 +0100 Don't use ToolBox::KeyInput for escape key press in GalleryToolBox GalleryToolBox is used in the Gallery deck/panel in the sidebar. Guidelines for keyboard navigation in the sidebar are that Escape from content moves focus to content panel title or in absence of panel title to the deck title or if sidebar is floating and the deck has only one panel move focus to the tab bar settings menu button. This patch removes ToolBox key input method from being used to handle escape key input in GalleryToolBox. This allows sidebar focus manger to provide the correct behavior. Change-Id: Iaf6fb404aae784b1119b5477948c4edb674a972a Reviewed-on: https://gerrit.libreoffice.org/62768 Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> Tested-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 3f045541d924..1337951b9894 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -364,7 +364,10 @@ GalleryToolBox::GalleryToolBox( GalleryBrowser2* pParent ) : void GalleryToolBox::KeyInput( const KeyEvent& rKEvt ) { if( !static_cast< GalleryBrowser2* >( GetParent() )->KeyInput( rKEvt, this ) ) - ToolBox::KeyInput( rKEvt ); + { + if( KEY_ESCAPE != rKEvt.GetKeyCode().GetCode() ) + ToolBox::KeyInput(rKEvt); + } } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits