sfx2/source/sidebar/FocusManager.cxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
New commits: commit 8ff55c16e853600fdac6164d34ff35421a1f112e Author: Jim Raykowski <rayk...@gmail.com> AuthorDate: Thu Sep 27 10:01:41 2018 -0800 Commit: Jim Raykowski <rayk...@gmail.com> CommitDate: Sat Nov 3 02:08:56 2018 +0100 tdf#116869 Fix unable to access sidebar tab bar using keyboard ...when sidebar is floating and deck has one panel Change-Id: Ic741efbfbaf60241b360470c9bc736743f18f0ed Reviewed-on: https://gerrit.libreoffice.org/61052 Tested-by: Jenkins Reviewed-by: Jim Raykowski <rayk...@gmail.com> diff --git a/sfx2/source/sidebar/FocusManager.cxx b/sfx2/source/sidebar/FocusManager.cxx index b55c356364a2..21bf36579973 100644 --- a/sfx2/source/sidebar/FocusManager.cxx +++ b/sfx2/source/sidebar/FocusManager.cxx @@ -596,8 +596,11 @@ IMPL_LINK(FocusManager, ChildEventListener, VclWindowEvent&, rEvent, void) switch (pKeyEvent->GetKeyCode().GetCode()) { case KEY_ESCAPE: - // Return focus back to the panel title. - FocusPanel(aLocation.mnIndex, true); + // Return focus to tab bar sidebar settings button or panel title. + if (!IsDeckTitleVisible() && maPanels.size() == 1) + FocusButton(0); + else + FocusPanel(aLocation.mnIndex, true); break; case KEY_TAB: _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits