Merge lp:~cimi/unity/unity.use-gtk3-style-context into lp:unity

[Andrea Cimitan]

First WIP of pure gtk+3 rendering

[Andrea Cimitan (cimi)]

Visually looks perfect, but selecting widgets on the menubar is pretty slow. Need to profile unity and see where the slowdown comes from

[Neil J. Patel (njpatel)]

Awesome work dude, merging now!

review: Approve

=== modified file 'plugins/unityshell/src/PanelHomeButton.cpp'
--- plugins/unityshell/src/PanelHomeButton.cpp	2011-06-21 12:10:09 +0000
+++ plugins/unityshell/src/PanelHomeButton.cpp	2011-07-01 17:47:29 +0000
@@ -133,7 +133,6 @@
   int width = _button_width;
   int height = PANEL_HEIGHT;
   GdkPixbuf *pixbuf;
-  GdkPixbuf *overlay;
 
   SetMinMaxSize (_button_width, PANEL_HEIGHT);
 
@@ -142,23 +141,8 @@
   cairo_set_line_width (cr, 1);
 
   /* button pressed effect */
-  if (_pressed) {
-    if (PanelStyle::GetDefault ()->IsAmbianceOrRadiance () && _opacity == 1.0f) {
-      /* loads background panel upside-down */
-      overlay = gdk_pixbuf_flip (PanelStyle::GetDefault ()->GetBackground (width - 2, height), FALSE);
-      if (GDK_IS_PIXBUF (overlay)) {
-        gdk_cairo_set_source_pixbuf (cr, overlay, 0, 0);
-        cairo_paint (cr);
-        g_object_unref (overlay);
-      }
-    } else {
-      /* draws an translucent overlay  */
-      cairo_set_source_rgba (cr, 0.0f, 0.0f, 0.0f, 0.3f);
-      cairo_rectangle (cr, 0, 0, width-1, height);
-      cairo_fill (cr);
-    }
-  }
-
+  //FIXME(Cimi) removed the pressed effect
+  
   pixbuf = PanelStyle::GetDefault ()->GetHomeButton ();
   if (GDK_IS_PIXBUF (pixbuf))
   {

=== modified file 'plugins/unityshell/src/PanelIndicatorObjectEntryView.cpp'
--- plugins/unityshell/src/PanelIndicatorObjectEntryView.cpp	2011-06-29 15:40:49 +0000
+++ plugins/unityshell/src/PanelIndicatorObjectEntryView.cpp	2011-07-01 17:47:29 +0000
@@ -147,10 +147,6 @@
   int  text_width = 0;
   int  text_height = 0;
 
-  PanelStyle *style = PanelStyle::GetDefault ();
-  nux::Color  textcol = style->GetTextColor ();
-  nux::Color  textshadowcol = style->GetTextShadow ();
-
   if (proxy_->show_now())
   {
     if (!pango_parse_markup (label.c_str(),
@@ -246,25 +242,28 @@
   {
     pango_cairo_update_layout (cr, layout);
 
-    // Once for the homies that couldn't be here
-    cairo_set_source_rgba (cr,
-                           textshadowcol.red,
-                           textshadowcol.green,
-                           textshadowcol.blue,
-                           1.0f - textshadowcol.red);
-    cairo_move_to (cr, x, (int)(((height - text_height)/2)+1));
-    pango_cairo_show_layout (cr, layout);
-    cairo_stroke (cr);
-
-    // Once again for the homies that could
-    cairo_set_source_rgba (cr,
-                           textcol.red,
-                           textcol.green,
-                           textcol.blue,
-                           proxy_->label_sensitive() ? 1.0f : 0.5f);
-    cairo_move_to (cr, x, (int)((height - text_height)/2));
-    pango_cairo_show_layout (cr, layout);
-    cairo_stroke (cr);
+    PanelStyle *style = PanelStyle::GetDefault ();
+    GtkStyleContext *style_context = style->GetStyleContext ();
+
+    gtk_style_context_save (style_context);
+
+    GtkWidgetPath *widget_path = gtk_widget_path_new ();
+    gtk_widget_path_iter_set_name (widget_path, -1 , "UnityPanelWidget");
+    gtk_widget_path_append_type (widget_path, GTK_TYPE_MENU_BAR);
+    gtk_widget_path_append_type (widget_path, GTK_TYPE_MENU_ITEM);
+
+    gtk_style_context_set_path (style_context, widget_path);
+    gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_MENUBAR);
+    gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_MENUITEM);
+
+    if (proxy_->active())
+      gtk_style_context_set_state (style_context, GTK_STATE_FLAG_PRELIGHT);
+
+    gtk_render_layout (style_context, cr, x, (int)((height - text_height)/2), layout);
+
+    gtk_widget_path_free (widget_path);
+
+    gtk_style_context_restore (style_context);
   }
 
   cairo_destroy (cr);
@@ -362,85 +361,28 @@
 
 void draw_menu_bg(cairo_t* cr, int width, int height)
 {
-  int radius = 4;
-  double x = 0;
-  double y = 0;
-  double xos = 0.5;
-  double yos = 0.5;
-  /* FIXME */
-  double mpi = 3.14159265358979323846;
-
   PanelStyle *style = PanelStyle::GetDefault ();
-  nux::Color bgtop = style->GetBackgroundTop ();
-  nux::Color bgbot = style->GetBackgroundBottom ();
-  nux::Color line = style->GetLineColor ();
-
-  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-
-  cairo_set_line_width (cr, 1.0);
-
-  cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.2);
-
-  cairo_move_to (cr, x+xos+radius, y+yos);
-  cairo_arc (cr, x+xos+width-xos*2-radius, y+yos+radius, radius, mpi*1.5, mpi*2);
-  cairo_line_to (cr, x+xos+width-xos*2, y+yos+height-yos*2+2);
-  cairo_line_to (cr, x+xos, y+yos+height-yos*2+2);
-  cairo_arc (cr, x+xos+radius, y+yos+radius, radius, mpi, mpi*1.5);
-
-  cairo_pattern_t * pat = cairo_pattern_create_linear (x+xos, y, x+xos, y+height-yos*2+2);
-  cairo_pattern_add_color_stop_rgba (pat, 0.0,
-                                     bgtop.red,
-                                     bgtop.green,
-                                     bgtop.blue,
-                                     1.0f - bgbot.red);
-  cairo_pattern_add_color_stop_rgba (pat, 1.0,
-                                     bgbot.red,
-                                     bgbot.green,
-                                     bgbot.blue,
-                                     1.0f - bgtop.red);
-  cairo_set_source (cr, pat);
-  cairo_fill_preserve (cr);
-  cairo_pattern_destroy (pat);
-
-  pat = cairo_pattern_create_linear (x+xos, y, x+xos, y+height-yos*2+2);
-  cairo_pattern_add_color_stop_rgba (pat, 0.0,
-                                     line.red,
-                                     line.green,
-                                     line.blue,
-                                     1.0f);
-  cairo_pattern_add_color_stop_rgba (pat, 1.0,
-                                     line.red,
-                                     line.green,
-                                     line.blue,
-                                     1.0f);
-  cairo_set_source (cr, pat);
-  cairo_stroke (cr);
-  cairo_pattern_destroy (pat);
-
-  xos++;
-  yos++;
-
-  /* enlarging the area to not draw the lightborder at bottom, ugly trick :P */
-  cairo_move_to (cr, x+radius+xos, y+yos);
-  cairo_arc (cr, x+xos+width-xos*2-radius, y+yos+radius, radius, mpi*1.5, mpi*2);
-  cairo_line_to (cr, x+xos+width-xos*2, y+yos+height-yos*2+3);
-  cairo_line_to (cr, x+xos, y+yos+height-yos*2+3);
-  cairo_arc (cr, x+xos+radius, y+yos+radius, radius, mpi, mpi*1.5);
-
-  pat = cairo_pattern_create_linear (x+xos, y, x+xos, y+height-yos*2+3);
-  cairo_pattern_add_color_stop_rgba (pat, 0.0,
-                                     bgbot.red,
-                                     bgbot.green,
-                                     bgbot.blue,
-                                     1.0f);
-  cairo_pattern_add_color_stop_rgba (pat, 1.0,
-                                     bgbot.red,
-                                     bgbot.green,
-                                     bgbot.blue,
-                                     1.0f);
-  cairo_set_source (cr, pat);
-  cairo_stroke (cr);
-  cairo_pattern_destroy (pat);
+  GtkStyleContext *style_context = style->GetStyleContext ();
+
+  gtk_style_context_save (style_context);
+
+  GtkWidgetPath *widget_path = gtk_widget_path_new ();
+  gtk_widget_path_iter_set_name (widget_path, -1 , "UnityPanelWidget");
+  gtk_widget_path_append_type (widget_path, GTK_TYPE_MENU_BAR);
+  gtk_widget_path_append_type (widget_path, GTK_TYPE_MENU_ITEM);
+
+  gtk_style_context_set_path (style_context, widget_path);
+  gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_MENUBAR);
+  gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_MENUITEM);
+  gtk_style_context_set_state (style_context, GTK_STATE_FLAG_PRELIGHT);
+
+  // FIXME(Cimi) probably some padding is needed here.
+  gtk_render_background (style_context, cr, 0, 0, width, height);
+  gtk_render_frame (style_context, cr, 0, 0, width, height);
+
+  gtk_widget_path_free (widget_path);
+
+  gtk_style_context_restore (style_context);
 }
 
 GdkPixbuf* make_pixbuf(int image_type, std::string const& image_data)

