[Libreoffice-commits] core.git: cui/source cui/uiconfig
Rishabh Kumar
kris.kr296 at gmail.com
Tue Aug 23 12:04:42 UTC 2016
cui/source/tabpages/tpbitmap.cxx | 6 ++++--
cui/source/tabpages/tpgradnt.cxx | 2 ++
cui/source/tabpages/tphatch.cxx | 2 ++
cui/source/tabpages/tppattern.cxx | 2 ++
cui/uiconfig/ui/bitmaptabpage.ui | 2 +-
cui/uiconfig/ui/gradientpage.ui | 2 +-
cui/uiconfig/ui/hatchpage.ui | 4 ++--
cui/uiconfig/ui/patterntabpage.ui | 5 ++---
8 files changed, 16 insertions(+), 9 deletions(-)
New commits:
commit 32abc402ee108b5980ed47a6c3132c4fdbc069aa
Author: Rishabh Kumar <kris.kr296 at gmail.com>
Date: Tue Aug 23 02:56:06 2016 +0530
[GSoC] Keep the column width constant in fill style tabs
Change-Id: I55c182a31aa862a4683304f2e4ffff5d0cacf603
Reviewed-on: https://gerrit.libreoffice.org/28332
Tested-by: Jenkins <ci at libreoffice.org>
Tested-by: Yousuf Philips <philipz85 at hotmail.com>
Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index b173550..9776eda 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 f63877b..bb62b55 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 7c8a6f7..a536aaf 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 8c1a3f8..f76b04a 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 1022dde..7b7148f 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 93bdafb..8ab982b 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 ea97e8b..fd12b3e 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 ffd943a..03bfe52 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>
More information about the Libreoffice-commits
mailing list