diff options
Diffstat (limited to 'meta/packages/gtk+/gtk+-2.6.10/filechooser-respect-style.patch')
-rw-r--r-- | meta/packages/gtk+/gtk+-2.6.10/filechooser-respect-style.patch | 77 |
1 files changed, 77 insertions, 0 deletions
diff --git a/meta/packages/gtk+/gtk+-2.6.10/filechooser-respect-style.patch b/meta/packages/gtk+/gtk+-2.6.10/filechooser-respect-style.patch new file mode 100644 index 0000000000..76c66a7d2a --- /dev/null +++ b/meta/packages/gtk+/gtk+-2.6.10/filechooser-respect-style.patch | |||
@@ -0,0 +1,77 @@ | |||
1 | --- gtk+-2.6.8/gtk/gtkfilechooserdialog.c.orig 2007-02-09 12:18:25.000000000 +0000 | ||
2 | +++ gtk+-2.6.8/gtk/gtkfilechooserdialog.c 2007-02-09 12:18:25.000000000 +0000 | ||
3 | @@ -62,8 +62,6 @@ | ||
4 | |||
5 | static void gtk_file_chooser_dialog_map (GtkWidget *widget); | ||
6 | static void gtk_file_chooser_dialog_unmap (GtkWidget *widget); | ||
7 | -static void gtk_file_chooser_dialog_style_set (GtkWidget *widget, | ||
8 | - GtkStyle *previous_style); | ||
9 | |||
10 | static void response_cb (GtkDialog *dialog, | ||
11 | gint response_id); | ||
12 | @@ -122,7 +120,6 @@ | ||
13 | |||
14 | widget_class->map = gtk_file_chooser_dialog_map; | ||
15 | widget_class->unmap = gtk_file_chooser_dialog_unmap; | ||
16 | - widget_class->style_set = gtk_file_chooser_dialog_style_set; | ||
17 | |||
18 | _gtk_file_chooser_install_properties (gobject_class); | ||
19 | |||
20 | @@ -135,13 +132,19 @@ | ||
21 | GtkFileChooserDialogPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (dialog, | ||
22 | GTK_TYPE_FILE_CHOOSER_DIALOG, | ||
23 | GtkFileChooserDialogPrivate); | ||
24 | + | ||
25 | + GtkDialog *fc_dialog = GTK_DIALOG (dialog); | ||
26 | + | ||
27 | dialog->priv = priv; | ||
28 | dialog->priv->default_width = -1; | ||
29 | dialog->priv->default_height = -1; | ||
30 | dialog->priv->resize_horizontally = TRUE; | ||
31 | dialog->priv->resize_vertically = TRUE; | ||
32 | |||
33 | - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); | ||
34 | + gtk_dialog_set_has_separator (fc_dialog, FALSE); | ||
35 | + gtk_container_set_border_width (GTK_CONTAINER (fc_dialog), 5); | ||
36 | + gtk_box_set_spacing (GTK_BOX (fc_dialog->vbox), 2); /* 2 * 5 + 2 = 12 */ | ||
37 | + gtk_container_set_border_width (GTK_CONTAINER (fc_dialog->action_area), 5); | ||
38 | |||
39 | /* We do a signal connection here rather than overriding the method in | ||
40 | * class_init because GtkDialog::response is a RUN_LAST signal. We want *our* | ||
41 | @@ -394,6 +397,7 @@ | ||
42 | g_signal_connect (priv->widget, "default-size-changed", | ||
43 | G_CALLBACK (file_chooser_widget_default_size_changed), object); | ||
44 | |||
45 | + gtk_container_set_border_width (GTK_CONTAINER (priv->widget), 5); | ||
46 | gtk_box_pack_start (GTK_BOX (GTK_DIALOG (object)->vbox), priv->widget, TRUE, TRUE, 0); | ||
47 | |||
48 | gtk_widget_show (priv->widget); | ||
49 | @@ -522,28 +526,6 @@ | ||
50 | gtk_widget_unmap (priv->widget); | ||
51 | } | ||
52 | |||
53 | -static void | ||
54 | -gtk_file_chooser_dialog_style_set (GtkWidget *widget, | ||
55 | - GtkStyle *previous_style) | ||
56 | -{ | ||
57 | - GtkDialog *dialog; | ||
58 | - | ||
59 | - if (GTK_WIDGET_CLASS (parent_class)->style_set) | ||
60 | - GTK_WIDGET_CLASS (parent_class)->style_set (widget, previous_style); | ||
61 | - | ||
62 | - dialog = GTK_DIALOG (widget); | ||
63 | - | ||
64 | - /* Override the style properties with HIG-compliant spacings. Ugh. | ||
65 | - * http://developer.gnome.org/projects/gup/hig/1.0/layout.html#layout-dialogs | ||
66 | - * http://developer.gnome.org/projects/gup/hig/1.0/windows.html#alert-spacing | ||
67 | - */ | ||
68 | - | ||
69 | - gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), 12); | ||
70 | - gtk_box_set_spacing (GTK_BOX (dialog->vbox), 24); | ||
71 | - | ||
72 | - gtk_container_set_border_width (GTK_CONTAINER (dialog->action_area), 0); | ||
73 | - gtk_box_set_spacing (GTK_BOX (dialog->action_area), 6); | ||
74 | -} | ||
75 | |||
76 | /* GtkDialog::response handler */ | ||
77 | static void | ||