[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sfx2/source

[Szymon KÅ‚os (via logerrit)]

 sfx2/source/sidebar/SidebarPanelBase.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1299ca78262c0c2eac1ceeb518af6f7bd0f9b8dd
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Fri Feb 12 17:18:51 2021 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Thu Mar 4 10:56:56 2021 +0100

    sidebar: use real height to determine preffered size
    
    There was a bug causing to crop the sidebar in online:
    1. open odt file in 2 sessions
    2. select image in session A
    3. move mouse over sidebar in session B
    4. move mouse over sidebar in session A
    Result: sidebar A was cropped
    
    PosSizePropertyPanel on context change
    did some windows visibility changes in the meantime.
    get_preffered_size() returned lower height than real
    value in SidebarPanelBase::getHeightForWidth
    
    call queue_resize to invalidate cached optimal size
    
    Change-Id: I8080259ffb12ae3f6613e7749e908d6ef55c1f3a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110894
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx b/sfx2/source/sidebar/SidebarPanelBase.cxx
index 0906dc962d57..13287fe3a6f2 100644
--- a/sfx2/source/sidebar/SidebarPanelBase.cxx
+++ b/sfx2/source/sidebar/SidebarPanelBase.cxx
@@ -161,6 +161,7 @@ ui::LayoutSize SAL_CALL SidebarPanelBase::getHeightForWidth (const sal_Int32 nWi
         if (isLayoutEnabled(mpControl))
         {
             // widget layout-based sidebar
+            mpControl->queue_resize();
             Size aSize(mpControl->get_preferred_size());
             return ui::LayoutSize(aSize.Height(), aSize.Height(), aSize.Height());
         }