[Libreoffice-commits] core.git: sw/source

[Jim Raykowski (via logerrit)]

 sw/source/uibase/utlui/navipi.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 54b28638ab15f68731861ae903c732273b41f78a
Author:     Jim Raykowski <raykowj at gmail.com>
AuthorDate: Thu Jan 30 18:18:36 2020 -0900
Commit:     Jim Raykowski <raykowj at gmail.com>
CommitDate: Tue Feb 4 02:06:23 2020 +0100

    tdf#42695 Fix a couple Writer Navigator "List Box" related bugs
    
    This patch resolves:
    
    1) content not shown when Navigator is docked from a floating zoomed-in
    ("List Box" item unchecked) state
    
    2) "List Box" item is visible when the Navigator is in
    docked state on document open.
    
    Change-Id: Id1fcaf0b581e26aabd4fd897ff142a60d6761e1a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87758
    Tested-by: Jenkins
    Reviewed-by: Jim Raykowski <raykowj at gmail.com>

diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index d9e8a007467f..77faca82124d 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -612,6 +612,7 @@ SwNavigationPI::SwNavigationPI(SfxBindings* _pBindings,
     m_aContentTree->EnableAsyncDrag(true);
     m_aContentTree->ShowTree();
     m_aContentToolBox->CheckItem(m_aContentToolBox->GetItemId("listbox"));
+    m_aContentToolBox->ShowItem(m_aContentToolBox->GetItemId("listbox"), SfxChildWindowContext::GetFloatingWindow(GetParent()) != nullptr);
 
 //  TreeListBox for global document
     m_aGlobalTree->SetSelectionMode( SelectionMode::Multiple );
@@ -765,6 +766,9 @@ void SwNavigationPI::StateChanged(StateChangedType nStateChange)
         // its size, the sidebar can not, and the navigator would just waste
         // space. Therefore hide this button.
         m_aContentToolBox->ShowItem(m_aContentToolBox->GetItemId("listbox"), SfxChildWindowContext::GetFloatingWindow(GetParent()) != nullptr);
+        // show content if docked
+        if (SfxChildWindowContext::GetFloatingWindow(GetParent()) == nullptr && IsZoomedIn())
+            ZoomOut();
     }
     else if (nStateChange == StateChangedType::ControlFocus)
     {