bug#9451: GTK3 toolbar style

[Stefano Facchini <stefano.facchini@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 910 bytes --]

Il giorno mar, 06/09/2011 alle 22.12 +0200, Jan Djärv ha scritto:
> 
> Stefano Facchini skrev 2011-09-06 18:11:
> > When compiling with GTK3 the toolbar style should be set to
> > "primary-toolbar" to match the new theme. However, simply setting the
> > style in this way makes the toolbar looks bad because of the GtkEventBox
> > wrapped around every GtkButton.
> >
> > It seems that the GtkEventBox is only used in connecting signals which
> > can be connected directly to the GtkButton itself. In the attached patch
> > the event box is removed and the toolbar style set to "primary-toolbar".
> >
> 
> The GtkEventBox is there to make tooltips work on disabled buttons.  Any patch 
> made must preserve that.
> 
> 	Jan D.
> 

Since Gtk+ 3.3.6 it is possible to make transparent the background of a
widget. This allows to solve the GtkEventBox issue when using a primary
toolbar style. A patch is attached.

[-- Attachment #2: gtk3primarytoolbar.patch --]
[-- Type: text/x-patch, Size: 1533 bytes --]

=== modified file 'src/gtkutil.c'
--- src/gtkutil.c	2011-11-27 18:33:17 +0000
+++ src/gtkutil.c	2011-12-20 10:45:52 +0000
@@ -4175,6 +4175,9 @@
 xg_create_tool_bar (FRAME_PTR f)
 {
   struct x_output *x = f->output_data.x;
+#if (defined HAVE_GTK3) && GTK_CHECK_VERSION (3, 3, 6)
+  GtkStyleContext *gsty;
+#endif
 
   x->toolbar_widget = gtk_toolbar_new ();
   x->toolbar_detached = 0;
@@ -4183,6 +4186,10 @@
 
   gtk_toolbar_set_style (GTK_TOOLBAR (x->toolbar_widget), GTK_TOOLBAR_ICONS);
   toolbar_set_orientation (x->toolbar_widget, GTK_ORIENTATION_HORIZONTAL);
+#if (defined HAVE_GTK3) && GTK_CHECK_VERSION (3, 3, 6)
+  gsty = gtk_widget_get_style_context (x->toolbar_widget);
+  gtk_style_context_add_class (gsty, "primary-toolbar");
+#endif
 }
 
 
@@ -4231,6 +4238,22 @@
   GtkWidget *wb = gtk_button_new ();
   /* The eventbox is here so we can have tooltips on disabled items.  */
   GtkWidget *weventbox = gtk_event_box_new ();
+#if (defined HAVE_GTK3) && GTK_CHECK_VERSION (3, 3, 6)
+  GtkCssProvider *css_prov = gtk_css_provider_new ();
+  GtkStyleContext *gsty;
+
+  gtk_css_provider_load_from_data (css_prov,
+				   "GtkEventBox {"
+				   "    background-color: transparent;"
+				   "}",
+				   -1, NULL);
+
+  gsty = gtk_widget_get_style_context (weventbox);
+  gtk_style_context_add_provider (gsty,
+				  GTK_STYLE_PROVIDER (css_prov),
+				  GTK_STYLE_PROVIDER_PRIORITY_USER);
+  g_object_unref (css_prov);
+#endif
 
   if (wimage && !text_image)
     gtk_box_pack_start (GTK_BOX (vb), wimage, TRUE, TRUE, 0);