From 52447eed99f7b0f82d6d9180df246ae28cff65d2 Mon Sep 17 00:00:00 2001
From: hydrargyrum <50685-hydrargyrum@users.noreply.gitlab.gnome.org>
Date: Sun, 24 Apr 2022 15:07:11 +0000
Subject: src/zenity.ui: add default OK button for --scale

It's now possible to just press "Enter" to accept the selected value.
---
 src/zenity.ui | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/zenity.ui b/src/zenity.ui
index 13594422..2311340b 100644
--- a/src/zenity.ui
+++ b/src/zenity.ui
@@ -46,6 +46,7 @@
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
+                <property name="has_default">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
-- 
cgit 


From f5a68cdb7f4b1c6e82c879d5afd7057959246893 Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Mon, 25 Apr 2022 13:42:41 +0100
Subject: msg: Fix maximum width to 60 characters

Commit 3b64d05e8a1aae1581d2bec7288d80ac4699e1b1 mentioned that labels in
message dialogs were set to a maximum width of 60 characters, with
inspiration from GtkMessageDialog, but in fact a typo meant that they
were set to both a width and maximum width of just 10 characters. This
lead to text layout problems, which can be fixed by using the intended
maximum of 60 characters.

https://bugzilla.redhat.com/show_bug.cgi?id=2053530
---
 src/msg.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/msg.c b/src/msg.c
index 496fe185..92651525 100644
--- a/src/msg.c
+++ b/src/msg.c
@@ -202,12 +202,10 @@ zenity_msg (ZenityData *data, ZenityMsgData *msg_data) {
 	if (data->width > -1)
 		gtk_widget_set_size_request (GTK_WIDGET (text), data->width, -1);
 	else if (!msg_data->ellipsize && !msg_data->no_wrap) {
-		// the magic number 60 is picked from gtk+/gtk/ui/gtkmessagedialog.ui
-		// however, 60 would increase the distance between the icon and the
-		// text,
-		// decreasing to 10 fix it.
+		/* The magic number 60 is taken from gtk+/gtk/ui/gtkmessagedialog.ui
+		   with 10 as a minimum width. */
 		gtk_label_set_width_chars (GTK_LABEL (text), 10);
-		gtk_label_set_max_width_chars (GTK_LABEL (text), 10);
+		gtk_label_set_max_width_chars (GTK_LABEL (text), 60);
 	}
 
 	if (data->modal)
-- 
cgit 


From 782cd3abc3278ed9afa4393cd22641e56731e09b Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Tue, 26 Apr 2022 08:18:18 +0100
Subject: zenity.ui: make message dialogs non-resizable

Use the approach of GtkMessageDialog, to avoid problems with narrow
labels when the dialog text is long.
---
 src/zenity.ui | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/zenity.ui b/src/zenity.ui
index 2311340b..c1a367c3 100644
--- a/src/zenity.ui
+++ b/src/zenity.ui
@@ -466,6 +466,7 @@
     <property name="title" translatable="yes">Error</property>
     <property name="window_position">center</property>
     <property name="type_hint">dialog</property>
+    <property name="resizable">false</property>
     <signal name="destroy" handler="gtk_main_quit" swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox7">
@@ -682,6 +683,7 @@
     <property name="title" translatable="yes">Information</property>
     <property name="window_position">center</property>
     <property name="type_hint">dialog</property>
+    <property name="resizable">false</property>
     <signal name="destroy" handler="gtk_main_quit" swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox9">
@@ -883,6 +885,7 @@
     <property name="title" translatable="yes">Question</property>
     <property name="window_position">center</property>
     <property name="type_hint">dialog</property>
+    <property name="resizable">false</property>
     <signal name="destroy" handler="gtk_main_quit" swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox3">
@@ -1065,6 +1068,7 @@
     <property name="title" translatable="yes">Warning</property>
     <property name="window_position">center</property>
     <property name="type_hint">dialog</property>
+    <property name="resizable">false</property>
     <signal name="destroy" handler="gtk_main_quit" swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
-- 
cgit 


From 5aa43ab26e2f2ff5be16daabe15995799ffbaba2 Mon Sep 17 00:00:00 2001
From: Logan Rathbone <poprocks@gmail.com>
Date: Tue, 26 Apr 2022 21:30:44 -0400
Subject: Update NEWS and meson.build for 3.42.0

---
 NEWS        | 6 ++++++
 meson.build | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 2544934a..b5620628 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Zenity 3.42.1
+    - scale: Make OK button default (allows pressing Enter to accept selected
+      value) (hydrargyrum)
+    - Fix maximum width of message dialogs to 60 characters, and make message
+      dialogs non-resizable (fixes regression from 3b64d05e) (David King)
+
 Zenity 3.42.0
     - tree: Clicking row checks radio/checkboxes (Logan Rathbone)
     - Fix search column selection with --imagelist (Janne Pulkkinen)
diff --git a/meson.build b/meson.build
index 81512be6..6f287908 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('zenity', 'c',
-  version: '3.42.0',
+  version: '3.42.1',
   meson_version: '>=0.53.0',
   license: 'LGPL-2.1-or-later'
 )
-- 
cgit