diff options
| author | Jim Raykowski <raykowj@gmail.com> | 2018-09-27 10:01:41 -0800 |
|---|---|---|
| committer | Jim Raykowski <raykowj@gmail.com> | 2018-11-03 02:08:56 +0100 |
| commit | 8ff55c16e853600fdac6164d34ff35421a1f112e (patch) | |
| tree | 8283c540f2f5ca5459b985f842a601d067c89162 /sfx2 | |
| parent | 2cef68a605494bcef0388201b1058c95788c45a8 (diff) | |
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 <raykowj@gmail.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/sidebar/FocusManager.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
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: |