=== modified file 'plugins/unityshell/src/PanelMenuView.cpp'
--- plugins/unityshell/src/PanelMenuView.cpp	2011-06-21 12:29:49 +0000
+++ plugins/unityshell/src/PanelMenuView.cpp	2011-07-01 17:47:29 +0000
@@ -578,10 +578,26 @@
 
   if (label)
   {
-    nux::Color const& col = PanelStyle::GetDefault ()->GetTextColor();
-    float red = col.red;
-    float green = col.green;
-    float blue = col.blue;
+    PanelStyle *style = PanelStyle::GetDefault ();
+    GtkStyleContext *style_context = style->GetStyleContext ();
+
+    gtk_style_context_save (style_context);
+
+    GtkWidgetPath *widget_path = gtk_widget_path_new ();
+    gtk_widget_path_iter_set_name (widget_path, -1 , "UnityPanelWidget");
+    gtk_widget_path_append_type (widget_path, GTK_TYPE_MENU_BAR);
+    gtk_widget_path_append_type (widget_path, GTK_TYPE_MENU_ITEM);
+
+    gtk_style_context_set_path (style_context, widget_path);
+    gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_MENUBAR);
+    gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_MENUITEM);
+
+    GdkRGBA rgba_text;
+    gtk_style_context_get_color (style_context, GTK_STATE_FLAG_NORMAL, &rgba_text);
+
+    float red = rgba_text.red;
+    float green = rgba_text.green;
+    float blue = rgba_text.blue;
 
     pango_cairo_update_layout (cr, layout);
 
