summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sfx2/source/sidebar/FocusManager.cxx6
-rw-r--r--sfx2/source/sidebar/SidebarController.cxx4
2 files changed, 8 insertions, 2 deletions
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()