[GSoC] Keep the column width constant in fill style tabs

Change-Id: I55c182a31aa862a4683304f2e4ffff5d0cacf603
Reviewed-on: https://gerrit.libreoffice.org/28332
Tested-by: Jenkins <ci@libreoffice.org>
Tested-by: Yousuf Philips <philipz85@hotmail.com>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>

8 files changed, 16 insertions, 9 deletions

diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index b1735502f07b..9776eda085d5 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -41,7 +41,7 @@
 #include <vcl/layout.hxx>
 #include <svx/svxdlg.hxx>
 #include <sfx2/viewsh.hxx>
-
+#include <sfx2/dialoghelper.hxx>
 #include <o3tl/make_unique.hxx>
 
 using namespace com::sun::star;
@@ -132,7 +132,9 @@ SvxBitmapTabPage::SvxBitmapTabPage( vcl::Window* pParent, const SfxItemSet& rInA
     m_pBtnImport->SetClickHdl( LINK(this, SvxBitmapTabPage, ClickImportHdl) );
 
     // Calculate size of display boxes
-    Size aSize = LogicToPixel(Size(90, 42), MAP_APPFONT);
+    Size aSize = getDrawPreviewOptimalSize(this);
+    m_pBitmapLB->set_width_request(aSize.Width());
+    m_pBitmapLB->set_height_request(aSize.Height());
     m_pCtlBitmapPreview->set_width_request(aSize.Width());
     m_pCtlBitmapPreview->set_height_request(aSize.Height());
 
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index f63877be1eb1..bb62b55fe29c 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -86,6 +86,8 @@ SvxGradientTabPage::SvxGradientTabPage
     get(m_pGradientLB,     "gradientpresetlist");
     get(m_pCtlPreview,     "previewctl");
     Size aSize = getDrawPreviewOptimalSize(this);
+    m_pGradientLB->set_width_request(aSize.Width());
+    m_pGradientLB->set_height_request(aSize.Height());
     m_pCtlPreview->set_width_request(aSize.Width());
     m_pCtlPreview->set_height_request(aSize.Height());
     get(m_pBtnAdd,         "add");
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 7c8a6f7caae3..a536aafb27d3 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -79,6 +79,8 @@ SvxHatchTabPage::SvxHatchTabPage
     get(m_pHatchLB , "hatchpresetlist");
     get(m_pCtlPreview, "previewctl");
     Size aSize = getDrawPreviewOptimalSize(this);
+    m_pHatchLB->set_width_request(aSize.Width());
+    m_pHatchLB->set_height_request(aSize.Height());
     m_pCtlPreview->set_width_request(aSize.Width());
     m_pCtlPreview->set_height_request(aSize.Height());
     get(m_pBtnAdd, "add");
diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx
index 8c1a3f8c3168..f76b04a7231c 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -113,6 +113,8 @@ SvxPatternTabPage::SvxPatternTabPage(  vcl::Window* pParent, const SfxItemSet& r
 
     // size of the bitmap display
     Size aSize = getDrawPreviewOptimalSize(this);
+    m_pPatternLB->set_width_request(aSize.Width());
+    m_pPatternLB->set_height_request(aSize.Height());
     m_pCtlPreview->set_width_request(aSize.Width());
     m_pCtlPreview->set_height_request(aSize.Height());
 
diff --git a/cui/uiconfig/ui/bitmaptabpage.ui b/cui/uiconfig/ui/bitmaptabpage.ui
index 1022dde059e5..7b7148fd5604 100644
--- a/cui/uiconfig/ui/bitmaptabpage.ui
+++ b/cui/uiconfig/ui/bitmaptabpage.ui
@@ -63,7 +63,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Fill</property>
+            <property name="label" translatable="yes">Bitmap</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/gradientpage.ui b/cui/uiconfig/ui/gradientpage.ui
index 93bdafbde18b..8ab982badffd 100644
--- a/cui/uiconfig/ui/gradientpage.ui
+++ b/cui/uiconfig/ui/gradientpage.ui
@@ -21,7 +21,7 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="spacing">12</property>
+    <property name="spacing">6</property>
     <child>
       <object class="GtkFrame" id="frame2">
         <property name="visible">True</property>
diff --git a/cui/uiconfig/ui/hatchpage.ui b/cui/uiconfig/ui/hatchpage.ui
index ea97e8bdc45a..fd12b3e547f7 100644
--- a/cui/uiconfig/ui/hatchpage.ui
+++ b/cui/uiconfig/ui/hatchpage.ui
@@ -23,7 +23,7 @@
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
     <property name="border_width">6</property>
-    <property name="spacing">12</property>
+    <property name="spacing">6</property>
     <child>
       <object class="GtkFrame" id="frame3">
         <property name="visible">True</property>
@@ -50,7 +50,7 @@
                         <property name="vexpand">True</property>
                       </object>
                   <packing>
-                    <property name="expand">False</property>
+                    <property name="expand">True</property>
                     <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
diff --git a/cui/uiconfig/ui/patterntabpage.ui b/cui/uiconfig/ui/patterntabpage.ui
index ffd943aae687..03bfe52c374e 100644
--- a/cui/uiconfig/ui/patterntabpage.ui
+++ b/cui/uiconfig/ui/patterntabpage.ui
@@ -24,8 +24,6 @@
               <object class="GtkBox" id="box3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="halign">start</property>
-                <property name="valign">start</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
@@ -36,7 +34,7 @@
                     <property name="vexpand">True</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
+                    <property name="expand">True</property>
                     <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
@@ -108,6 +106,7 @@
       <object class="GtkFrame" id="frame1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="halign">start</property>
         <property name="label_xalign">0</property>
         <property name="shadow_type">none</property>
         <child>