cui/uiconfig/ui/borderpage.ui | 92 ++++++++++++++++-------------------------- 1 file changed, 36 insertions(+), 56 deletions(-)
New commits: commit cb7a76528147868e408762aa30dfa7ec6b543d4b Author: Samuel Mehrbrodt <[email protected]> AuthorDate: Tue Nov 9 08:47:02 2021 +0100 Commit: Thorsten Behrens <[email protected]> CommitDate: Sat Dec 11 18:19:51 2021 +0100 tdf#48622 Fix layout issue when "Custom" was selected Change-Id: Ie32a763b88cfc26b61d942214b16e008179d410c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124898 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <[email protected]> (cherry picked from commit 3746379f251091696b73463f7b27e8ef732dd20b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126415 Tested-by: Samuel Mehrbrodt <[email protected]> Reviewed-by: Thorsten Behrens <[email protected]> diff --git a/cui/uiconfig/ui/borderpage.ui b/cui/uiconfig/ui/borderpage.ui index 0e9082019bb8..b791787cf347 100644 --- a/cui/uiconfig/ui/borderpage.ui +++ b/cui/uiconfig/ui/borderpage.ui @@ -210,7 +210,7 @@ <property name="top-padding">6</property> <property name="left-padding">12</property> <child> - <!-- n-columns=3 n-rows=3 --> + <!-- n-columns=2 n-rows=3 --> <object class="GtkGrid" id="grid8"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -236,8 +236,11 @@ <property name="can-focus">False</property> <property name="label" translatable="yes" context="borderpage|label16">_Width:</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">linewidthmf</property> <property name="xalign">0</property> + <accessibility> + <relation type="label-for" target="linewidthlb"/> + <relation type="label-for" target="linewidthmf"/> + </accessibility> </object> <packing> <property name="left-attach">0</property> @@ -275,15 +278,30 @@ </packing> </child> <child> - <!-- n-columns=3 n-rows=3 --> - <object class="GtkGrid" id="gridlinewidth"> + <object class="GtkMenuButton" id="linecolorlb"> + <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> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <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="column-spacing">6</property> <child> <object class="GtkComboBoxText" id="linewidthlb"> <property name="visible">True</property> <property name="can-focus">False</property> + <property name="hexpand">False</property> <items> <item translatable="yes" context="borderpage|linewidthlb">Hairline</item> <item translatable="yes" context="borderpage|linewidthlb">Very thin</item> @@ -293,80 +311,42 @@ <item translatable="yes" context="borderpage|linewidthlb">Extra thick</item> <item translatable="yes" context="borderpage|linewidthlb">Custom</item> </items> + <accessibility> + <relation type="labelled-by" target="label16"/> + </accessibility> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> <object class="GtkSpinButton" id="linewidthmf"> <property name="visible">True</property> <property name="can-focus">True</property> - <property name="halign">start</property> + <property name="hexpand">True</property> <property name="activates-default">True</property> <property name="truncate-multiline">True</property> <property name="adjustment">adjustment1</property> <property name="digits">2</property> <property name="value">0.05</property> + <accessibility> + <relation type="labelled-by" target="label16"/> + </accessibility> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="left-attach">1</property> <property name="top-attach">2</property> </packing> </child> - <child> - <object class="GtkMenuButton" id="linecolorlb"> - <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> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> </child> </object>