@@ -602,9 +618,12 @@
     {
       cairo_set_source_rgb (cr, red, green, blue);
     }
-    cairo_move_to (cr, x, y);
-    pango_cairo_show_layout (cr, layout);
-    cairo_stroke (cr);
+
+    gtk_render_layout (style_context, cr, x, y, layout);
+
+    gtk_widget_path_free (widget_path);
+
+    gtk_style_context_restore (style_context);
   }
 
   cairo_destroy (cr);

=== modified file 'plugins/unityshell/src/PanelStyle.cpp'
--- plugins/unityshell/src/PanelStyle.cpp	2011-06-20 21:39:32 +0000
+++ plugins/unityshell/src/PanelStyle.cpp	2011-07-01 17:47:29 +0000
@@ -32,11 +32,12 @@
 
 PanelStyle *_style = NULL;
 
-nux::Color ColorFromGdkColor(GdkColor const& gc)
+nux::Color ColorFromGdkRGBA(GdkRGBA const& color)
 {
-  return nux::Color(gc.red / static_cast<float>(0xffff),
-                    gc.green / static_cast<float>(0xffff),
-                    gc.blue / static_cast<float>(0xffff));
+  return nux::Color(color.red,
+                    color.green,
+                    color.blue,
+                    color.alpha);
 }
 
 }
