diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2006-03-10 21:37:43 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-03-10 21:37:43 +0000 |
| commit | 03dcf45d90a41c549a6b906b1d5793f75983e609 (patch) | |
| tree | de803338334c731ad38c9992bfca9c460eec24b7 /gtk/gtkmessagedialog.c | |
| parent | 26a1ba116e0d1b819c95f3f1c91f0033ca1c042c (diff) | |
| download | gdk-pixbuf-03dcf45d90a41c549a6b906b1d5793f75983e609.tar.gz | |
Apply a patch from Dennis Cranston to make dialogs more consistent
2006-03-10 Matthias Clasen <mclasen@redhat.com>
Apply a patch from Dennis Cranston to make dialogs more
consistent (#163850)
* gtk/gtkcolorsel.c (make_label_spinbutton): Left-align labels.
* gtk/gtkfontsel.c (gtk_font_selection_init):
* gtk/gtkfontsel.c (gtk_font_selection_dialog_init):
* gtk/gtkcolorsel.c (gtk_color_selection_init):
* gtk/gtkcolorseldialog.c (gtk_color_selection_dialog_init):
* gtk/gtkinputdialog.c (gtk_input_dialog_init): Update the layout
of the dialog to follow HIG recommendations. Also update labels.
* gtk/gtkmessagedialog.c (gtk_message_dialog_init): HIG-compatible
spacing.
(gtk_message_dialog_font_size_change): Merged into
gtk_message_dialog_style_set.
Diffstat (limited to 'gtk/gtkmessagedialog.c')
| -rw-r--r-- | gtk/gtkmessagedialog.c | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c index 01fef42b4..2f839b726 100644 --- a/gtk/gtkmessagedialog.c +++ b/gtk/gtkmessagedialog.c @@ -66,10 +66,6 @@ static void gtk_message_dialog_get_property (GObject *object, static void gtk_message_dialog_add_buttons (GtkMessageDialog *message_dialog, GtkButtonsType buttons); -static void gtk_message_dialog_font_size_change (GtkWidget *widget, - GtkStyle *prev_style, - gpointer data); - enum { PROP_0, PROP_MESSAGE_TYPE, @@ -279,12 +275,15 @@ gtk_message_dialog_init (GtkMessageDialog *dialog) hbox, FALSE, FALSE, 0); + gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14); /* 14 + 2 * 5 = 24 */ + gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 5); + gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->action_area), 6); + gtk_widget_show_all (hbox); _gtk_dialog_set_ignore_separator (GTK_DIALOG (dialog), TRUE); - - g_signal_connect (G_OBJECT (dialog), "style-set", - G_CALLBACK (gtk_message_dialog_font_size_change), NULL); } static GtkMessageType @@ -489,15 +488,6 @@ gtk_message_dialog_get_property (GObject *object, } } -static void -gtk_message_dialog_font_size_change (GtkWidget *widget, - GtkStyle *prev_style, - gpointer data) -{ - setup_primary_label_font (GTK_MESSAGE_DIALOG (widget)); -} - - /** * gtk_message_dialog_new: * @parent: transient parent, or %NULL for none @@ -842,9 +832,10 @@ static void gtk_message_dialog_style_set (GtkWidget *widget, GtkStyle *prev_style) { - GtkWidget *parent; - gint border_width = 0; + GtkMessageDialog *dialog = GTK_MESSAGE_DIALOG (widget); gboolean use_separator; + GtkWidget *parent; + gint border_width; parent = GTK_WIDGET (GTK_MESSAGE_DIALOG (widget)->image->parent); @@ -854,16 +845,19 @@ gtk_message_dialog_style_set (GtkWidget *widget, &border_width, NULL); gtk_container_set_border_width (GTK_CONTAINER (parent), - border_width); + MAX (0, border_width - 7)); } gtk_widget_style_get (widget, "use-separator", &use_separator, NULL); + _gtk_dialog_set_ignore_separator (GTK_DIALOG (widget), FALSE); gtk_dialog_set_has_separator (GTK_DIALOG (widget), use_separator); _gtk_dialog_set_ignore_separator (GTK_DIALOG (widget), TRUE); + setup_primary_label_font (dialog); + if (GTK_WIDGET_CLASS (parent_class)->style_set) (GTK_WIDGET_CLASS (parent_class)->style_set) (widget, prev_style); } |