cui/uiconfig/ui/bulletandposition.ui | 2 ++
cui/uiconfig/ui/effectspage.ui | 3 +++
cui/uiconfig/ui/linetabpage.ui | 1 +
cui/uiconfig/ui/numberingoptionspage.ui | 1 +
sd/uiconfig/simpress/ui/customanimationfragment.ui | 5 +++++
svx/uiconfig/ui/docking3deffects.ui | 12 ++++++++++++
svx/uiconfig/ui/dockingcolorreplace.ui | 5 +++++
svx/uiconfig/ui/sidebararea.ui | 2 ++
svx/uiconfig/ui/sidebarglow.ui | 1 +
svx/uiconfig/ui/sidebarshadow.ui | 1 +
sw/uiconfig/swriter/ui/pagestylespanel.ui | 2 ++
sw/uiconfig/swriter/ui/textgridpage.ui | 1 +
vcl/unx/gtk3/gtk3gtkinst.cxx | 2 +-
13 files changed, 37 insertions(+), 1 deletion(-)
New commits:
commit 3da6bd8995bcdc727936185aff62c7681a86a239
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Aug 24 14:47:23 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Aug 24 23:54:12 2020 +0200
tdf#136067 left align GtkMenuButtons contents
most already are, align the rest too and have
for gtk "fill" the label widget
Change-Id: I6f75c5c6ebaad0d2e3301854882aeaf3eab8580b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101280
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/uiconfig/ui/bulletandposition.ui
b/cui/uiconfig/ui/bulletandposition.ui
index d739e17f19c5..2796422614c5 100644
--- a/cui/uiconfig/ui/bulletandposition.ui
+++ b/cui/uiconfig/ui/bulletandposition.ui
@@ -354,6 +354,7 @@
<property name="can_focus">True</property>
<property
name="receives_default">True</property>
<property
name="draw_indicator">True</property>
+ <property name="xalign">0</property>
<property
name="popup">bitmapmenu</property>
<child>
<placeholder/>
@@ -384,6 +385,7 @@
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
<property
name="draw_indicator">True</property>
+ <property name="xalign">0</property>
<property name="label"
translatable="no"></property>
<child>
<placeholder/>
diff --git a/cui/uiconfig/ui/effectspage.ui b/cui/uiconfig/ui/effectspage.ui
index 726abf5b24c7..2ebdeab47645 100644
--- a/cui/uiconfig/ui/effectspage.ui
+++ b/cui/uiconfig/ui/effectspage.ui
@@ -473,6 +473,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
+ <property name="xalign">0</property>
<property name="label" translatable="no"></property>
<child>
<placeholder/>
@@ -494,6 +495,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
+ <property name="xalign">0</property>
<property name="label" translatable="no"></property>
<child>
<placeholder/>
@@ -618,6 +620,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
+ <property name="xalign">0</property>
<property name="label" translatable="no"></property>
<child>
<placeholder/>
diff --git a/cui/uiconfig/ui/linetabpage.ui b/cui/uiconfig/ui/linetabpage.ui
index 2894128b60d9..1508e481e215 100644
--- a/cui/uiconfig/ui/linetabpage.ui
+++ b/cui/uiconfig/ui/linetabpage.ui
@@ -768,6 +768,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="popup">menuSELECT</property>
<property name="use_popover">False</property>
diff --git a/cui/uiconfig/ui/numberingoptionspage.ui
b/cui/uiconfig/ui/numberingoptionspage.ui
index e4d97b9ee563..e46ba1391e6b 100644
--- a/cui/uiconfig/ui/numberingoptionspage.ui
+++ b/cui/uiconfig/ui/numberingoptionspage.ui
@@ -408,6 +408,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="label"
translatable="no"></property>
<property name="popup">bitmapmenu</property>
diff --git a/sd/uiconfig/simpress/ui/customanimationfragment.ui
b/sd/uiconfig/simpress/ui/customanimationfragment.ui
index c033ad55e457..d7bd3277e780 100644
--- a/sd/uiconfig/simpress/ui/customanimationfragment.ui
+++ b/sd/uiconfig/simpress/ui/customanimationfragment.ui
@@ -290,6 +290,7 @@
<property name="no_show_all">True</property>
<property name="popup">menu</property>
<property name="draw_indicator">True</property>
+ <property name="xalign">0</property>
<property name="label" translatable="no"></property>
<child>
<placeholder/>
@@ -321,6 +322,7 @@
<property name="no_show_all">True</property>
<property name="popup">menu1</property>
<property name="draw_indicator">True</property>
+ <property name="xalign">0</property>
<property name="label" translatable="no"></property>
<child>
<placeholder/>
@@ -352,6 +354,7 @@
<property name="no_show_all">True</property>
<property name="popup">menu2</property>
<property name="draw_indicator">True</property>
+ <property name="xalign">0</property>
<property name="label" translatable="no"></property>
<child>
<placeholder/>
@@ -383,6 +386,7 @@
<property name="no_show_all">True</property>
<property name="popup">menu3</property>
<property name="draw_indicator">True</property>
+ <property name="xalign">0</property>
<property name="label" translatable="no"></property>
<child>
<placeholder/>
@@ -414,6 +418,7 @@
<property name="no_show_all">True</property>
<property name="popup">menu4</property>
<property name="draw_indicator">True</property>
+ <property name="xalign">0</property>
<property name="label" translatable="no"></property>
<child>
<placeholder/>
diff --git a/svx/uiconfig/ui/docking3deffects.ui
b/svx/uiconfig/ui/docking3deffects.ui
index 8fc40205d5a1..81ebc663fd7f 100644
--- a/svx/uiconfig/ui/docking3deffects.ui
+++ b/svx/uiconfig/ui/docking3deffects.ui
@@ -1264,6 +1264,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="draw_indicator">True</property>
@@ -1501,6 +1502,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes"
context="docking3deffects|lightcolor1|tooltip_text">Light 1 color</property>
+ <property name="xalign">0</property>
<property name="valign">start</property>
<property name="hexpand">True</property>
<property name="draw_indicator">True</property>
@@ -1525,6 +1527,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes"
context="docking3deffects|lightcolor2|tooltip_text">Light 2 color</property>
+ <property name="xalign">0</property>
<property name="valign">start</property>
<property name="hexpand">True</property>
<property name="draw_indicator">True</property>
@@ -1544,6 +1547,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes"
context="docking3deffects|lightcolor3|tooltip_text">Light 3 color</property>
+ <property name="xalign">0</property>
<property name="valign">start</property>
<property name="hexpand">True</property>
<property name="draw_indicator">True</property>
@@ -1563,6 +1567,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes"
context="docking3deffects|lightcolor4|tooltip_text">Light 4 color</property>
+ <property name="xalign">0</property>
<property name="valign">start</property>
<property name="hexpand">True</property>
<property name="draw_indicator">True</property>
@@ -1582,6 +1587,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes"
context="docking3deffects|lightcolor5|tooltip_text">Light 5 color</property>
+ <property name="xalign">0</property>
<property name="valign">start</property>
<property name="hexpand">True</property>
<property name="draw_indicator">True</property>
@@ -1601,6 +1607,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes"
context="docking3deffects|lightcolor6|tooltip_text">Light 6 color</property>
+ <property name="xalign">0</property>
<property name="valign">start</property>
<property name="hexpand">True</property>
<property name="draw_indicator">True</property>
@@ -1620,6 +1627,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes"
context="docking3deffects|lightcolor7|tooltip_text">Light 7 color</property>
+ <property name="xalign">0</property>
<property name="valign">start</property>
<property name="hexpand">True</property>
<property name="draw_indicator">True</property>
@@ -1639,6 +1647,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes"
context="docking3deffects|lightcolor8|tooltip_text">Light 8 color</property>
+ <property name="xalign">0</property>
<property name="valign">start</property>
<property name="hexpand">True</property>
<property name="draw_indicator">True</property>
@@ -2141,6 +2150,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="draw_indicator">True</property>
@@ -2164,6 +2174,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="draw_indicator">True</property>
@@ -2311,6 +2322,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="draw_indicator">True</property>
diff --git a/svx/uiconfig/ui/dockingcolorreplace.ui
b/svx/uiconfig/ui/dockingcolorreplace.ui
index aa71d53f4c49..0af00094ade7 100644
--- a/svx/uiconfig/ui/dockingcolorreplace.ui
+++ b/svx/uiconfig/ui/dockingcolorreplace.ui
@@ -273,6 +273,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0</property>
<property name="hexpand">True</property>
<property name="draw_indicator">True</property>
<property name="label" translatable="no"></property>
@@ -296,6 +297,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0</property>
<property name="hexpand">True</property>
<property name="draw_indicator">True</property>
<property name="label" translatable="no"></property>
@@ -319,6 +321,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0</property>
<property name="hexpand">True</property>
<property name="draw_indicator">True</property>
<property name="label" translatable="no"></property>
@@ -342,6 +345,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0</property>
<property name="hexpand">True</property>
<property name="draw_indicator">True</property>
<property name="label" translatable="no"></property>
@@ -365,6 +369,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="label" translatable="no"></property>
<child>
diff --git a/svx/uiconfig/ui/sidebararea.ui b/svx/uiconfig/ui/sidebararea.ui
index 195fccb03a30..f5bbcd858fbf 100644
--- a/svx/uiconfig/ui/sidebararea.ui
+++ b/svx/uiconfig/ui/sidebararea.ui
@@ -234,6 +234,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes"
context="sidebararea|fillgrad1|tooltip_text">Fill gradient from.</property>
+ <property name="xalign">0</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="draw_indicator">True</property>
@@ -276,6 +277,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes"
context="sidebararea|fillgrad2|tooltip_text">Fill gradient to.</property>
+ <property name="xalign">0</property>
<property name="valign">center</property>
<property name="draw_indicator">True</property>
<property name="label" translatable="no"></property>
diff --git a/svx/uiconfig/ui/sidebarglow.ui b/svx/uiconfig/ui/sidebarglow.ui
index f4d8d769c6c4..cf2aa58fc7ee 100644
--- a/svx/uiconfig/ui/sidebarglow.ui
+++ b/svx/uiconfig/ui/sidebarglow.ui
@@ -82,6 +82,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="hexpand">True</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="label" translatable="no"></property>
<child>
diff --git a/svx/uiconfig/ui/sidebarshadow.ui b/svx/uiconfig/ui/sidebarshadow.ui
index 1369e0d5784c..d9f01c9719fe 100644
--- a/svx/uiconfig/ui/sidebarshadow.ui
+++ b/svx/uiconfig/ui/sidebarshadow.ui
@@ -104,6 +104,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0</property>
<property name="hexpand">True</property>
<property name="draw_indicator">True</property>
<property name="label" translatable="no"></property>
diff --git a/sw/uiconfig/swriter/ui/pagestylespanel.ui
b/sw/uiconfig/swriter/ui/pagestylespanel.ui
index 6b3a71400a92..18507049ea62 100644
--- a/sw/uiconfig/swriter/ui/pagestylespanel.ui
+++ b/sw/uiconfig/swriter/ui/pagestylespanel.ui
@@ -199,6 +199,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="draw_indicator">True</property>
@@ -218,6 +219,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="draw_indicator">True</property>
diff --git a/sw/uiconfig/swriter/ui/textgridpage.ui
b/sw/uiconfig/swriter/ui/textgridpage.ui
index 221a793ea888..3367063f8a57 100644
--- a/sw/uiconfig/swriter/ui/textgridpage.ui
+++ b/sw/uiconfig/swriter/ui/textgridpage.ui
@@ -497,6 +497,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</property>
+ <property name="xalign">0</property>
<property name="valign">center</property>
<property name="draw_indicator">True</property>
<property name="label" translatable="no"></property>
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index c73966efcd5c..85762c4893f1 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -7328,7 +7328,7 @@ public:
gtk_style_context_get_style(pContext, "image-spacing", &nImageSpacing,
nullptr);
m_pBox = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL,
nImageSpacing));
- gtk_box_pack_start(m_pBox, m_pLabel, true, false, 0);
+ gtk_box_pack_start(m_pBox, m_pLabel, true, true, 0);
g_object_unref(m_pLabel);
if (gtk_toggle_button_get_mode(GTK_TOGGLE_BUTTON(m_pMenuButton)))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
