diff options
Diffstat (limited to '0001-Resolves-tdf-140250-don-t-share-adjustments-between-.patch')
-rw-r--r-- | 0001-Resolves-tdf-140250-don-t-share-adjustments-between-.patch | 123 |
1 files changed, 123 insertions, 0 deletions
diff --git a/0001-Resolves-tdf-140250-don-t-share-adjustments-between-.patch b/0001-Resolves-tdf-140250-don-t-share-adjustments-between-.patch new file mode 100644 index 0000000..97e4abe --- /dev/null +++ b/0001-Resolves-tdf-140250-don-t-share-adjustments-between-.patch @@ -0,0 +1,123 @@ +From 197efb35e6f9661ecbeac2897d36a25bc2f6433e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com> +Date: Sun, 14 Nov 2021 14:59:38 +0000 +Subject: [PATCH] Resolves: tdf#140250 don't share adjustments between + differerent spinbuttons + +Change-Id: Ib684c746ff3176cf45ea9364efc12f2d6dde1f70 +--- + cui/uiconfig/ui/breaknumberoption.ui | 18 ++++++++++++++++-- + cui/uiconfig/ui/calloutpage.ui | 14 ++++++++++++-- + svx/uiconfig/ui/sidebareffect.ui | 7 ++++++- + 3 files changed, 34 insertions(+), 5 deletions(-) + +diff --git a/cui/uiconfig/ui/breaknumberoption.ui b/cui/uiconfig/ui/breaknumberoption.ui +index 2641babeeb5d..23fe294ec702 100644 +--- a/cui/uiconfig/ui/breaknumberoption.ui ++++ b/cui/uiconfig/ui/breaknumberoption.ui +@@ -9,6 +9,20 @@ + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> ++ <object class="GtkAdjustment" id="adjustment2"> ++ <property name="lower">2</property> ++ <property name="upper">9</property> ++ <property name="value">1</property> ++ <property name="step_increment">1</property> ++ <property name="page_increment">10</property> ++ </object> ++ <object class="GtkAdjustment" id="adjustment3"> ++ <property name="lower">2</property> ++ <property name="upper">9</property> ++ <property name="value">1</property> ++ <property name="step_increment">1</property> ++ <property name="page_increment">10</property> ++ </object> + <object class="GtkDialog" id="BreakNumberOption"> + <property name="can_focus">False</property> + <property name="border_width">6</property> +@@ -134,7 +148,7 @@ + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="activates_default">True</property> +- <property name="adjustment">adjustment1</property> ++ <property name="adjustment">adjustment2</property> + <property name="truncate-multiline">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="afterbreak-atkobject"> +@@ -179,7 +193,7 @@ + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="activates_default">True</property> +- <property name="adjustment">adjustment1</property> ++ <property name="adjustment">adjustment3</property> + <property name="truncate-multiline">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="wordlength-atkobject"> +diff --git a/cui/uiconfig/ui/calloutpage.ui b/cui/uiconfig/ui/calloutpage.ui +index 87d4eff64eb4..00898dc3390c 100644 +--- a/cui/uiconfig/ui/calloutpage.ui ++++ b/cui/uiconfig/ui/calloutpage.ui +@@ -7,6 +7,16 @@ + <property name="step_increment">0.5</property> + <property name="page_increment">10</property> + </object> ++ <object class="GtkAdjustment" id="adjustment2"> ++ <property name="upper">2400</property> ++ <property name="step_increment">0.5</property> ++ <property name="page_increment">10</property> ++ </object> ++ <object class="GtkAdjustment" id="adjustment3"> ++ <property name="upper">2400</property> ++ <property name="step_increment">0.5</property> ++ <property name="page_increment">10</property> ++ </object> + <object class="GtkBox" id="CalloutPage"> + <property name="visible">True</property> + <property name="can_focus">False</property> +@@ -231,7 +241,7 @@ + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="text">0.00</property> +- <property name="adjustment">adjustment1</property> ++ <property name="adjustment">adjustment2</property> + <property name="digits">2</property> + <property name="truncate-multiline">True</property> + <child internal-child="accessible"> +@@ -277,7 +287,7 @@ + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="text">0.00</property> +- <property name="adjustment">adjustment1</property> ++ <property name="adjustment">adjustment3</property> + <property name="digits">2</property> + <property name="truncate-multiline">True</property> + <child internal-child="accessible"> +diff --git a/svx/uiconfig/ui/sidebareffect.ui b/svx/uiconfig/ui/sidebareffect.ui +index 0e633242cd5c..1e041a2a8726 100644 +--- a/svx/uiconfig/ui/sidebareffect.ui ++++ b/svx/uiconfig/ui/sidebareffect.ui +@@ -12,6 +12,11 @@ + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> ++ <object class="GtkAdjustment" id="adjustment3"> ++ <property name="upper">150</property> ++ <property name="step_increment">1</property> ++ <property name="page_increment">10</property> ++ </object> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="EffectPropertyPanel"> + <property name="visible">True</property> +@@ -195,7 +200,7 @@ + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="truncate-multiline">True</property> +- <property name="adjustment">adjustment1</property> ++ <property name="adjustment">adjustment3</property> + </object> + <packing> + <property name="left_attach">1</property> +-- +2.33.1 + |