sw/uiconfig/swriter/ui/wrappage.ui | 210 ++++++++++++++++++++++++-------------
1 file changed, 138 insertions(+), 72 deletions(-)
New commits:
commit 75b6ef164bac9543bdcf91f14f583a936ec43f6a
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Jun 21 16:14:45 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Jun 21 21:26:24 2021 +0200
gtk4: GtkPicture triggers some sort of unexplained vertical expand
an intermediate horizontal GtkBox works to stop the propogation
Change-Id: I9fd51c3968c463c7b872b7a12bc3960602d0b025
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117596
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/uiconfig/swriter/ui/wrappage.ui
b/sw/uiconfig/swriter/ui/wrappage.ui
index ede6800d1837..be7187393fa1 100644
--- a/sw/uiconfig/swriter/ui/wrappage.ui
+++ b/sw/uiconfig/swriter/ui/wrappage.ui
@@ -56,18 +56,6 @@
<property name="can-focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
- <child>
- <object class="GtkImage" id="beforeimg">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="halign">center</property>
- <property name="valign">end</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
<child>
<object class="GtkRadioButton" id="before">
<property name="label" translatable="yes"
context="wrappage|before">Be_fore</property>
@@ -92,6 +80,29 @@
<property name="top-attach">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">center</property>
+ <property name="valign">end</property>
+ <child>
+ <object class="GtkImage" id="beforeimg">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left-attach">1</property>
@@ -105,18 +116,6 @@
<property name="can-focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
- <child>
- <object class="GtkImage" id="afterimg">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="halign">center</property>
- <property name="valign">end</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
<child>
<object class="GtkRadioButton" id="after">
<property name="label" translatable="yes"
context="wrappage|after">Aft_er</property>
@@ -141,6 +140,29 @@
<property name="top-attach">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">center</property>
+ <property name="valign">end</property>
+ <child>
+ <object class="GtkImage" id="afterimg">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left-attach">2</property>
@@ -154,18 +176,6 @@
<property name="can-focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
- <child>
- <object class="GtkImage" id="parallelimg">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="halign">center</property>
- <property name="valign">end</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
<child>
<object class="GtkRadioButton" id="parallel">
<property name="label" translatable="yes"
context="wrappage|parallel">_Parallel</property>
@@ -190,6 +200,29 @@
<property name="top-attach">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">center</property>
+ <property name="valign">end</property>
+ <child>
+ <object class="GtkImage" id="parallelimg">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left-attach">0</property>
@@ -203,18 +236,6 @@
<property name="can-focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
- <child>
- <object class="GtkImage" id="throughimg">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="halign">center</property>
- <property name="valign">end</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
<child>
<object class="GtkRadioButton" id="through">
<property name="label" translatable="yes"
context="wrappage|through">Thro_ugh</property>
@@ -239,6 +260,29 @@
<property name="top-attach">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">center</property>
+ <property name="valign">end</property>
+ <child>
+ <object class="GtkImage" id="throughimg">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left-attach">1</property>
@@ -252,18 +296,6 @@
<property name="can-focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
- <child>
- <object class="GtkImage" id="noneimg">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="halign">center</property>
- <property name="valign">end</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
<child>
<object class="GtkRadioButton" id="none">
<property name="label" translatable="yes"
context="wrappage|none">_Wrap Off</property>
@@ -288,6 +320,29 @@
<property name="top-attach">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">center</property>
+ <property name="valign">end</property>
+ <child>
+ <object class="GtkImage" id="noneimg">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left-attach">0</property>
@@ -301,18 +356,6 @@
<property name="can-focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
- <child>
- <object class="GtkImage" id="optimalimg">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="halign">center</property>
- <property name="valign">end</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
<child>
<object class="GtkRadioButton" id="optimal">
<property name="label" translatable="yes"
context="wrappage|optimal">_Optimal</property>
@@ -337,6 +380,29 @@
<property name="top-attach">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">center</property>
+ <property name="valign">end</property>
+ <child>
+ <object class="GtkImage" id="optimalimg">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left-attach">2</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
