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/gtkcolorseldialog.c | |
| parent | 26a1ba116e0d1b819c95f3f1c91f0033ca1c042c (diff) | |
| download | gtk+-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/gtkcolorseldialog.c')
| -rw-r--r-- | gtk/gtkcolorseldialog.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/gtk/gtkcolorseldialog.c b/gtk/gtkcolorseldialog.c index 5e0641e681..a14a89fe01 100644 --- a/gtk/gtkcolorseldialog.c +++ b/gtk/gtkcolorseldialog.c @@ -81,18 +81,19 @@ gtk_color_selection_dialog_class_init (GtkColorSelectionDialogClass *klass) static void gtk_color_selection_dialog_init (GtkColorSelectionDialog *colorseldiag) { - GtkWidget *frame; - - frame = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (colorseldiag)->vbox), frame); - gtk_container_set_border_width (GTK_CONTAINER (frame), 10); - gtk_widget_show (frame); - + GtkDialog *dialog = GTK_DIALOG (colorseldiag); + + gtk_dialog_set_has_separator (dialog, FALSE); + gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); + gtk_box_set_spacing (GTK_BOX (dialog->vbox), 2); /* 2 * 5 + 2 = 12 */ + gtk_container_set_border_width (GTK_CONTAINER (dialog->action_area), 5); + gtk_box_set_spacing (GTK_BOX (dialog->action_area), 6); + colorseldiag->colorsel = gtk_color_selection_new (); + gtk_container_set_border_width (GTK_CONTAINER (colorseldiag->colorsel), 5); gtk_color_selection_set_has_palette (GTK_COLOR_SELECTION(colorseldiag->colorsel), FALSE); gtk_color_selection_set_has_opacity_control (GTK_COLOR_SELECTION(colorseldiag->colorsel), FALSE); - gtk_container_add (GTK_CONTAINER (frame), colorseldiag->colorsel); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (colorseldiag)->vbox), colorseldiag->colorsel); gtk_widget_show (colorseldiag->colorsel); colorseldiag->cancel_button = gtk_dialog_add_button (GTK_DIALOG (colorseldiag), @@ -119,6 +120,8 @@ gtk_color_selection_dialog_init (GtkColorSelectionDialog *colorseldiag) gtk_window_set_title (GTK_WINDOW (colorseldiag), _("Color Selection")); + + _gtk_dialog_set_ignore_separator (dialog, TRUE); } GtkWidget* |