[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sw/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Mon Aug 16 06:38:54 UTC 2021


 sw/source/uibase/sidebar/PageStylesPanel.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 420fa261a1bb5db9c6367cd4bbf9984c79b296cc
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Aug 13 09:44:09 2021 +0100
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Mon Aug 16 08:37:58 2021 +0200

    tdf#139811 trigger layout when content changes
    
    in writer styles panel of page deck which is similar to the draw case
    of tdf#143795. Doing this always in PanelLayout::queue_resize might
    make the most sense rather than these manual triggers, but do it this
    way initially for a safe backport.
    
    Change-Id: I4bd2e9cb9d52b66a73cd0615406052e19e6e8b51
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120369
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sw/source/uibase/sidebar/PageStylesPanel.cxx b/sw/source/uibase/sidebar/PageStylesPanel.cxx
index 1815466c1df9..64260077a54c 100644
--- a/sw/source/uibase/sidebar/PageStylesPanel.cxx
+++ b/sw/source/uibase/sidebar/PageStylesPanel.cxx
@@ -27,6 +27,7 @@
 #include <svx/xbtmpit.hxx>
 #include <svx/SvxNumOptionsTabPageHelper.hxx>
 #include "PageStylesPanel.hxx"
+#include <sfx2/sidebar/Panel.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/objsh.hxx>
@@ -249,6 +250,11 @@ void PageStylesPanel::Update()
         default:
             break;
     }
+
+    // Need to do a relayouting, otherwise the panel size is not updated after show / hide controls
+    sfx2::sidebar::Panel* pPanel = dynamic_cast<sfx2::sidebar::Panel*>(GetParent());
+    if (pPanel)
+        pPanel->TriggerDeckLayouting();
 }
 
 Color const & PageStylesPanel::GetColorSetOrDefault()


More information about the Libreoffice-commits mailing list