diff options
| author | Jim Raykowski <raykowj@gmail.com> | 2018-08-28 09:33:49 -0800 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2018-09-05 11:27:51 +0200 |
| commit | a14088e2822f6018f19677705a74d2f37d0d0431 (patch) | |
| tree | e2fb27bbc78c3cfd36e8df52d9d608c956c3928c /sfx2 | |
| parent | 2e8944702eb7b1b32392181064a04cd5ae442baf (diff) | |
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.Behrens@cib.de>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/sidebar/FocusManager.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/sidebar/SidebarController.cxx | 4 |
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() |