[Xfce4-commits] [xfce/libxfce4ui] 07/28: xfce-dialogs: Improve alignment and layout of dialogs

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

o   c   h   o   s   i       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/libxfce4ui.

commit 996076f2c8baf8651e972884d887c90a1fe32ffd
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Fri Jan 3 23:56:31 2020 +0100

    xfce-dialogs: Improve alignment and layout of dialogs
    
    This means that long lines won't run away anymore because lines are now
    set to a max width of 80 characters.
    Also the rest of the dialog should be more balanced now.
---
 libxfce4ui/libxfce4ui-dialog-ui.ui | 19 ++++++++++---------
 libxfce4ui/xfce-dialogs.c          |  3 ++-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/libxfce4ui/libxfce4ui-dialog-ui.ui b/libxfce4ui/libxfce4ui-dialog-ui.ui
index f666586..b1def84 100644
--- a/libxfce4ui/libxfce4ui-dialog-ui.ui
+++ b/libxfce4ui/libxfce4ui-dialog-ui.ui
@@ -29,15 +29,16 @@
           </packing>
         </child>
         <child>
-          <object class="GtkBox" id="box1">
+          <object class="GtkBox" id="box">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_bottom">8</property>
+            <property name="margin_bottom">0</property>
+            <property name="halign">GTK_ALIGN_START</property>
             <child>
               <object class="GtkImage" id="icon_stock_id">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xpad">20</property>
+                <property name="xpad">24</property>
                 <property name="stock">gtk-missing-image</property>
               </object>
               <packing>
@@ -50,12 +51,12 @@
               <object class="GtkBox" id="label-box">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_left">4</property>
-                <property name="margin_right">4</property>
-                <property name="margin_top">4</property>
-                <property name="margin_bottom">4</property>
+                <property name="margin_left">0</property>
+                <property name="margin_right">0</property>
+                <property name="margin_top">0</property>
+                <property name="margin_bottom">0</property>
                 <property name="orientation">vertical</property>
-                <property name="spacing">1</property>
+                <property name="spacing">6</property>
                 <child>
                   <placeholder/>
                 </child>
@@ -66,7 +67,7 @@
               <packing>
                 <property name="expand">True</property>
                 <property name="fill">True</property>
-                <property name="padding">8</property>
+                <property name="padding">0</property>
                 <property name="position">1</property>
               </packing>
             </child>
diff --git a/libxfce4ui/xfce-dialogs.c b/libxfce4ui/xfce-dialogs.c
index 7fb4a08..21a2d95 100644
--- a/libxfce4ui/xfce-dialogs.c
+++ b/libxfce4ui/xfce-dialogs.c
@@ -287,7 +287,7 @@ xfce_dialog_show_help_with_version (GtkWindow   *parent,
 
   button = gtk_check_button_new_with_mnemonic (_("_Always go directly to the online documentation"));
   gtk_box_pack_end (GTK_BOX (message_box), button, FALSE, TRUE, 0);
-  g_object_set (G_OBJECT (button), "halign", GTK_ALIGN_END, "margin-start", 8, "margin-end", 8, NULL);
+  g_object_set (G_OBJECT (button), "halign", GTK_ALIGN_END, "margin-start", 6, "margin-end", 6, NULL);
   gtk_widget_set_hexpand (button, TRUE);
   g_signal_connect (G_OBJECT (button), "toggled",
       G_CALLBACK (xfce_dialog_show_help_auto_toggled), NULL);
@@ -642,6 +642,7 @@ xfce_message_dialog_new_valist (GtkWindow   *parent,
       GtkWidget *secondary_label = gtk_label_new (secondary_text);
       gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (secondary_label), 0.0);
+      gtk_label_set_max_width_chars (GTK_LABEL (secondary_label), 80);
       gtk_widget_set_vexpand (GTK_WIDGET (secondary_label), TRUE);
       gtk_widget_set_valign (GTK_WIDGET (secondary_label), 0.0);
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.