diff options
Diffstat (limited to 'meta/packages/gtk+/gtk+-2.10.14/filechooser-respect-style.patch')
-rw-r--r-- | meta/packages/gtk+/gtk+-2.10.14/filechooser-respect-style.patch | 77 |
1 files changed, 77 insertions, 0 deletions
diff --git a/meta/packages/gtk+/gtk+-2.10.14/filechooser-respect-style.patch b/meta/packages/gtk+/gtk+-2.10.14/filechooser-respect-style.patch new file mode 100644 index 000000000..0de8e02dc --- /dev/null +++ b/meta/packages/gtk+/gtk+-2.10.14/filechooser-respect-style.patch @@ -0,0 +1,77 @@ +Index: gtk+-2.10.14/gtk/gtkfilechooserdialog.c +=================================================================== +--- gtk+-2.10.14.orig/gtk/gtkfilechooserdialog.c 2007-08-29 18:03:04.000000000 +0100 ++++ gtk+-2.10.14/gtk/gtkfilechooserdialog.c 2007-08-29 18:04:27.000000000 +0100 +@@ -50,8 +50,6 @@ + + static void gtk_file_chooser_dialog_map (GtkWidget *widget); + static void gtk_file_chooser_dialog_unmap (GtkWidget *widget); +-static void gtk_file_chooser_dialog_style_set (GtkWidget *widget, +- GtkStyle *previous_style); + + static void response_cb (GtkDialog *dialog, + gint response_id); +@@ -73,7 +71,6 @@ + + widget_class->map = gtk_file_chooser_dialog_map; + widget_class->unmap = gtk_file_chooser_dialog_unmap; +- widget_class->style_set = gtk_file_chooser_dialog_style_set; + + _gtk_file_chooser_install_properties (gobject_class); + +@@ -86,10 +83,16 @@ + GtkFileChooserDialogPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (dialog, + GTK_TYPE_FILE_CHOOSER_DIALOG, + GtkFileChooserDialogPrivate); ++ ++ GtkDialog *fc_dialog = GTK_DIALOG (dialog); ++ + dialog->priv = priv; + dialog->priv->response_requested = FALSE; + +- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); ++ gtk_dialog_set_has_separator (fc_dialog, FALSE); ++ gtk_container_set_border_width (GTK_CONTAINER (fc_dialog), 5); ++ gtk_box_set_spacing (GTK_BOX (fc_dialog->vbox), 2); /* 2 * 5 + 2 = 12 */ ++ gtk_container_set_border_width (GTK_CONTAINER (fc_dialog->action_area), 5); + + /* We do a signal connection here rather than overriding the method in + * class_init because GtkDialog::response is a RUN_LAST signal. We want *our* +@@ -285,6 +288,7 @@ + g_signal_connect (priv->widget, "response-requested", + G_CALLBACK (file_chooser_widget_response_requested), object); + ++ gtk_container_set_border_width (GTK_CONTAINER (priv->widget), 5); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (object)->vbox), priv->widget, TRUE, TRUE, 0); + + gtk_widget_show (priv->widget); +@@ -414,29 +418,6 @@ + gtk_widget_unmap (priv->widget); + } + +-static void +-gtk_file_chooser_dialog_style_set (GtkWidget *widget, +- GtkStyle *previous_style) +-{ +- GtkDialog *dialog; +- +- if (GTK_WIDGET_CLASS (gtk_file_chooser_dialog_parent_class)->style_set) +- GTK_WIDGET_CLASS (gtk_file_chooser_dialog_parent_class)->style_set (widget, previous_style); +- +- dialog = GTK_DIALOG (widget); +- +- /* Override the style properties with HIG-compliant spacings. Ugh. +- * http://developer.gnome.org/projects/gup/hig/1.0/layout.html#layout-dialogs +- * http://developer.gnome.org/projects/gup/hig/1.0/windows.html#alert-spacing +- */ +- +- gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), 12); +- gtk_box_set_spacing (GTK_BOX (dialog->vbox), 24); +- +- gtk_container_set_border_width (GTK_CONTAINER (dialog->action_area), 0); +- gtk_box_set_spacing (GTK_BOX (dialog->action_area), 6); +-} +- + /* GtkDialog::response handler */ + static void + response_cb (GtkDialog *dialog, |