sfx2/source/sidebar/FocusManager.cxx | 6 ++++--
sfx2/source/sidebar/SidebarController.cxx | 4 ++++
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit a14088e2822f6018f19677705a74d2f37d0d0431
Author: Jim Raykowski <rayk...@gmail.com>
AuthorDate: Tue Aug 28 09:33:49 2018 -0800
Commit: Katarina Behrens <katarina.behr...@cib.de>
CommitDate: Wed Sep 5 11:27:51 2018 +0200
tdf#119570 Show deck when focus is moved to panel in collapsed deck
Change-Id: Ifebc5802607d66cb32be2e0f51952ca4d5cb32bc
Reviewed-on: https://gerrit.libreoffice.org/59843
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
diff --git a/sfx2/source/sidebar/FocusManager.cxx
b/sfx2/source/sidebar/FocusManager.cxx
index 84c6b60f1ebf..ab9afcfa6d93 100644
--- a/sfx2/source/sidebar/FocusManager.cxx
+++ b/sfx2/source/sidebar/FocusManager.cxx
@@ -507,10 +507,12 @@ void FocusManager::HandleKeyEvent (
// Go to next tab bar item.
if (aLocation.mnIndex <
static_cast<sal_Int32>(maButtons.size())-1)
FocusButton(aLocation.mnIndex + 1);
- else if (IsDeckTitleVisible())
- FocusDeckTitle();
else
+ {
FocusPanel(0, true);
+ if (IsDeckTitleVisible())
+ FocusDeckTitle();
+ }
break;
default:
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index fc9526f25207..d90bd56b77de 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -1334,7 +1334,11 @@ void SidebarController::UpdateTitleBarIcons()
void SidebarController::ShowPanel (const Panel& rPanel)
{
if (mpCurrentDeck)
+ {
+ if (!IsDeckOpen())
+ RequestOpenDeck();
mpCurrentDeck->ShowPanel(rPanel);
+ }
}
ResourceManager::DeckContextDescriptorContainer
SidebarController::GetMatchingDecks()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
