|
 |
2e4744 |
From 4f1e06a69e42ce8dc56f2101b98e1a1021fd324d Mon Sep 17 00:00:00 2001
|
|
|
2e4744 |
From: David King <amigadave@amigadave.com>
|
|
|
2e4744 |
Date: Mon, 25 Apr 2022 13:42:41 +0100
|
|
|
2e4744 |
Subject: [PATCH 1/2] msg: Fix maximum width to 60 characters
|
|
|
2e4744 |
|
|
|
2e4744 |
Commit 3b64d05e8a1aae1581d2bec7288d80ac4699e1b1 mentioned that labels in
|
|
|
2e4744 |
message dialogs were set to a maximum width of 60 characters, with
|
|
|
2e4744 |
inspiration from GtkMessageDialog, but in fact a typo meant that they
|
|
|
2e4744 |
were set to both a width and maximum width of just 10 characters. This
|
|
|
2e4744 |
lead to text layout problems, which can be fixed by using the intended
|
|
|
2e4744 |
maximum of 60 characters.
|
|
|
2e4744 |
|
|
|
2e4744 |
https://bugzilla.redhat.com/show_bug.cgi?id=2053530
|
|
|
2e4744 |
---
|
|
|
2e4744 |
src/msg.c | 10 ++++------
|
|
|
2e4744 |
1 file changed, 4 insertions(+), 6 deletions(-)
|
|
|
2e4744 |
|
|
|
2e4744 |
diff --git a/src/msg.c b/src/msg.c
|
|
|
2e4744 |
index ca14d86..9265152 100644
|
|
|
2e4744 |
--- a/src/msg.c
|
|
|
2e4744 |
+++ b/src/msg.c
|
|
|
2e4744 |
@@ -202,12 +202,10 @@ zenity_msg (ZenityData *data, ZenityMsgData *msg_data) {
|
|
|
2e4744 |
if (data->width > -1)
|
|
|
2e4744 |
gtk_widget_set_size_request (GTK_WIDGET (text), data->width, -1);
|
|
|
2e4744 |
else if (!msg_data->ellipsize && !msg_data->no_wrap) {
|
|
|
2e4744 |
- // the magic number 60 is picked from gtk+/gtk/ui/gtkmessagedialog.ui
|
|
|
2e4744 |
- // however, 60 would increase the distance between the icon and the
|
|
|
2e4744 |
- // text,
|
|
|
2e4744 |
- // decreasing to 10 fix it.
|
|
|
2e4744 |
- gtk_label_set_width_chars (text, 10);
|
|
|
2e4744 |
- gtk_label_set_max_width_chars (text, 10);
|
|
|
2e4744 |
+ /* The magic number 60 is taken from gtk+/gtk/ui/gtkmessagedialog.ui
|
|
|
2e4744 |
+ with 10 as a minimum width. */
|
|
|
2e4744 |
+ gtk_label_set_width_chars (GTK_LABEL (text), 10);
|
|
|
2e4744 |
+ gtk_label_set_max_width_chars (GTK_LABEL (text), 60);
|
|
|
2e4744 |
}
|
|
|
2e4744 |
|
|
|
2e4744 |
if (data->modal)
|
|
|
2e4744 |
--
|
|
|
2e4744 |
2.36.1
|
|
|
2e4744 |
|
|
|
2e4744 |
|
|
|
2e4744 |
From 28f865111bb890a7af06a7767f16f2502aa2f213 Mon Sep 17 00:00:00 2001
|
|
|
2e4744 |
From: David King <amigadave@amigadave.com>
|
|
|
2e4744 |
Date: Tue, 26 Apr 2022 08:18:18 +0100
|
|
|
2e4744 |
Subject: [PATCH 2/2] zenity.ui: make message dialogs non-resizable
|
|
|
2e4744 |
|
|
|
2e4744 |
Use the approach of GtkMessageDialog, to avoid problems with narrow
|
|
|
2e4744 |
labels when the dialog text is long.
|
|
|
2e4744 |
---
|
|
|
2e4744 |
src/zenity.ui | 4 ++++
|
|
|
2e4744 |
1 file changed, 4 insertions(+)
|
|
|
2e4744 |
|
|
|
2e4744 |
diff --git a/src/zenity.ui b/src/zenity.ui
|
|
|
2e4744 |
index 1359442..546a622 100644
|
|
|
2e4744 |
--- a/src/zenity.ui
|
|
|
2e4744 |
+++ b/src/zenity.ui
|
|
|
2e4744 |
@@ -465,6 +465,7 @@
|
|
|
2e4744 |
<property name="title" translatable="yes">Error</property>
|
|
|
2e4744 |
<property name="window_position">center</property>
|
|
|
2e4744 |
<property name="type_hint">dialog</property>
|
|
|
2e4744 |
+ <property name="resizable">false</property>
|
|
|
2e4744 |
<signal name="destroy" handler="gtk_main_quit" swapped="no"/>
|
|
|
2e4744 |
<child internal-child="vbox">
|
|
|
2e4744 |
<object class="GtkBox" id="dialog-vbox7">
|
|
|
2e4744 |
@@ -681,6 +682,7 @@
|
|
|
2e4744 |
<property name="title" translatable="yes">Information</property>
|
|
|
2e4744 |
<property name="window_position">center</property>
|
|
|
2e4744 |
<property name="type_hint">dialog</property>
|
|
|
2e4744 |
+ <property name="resizable">false</property>
|
|
|
2e4744 |
<signal name="destroy" handler="gtk_main_quit" swapped="no"/>
|
|
|
2e4744 |
<child internal-child="vbox">
|
|
|
2e4744 |
<object class="GtkBox" id="dialog-vbox9">
|
|
|
2e4744 |
@@ -882,6 +884,7 @@
|
|
|
2e4744 |
<property name="title" translatable="yes">Question</property>
|
|
|
2e4744 |
<property name="window_position">center</property>
|
|
|
2e4744 |
<property name="type_hint">dialog</property>
|
|
|
2e4744 |
+ <property name="resizable">false</property>
|
|
|
2e4744 |
<signal name="destroy" handler="gtk_main_quit" swapped="no"/>
|
|
|
2e4744 |
<child internal-child="vbox">
|
|
|
2e4744 |
<object class="GtkBox" id="dialog-vbox3">
|
|
|
2e4744 |
@@ -1064,6 +1067,7 @@
|
|
|
2e4744 |
<property name="title" translatable="yes">Warning</property>
|
|
|
2e4744 |
<property name="window_position">center</property>
|
|
|
2e4744 |
<property name="type_hint">dialog</property>
|
|
|
2e4744 |
+ <property name="resizable">false</property>
|
|
|
2e4744 |
<signal name="destroy" handler="gtk_main_quit" swapped="no"/>
|
|
|
2e4744 |
<child internal-child="vbox">
|
|
|
2e4744 |
<object class="GtkBox" id="dialog-vbox1">
|
|
|
2e4744 |
--
|
|
|
2e4744 |
2.36.1
|
|
|
2e4744 |
|