[Libreoffice-commits] core.git: include/sfx2 sfx2/source

[Caolán McNamara (via logerrit)]

 include/sfx2/sidebar/Deck.hxx |    1 +
 sfx2/source/sidebar/Deck.cxx  |   18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

New commits:
commit 0b16224062c0434087c3b904cc57d44e5723394b
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Aug 31 10:25:08 2021 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Sep 1 09:30:59 2021 +0200

    tdf#142458 minimal width not including extra width needed by scrolledwindow
    
    its only including the width of the panels and not the extra space
    possibly required by the container window. Which is 2x the
    m_nBorderWidth of 1pixel of VclScrolledWindow in this case.
    
    Change-Id: I56775c7183d7a8b87af263ddc8bb17373779e9ad
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121390
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/include/sfx2/sidebar/Deck.hxx b/include/sfx2/sidebar/Deck.hxx
index 47f3d6434eb2..c8cd298b9229 100644
--- a/include/sfx2/sidebar/Deck.hxx
+++ b/include/sfx2/sidebar/Deck.hxx
@@ -72,6 +72,7 @@ private:
 private:
     const OUString msId;
     sal_Int32 mnMinimalWidth;
+    sal_Int32 mnScrolledWindowExtraWidth;
     sal_Int32 mnMinimalHeight;
     SharedPanelContainer maPanels;
 
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 0fec11ef4e89..2267b222d82e 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -46,6 +46,7 @@ Deck::Deck(const DeckDescriptor& rDeckDescriptor, 
SidebarDockingWindow* pParentW
     : InterimItemWindow(pParentWindow, "sfx/ui/deck.ui", "Deck")
     , msId(rDeckDescriptor.msId)
     , mnMinimalWidth(0)
+    , mnScrolledWindowExtraWidth(0)
     , mnMinimalHeight(0)
     , maPanels()
     , mxParentWindow(pParentWindow)
@@ -59,6 +60,15 @@ Deck::Deck(const DeckDescriptor& rDeckDescriptor, 
SidebarDockingWindow* pParentW
 
     mxVerticalScrollBar->vadjustment_set_step_increment(10);
     mxVerticalScrollBar->vadjustment_set_page_increment(100);
+
+    // tdf#142458 Measure the preferred width of an empty ScrolledWindow
+    // to add to the width of the union of panel widths when calculating
+    // the minimal width of the deck
+    mxVerticalScrollBar->set_hpolicy(VclPolicyType::NEVER);
+    mxVerticalScrollBar->set_vpolicy(VclPolicyType::NEVER);
+    mnScrolledWindowExtraWidth = 
mxVerticalScrollBar->get_preferred_size().Width();
+    mxVerticalScrollBar->set_hpolicy(VclPolicyType::AUTOMATIC);
+    mxVerticalScrollBar->set_vpolicy(VclPolicyType::AUTOMATIC);
 }
 
 Deck::~Deck()
@@ -192,6 +202,14 @@ void Deck::RequestLayoutInternal()
     DeckLayouter::LayoutDeck(mxParentWindow.get(), GetContentArea(),
                              mnMinimalWidth, mnMinimalHeight, maPanels,
                              *GetTitleBar(), *mxVerticalScrollBar);
+
+    if (mnMinimalWidth)
+    {
+        // tdf#142458 at this point mnMinimalWidth contains the width required
+        // by the panels, but extra space may be needed by the scrolledwindow
+        // that will contain the panels
+        mnMinimalWidth += mnScrolledWindowExtraWidth;
+    }
 }
 
 void Deck::RequestLayout()