[Xfce4-commits] [xfce/xfce4-settings] 01/01: keyboard: Improve layout of add-command dialog

[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/xfce4-settings.

commit 230404bce88b663e192d6722b38a01c410b37898
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Sat Aug 17 00:58:00 2019 +0200

    keyboard: Improve layout of add-command dialog
---
 dialogs/keyboard-settings/command-dialog.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/dialogs/keyboard-settings/command-dialog.c b/dialogs/keyboard-settings/command-dialog.c
index 7f6ed1b..539a68a 100644
--- a/dialogs/keyboard-settings/command-dialog.c
+++ b/dialogs/keyboard-settings/command-dialog.c
@@ -120,9 +120,7 @@ command_dialog_create_contents (CommandDialog *dialog,
 
   /* Set the main box layout */
   content_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-  gtk_widget_set_margin_bottom (GTK_WIDGET(content_box), 6);
-  gtk_widget_set_margin_start (GTK_WIDGET(content_box), 12);
-  gtk_container_set_border_width (GTK_CONTAINER (content_box), 6);
+  gtk_container_set_border_width (GTK_CONTAINER (content_box), 12);
   gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), content_box);
   gtk_widget_show (content_box);
 
@@ -145,7 +143,7 @@ command_dialog_create_contents (CommandDialog *dialog,
   table = gtk_grid_new ();
   gtk_grid_set_row_spacing (GTK_GRID (table), 6);
   gtk_grid_set_column_spacing (GTK_GRID (table), 12);
-  gtk_container_set_border_width (GTK_CONTAINER (table), 6);
+  gtk_widget_set_margin_top (GTK_WIDGET (table), 6);
   gtk_container_add (GTK_CONTAINER (content_box), table);
   gtk_widget_show (table);
 
@@ -173,6 +171,7 @@ command_dialog_create_contents (CommandDialog *dialog,
   gtk_widget_show (label);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_widget_set_hexpand (hbox, TRUE);
   gtk_grid_attach (GTK_GRID (table), hbox, 1, 1, 1, 1);
   gtk_widget_show (hbox);
 
@@ -180,18 +179,18 @@ command_dialog_create_contents (CommandDialog *dialog,
   gtk_entry_set_activates_default (GTK_ENTRY (dialog->entry), TRUE);
   gtk_entry_set_text (GTK_ENTRY (dialog->entry), action != NULL ? action : "");
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), GTK_WIDGET (dialog->entry));
-  gtk_container_add (GTK_CONTAINER (hbox), dialog->entry);
+  gtk_box_pack_start (GTK_BOX (hbox), dialog->entry, TRUE, TRUE, 0);
   gtk_widget_show (dialog->entry);
 
   dialog->button = gtk_button_new ();
   image = gtk_image_new_from_icon_name ("document-open", GTK_ICON_SIZE_BUTTON);
   gtk_button_set_image (GTK_BUTTON (dialog->button), image);
   g_signal_connect_swapped (dialog->button, "clicked", G_CALLBACK (command_dialog_button_clicked), dialog);
-  gtk_box_pack_start (GTK_BOX (hbox), dialog->button, FALSE, TRUE, 0);
+  gtk_box_pack_end (GTK_BOX (hbox), dialog->button, FALSE, TRUE, 0);
   gtk_widget_show (dialog->button);
 
   dialog->sn_option = gtk_check_button_new_with_mnemonic (_("Use _startup notification"));
-  gtk_grid_attach (GTK_GRID (table), dialog->sn_option, 0, 2, 1, 1);
+  gtk_grid_attach (GTK_GRID (table), dialog->sn_option, 0, 2, 2, 1);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->sn_option), snotify);
   gtk_widget_show (dialog->sn_option);
 

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