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

[Libreoffice Gerrit user]

 cui/source/tabpages/backgrnd.cxx |    1 +
 cui/source/tabpages/tparea.cxx   |    2 ++
 2 files changed, 3 insertions(+)

New commits:
commit c9a3d679c630e8cc9a82ad2d84b726748e5d314f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Mar 16 20:46:49 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Mar 17 00:36:04 2019 +0100

    Resolves: tdf#124058 factor bitmap page into size req when its toggled on
    
    post ctor time
    
    Change-Id: I8257c8ffdfc4dab9893ab7d2d67e218dd3f8097c
    Reviewed-on: https://gerrit.libreoffice.org/69353
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index bdf559e6d4d5..eff3e8fb28bc 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -1565,6 +1565,7 @@ void SvxBkgTabPage::PageCreated(const SfxAllItemSet& aSet)
         }
         if (nFlags & SvxBackgroundTabFlags::SHOW_SELECTOR)
             m_xBtnBitmap->show();
+        SetOptimalSize(GetDialogController());
     }
 
     if ( bCharBackColor )
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 54615fdbbd56..b5b535e4e43a 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -121,6 +121,8 @@ SvxAreaTabPage::SvxAreaTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs
 
 void SvxAreaTabPage::SetOptimalSize(weld::DialogController* pController)
 {
+    m_xFillTab->set_size_request(-1, -1);
+
     TabPageParent aFillTab(m_xFillTab.get(), pController);
     // TEMP
     if (!aFillTab.pController)