@@ -44,12 +45,17 @@
 PanelStyle::PanelStyle ()
 : _theme_name (NULL)
 {
-  _offscreen = gtk_offscreen_window_new ();
-  gtk_widget_set_name (_offscreen, "UnityPanelWidget");
-  gtk_widget_set_size_request (_offscreen, 100, 24);
-  gtk_style_context_add_class (gtk_widget_get_style_context (_offscreen),
-                               "menubar");
-  gtk_widget_show_all (_offscreen);
+  _style_context = gtk_style_context_new ();
+
+  GtkWidgetPath *widget_path = gtk_widget_path_new ();
+  gtk_widget_path_iter_set_name (widget_path, -1 , "UnityPanelWidget");
+  gtk_widget_path_append_type (widget_path, GTK_TYPE_WINDOW);
+
+  gtk_style_context_set_path (_style_context, widget_path);
+  gtk_style_context_add_class (_style_context, "gnome-panel-menu-bar");
+  gtk_style_context_add_class (_style_context, "unity-panel");
+
+  gtk_widget_path_free (widget_path);
 
   _gtk_theme_changed_id = g_signal_connect (gtk_settings_get_default (), "notify::gtk-theme-name",
                                             G_CALLBACK (PanelStyle::OnStyleChanged), this);
@@ -62,8 +68,8 @@
   if (_gtk_theme_changed_id)
     g_signal_handler_disconnect (gtk_settings_get_default (),
                                  _gtk_theme_changed_id);
-  
-  gtk_widget_destroy (_offscreen);
+
+  g_object_unref (_style_context);
 
   if (_style == this)
     _style = NULL;
@@ -83,7 +89,7 @@
 void
 PanelStyle::Refresh ()
 {
-  GtkStyle*  style    = NULL;
+  GdkRGBA rgba_text;
 
   if (_theme_name)
     g_free (_theme_name);
@@ -91,40 +97,19 @@
   _theme_name = NULL;
   g_object_get (gtk_settings_get_default (), "gtk-theme-name", &_theme_name, NULL);
 
-  style = gtk_widget_get_style (_offscreen);
-
-  _text = ColorFromGdkColor(style->text[0]);
-  _text_shadow = ColorFromGdkColor(style->text[3]);
-  _line = ColorFromGdkColor(style->dark[0]);
-  _bg_top = ColorFromGdkColor(style->bg[1]);
-  _bg_bottom = ColorFromGdkColor(style->bg[0]);
+  gtk_style_context_invalidate (_style_context);
+
+  gtk_style_context_get_color (_style_context, GTK_STATE_FLAG_NORMAL, &rgba_text);
+
+  _text = ColorFromGdkRGBA (rgba_text);
 
   changed.emit ();
 }
 
-nux::Color const& PanelStyle::GetTextColor() const
-{
-  return _text;
-}
-
-nux::Color const& PanelStyle::GetBackgroundTop() const
-{
-  return _bg_top;
-}
-
-nux::Color const& PanelStyle::GetBackgroundBottom() const
-{
-  return _bg_bottom;
-}
-
-nux::Color const& PanelStyle::GetTextShadow() const
-{
-  return _text_shadow;
-}
-
-nux::Color const& PanelStyle::GetLineColor() const
-{
-  return _line;
+GtkStyleContext *
+PanelStyle::GetStyleContext ()
+{
+  return _style_context;
 }
 
 void
@@ -137,13 +122,20 @@
   self->Refresh ();
 }
 
-GdkPixbuf *
+nux::NBitmapData *
 PanelStyle::GetBackground (int width, int height)
 {
-  gtk_widget_set_size_request (_offscreen, width, height);
-  gdk_window_process_updates (gtk_widget_get_window (_offscreen), TRUE);
-  
-  return gtk_offscreen_window_get_pixbuf (GTK_OFFSCREEN_WINDOW (_offscreen));
+  nux::CairoGraphics* context = new nux::CairoGraphics (CAIRO_FORMAT_ARGB32, width, height);
+
+  cairo_t* cr = context->GetContext ();
+
+  gtk_render_background (_style_context, cr, 0, 0, width, height);
+
+  nux::NBitmapData* bitmap = context->GetBitmap ();
+
+  delete context;
+
+  return bitmap;
 }
 
 nux::BaseTexture *

=== modified file 'plugins/unityshell/src/PanelStyle.h'
--- plugins/unityshell/src/PanelStyle.h	2011-05-13 02:38:16 +0000
+++ plugins/unityshell/src/PanelStyle.h	2011-07-01 17:47:29 +0000
@@ -48,13 +48,9 @@
     PanelStyle ();
     ~PanelStyle ();
 
-    nux::Color const& GetTextColor() const;
-    nux::Color const& GetBackgroundTop() const;
-    nux::Color const& GetBackgroundBottom() const;
-    nux::Color const& GetTextShadow() const;
-    nux::Color const& GetLineColor() const;
+    GtkStyleContext * GetStyleContext ();
 
-    GdkPixbuf * GetBackground (int width, int height);
+    nux::NBitmapData * GetBackground (int width, int height);
 
     nux::BaseTexture * GetWindowButton (WindowButtonType type, WindowState state);
 
@@ -71,13 +67,9 @@
                                 gpointer    data);
     nux::BaseTexture * GetWindowButtonForTheme (WindowButtonType type, WindowState state);
   private:
