diff options
| -rw-r--r-- | sfx2/source/sidebar/SidebarController.cxx | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index a35bb1f7488c..3546297df79c 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -476,6 +476,7 @@ void SidebarController::NotifyResize() mpCurrentDeck->setPosSizePixel(nDeckX, 0, nWidth - nTabBarDefaultWidth, nHeight); mpCurrentDeck->Show(); mpCurrentDeck->RequestLayout(); + mpTabBar->HighlightDeck(mpCurrentDeck->GetId()); } else mpCurrentDeck->Hide(); @@ -599,10 +600,6 @@ void SidebarController::UpdateConfigurations() return; } - // Tell the tab bar to highlight the button associated - // with the deck. - mpTabBar->HighlightDeck(sNewDeckId); - std::shared_ptr<DeckDescriptor> xDescriptor = mpResourceManager->GetDeckDescriptor(sNewDeckId); if (xDescriptor) @@ -830,8 +827,6 @@ void SidebarController::SwitchToDeck ( msCurrentDeckId = rDeckDescriptor.msId; } - mpTabBar->HighlightDeck(msCurrentDeckId); - // Determine the panels to display in the deck. ResourceManager::PanelContextDescriptorContainer aPanelContextDescriptors; @@ -1255,8 +1250,7 @@ void SidebarController::RequestCloseDeck() mbIsDeckRequestedOpen = false; UpdateDeckOpenState(); - if (!mpCurrentDeck) - mpTabBar->RemoveDeckHighlight(); + mpTabBar->RemoveDeckHighlight(); } void SidebarController::RequestOpenDeck() @@ -1376,9 +1370,6 @@ void SidebarController::UpdateDeckOpenState() mpParentWindow->SetStyle(mpParentWindow->GetStyle() & ~WB_SIZEABLE); } - mbIsDeckOpen = *mbIsDeckRequestedOpen; - if (*mbIsDeckOpen && mpCurrentDeck) - mpCurrentDeck->Show(); NotifyResize(); } |