-    GtkWidget         *_offscreen;
+    GtkStyleContext   *_style_context;
     char              *_theme_name;
     nux::Color         _text;
-    nux::Color         _bg_top;
-    nux::Color         _bg_bottom;
-    nux::Color         _text_shadow;
-    nux::Color         _line;
 
     gulong            _gtk_theme_changed_id;
 };

=== modified file 'plugins/unityshell/src/PanelView.cpp'
--- plugins/unityshell/src/PanelView.cpp	2011-06-22 14:39:34 +0000
+++ plugins/unityshell/src/PanelView.cpp	2011-07-01 17:47:29 +0000
@@ -187,9 +187,11 @@
   _last_height = geo.height;
   _is_dirty = false;
 
-  GdkPixbuf *pixbuf = _style->GetBackground (geo.width, geo.height);
-  nux::BaseTexture * texture2D = nux::CreateTexture2DFromPixbuf (pixbuf, true);
-  g_object_unref (pixbuf);
+  nux::NBitmapData * bitmap = _style->GetBackground (geo.width, geo.height);
+  nux::BaseTexture * texture2D = nux::GetGraphicsDisplay ()->GetGpuDevice ()->CreateSystemCapableTexture ();
+  texture2D->Update (bitmap);
+  delete bitmap;
+
   nux::TexCoordXForm texxform;
   texxform.SetTexCoordType (nux::TexCoordXForm::OFFSET_COORD);
   texxform.SetWrap (nux::TEXWRAP_REPEAT, nux::TEXWRAP_REPEAT);