[gnome-panel/gtk3] window-menu: Use gtk_render_focus() instead of gtk_paint_focus()



commit eab5174e71e705331c53482b7eecb56c1dc3ef6c
Author: Carlos Garcia Campos <carlosgc gnome org>
Date:   Sun Jan 23 12:20:35 2011 +0100

    window-menu: Use gtk_render_focus() instead of gtk_paint_focus()

 applets/wncklet/window-menu.c |   32 +++++++++++++++++++++-----------
 1 files changed, 21 insertions(+), 11 deletions(-)
---
diff --git a/applets/wncklet/window-menu.c b/applets/wncklet/window-menu.c
index 6201d90..2e57238 100644
--- a/applets/wncklet/window-menu.c
+++ b/applets/wncklet/window-menu.c
@@ -117,17 +117,27 @@ window_menu_on_draw (GtkWidget *widget,
                      cairo_t   *cr,
                      gpointer   data)
 {
-        WindowMenu *window_menu = data;
-
-	if (gtk_widget_has_focus (window_menu->applet))
-		gtk_paint_focus (gtk_widget_get_style (widget),
-				 cr,
-				 gtk_widget_get_state (widget),
-				 widget,
-				 "menu-applet",
-				 0, 0,
-                                 gtk_widget_get_allocated_width (widget),
-                                 gtk_widget_get_allocated_height (widget));
+        GtkStyleContext *context;
+        GtkStateFlags    state;
+        WindowMenu      *window_menu = data;
+
+	if (!gtk_widget_has_focus (window_menu->applet))
+                return FALSE;
+
+        state = gtk_widget_get_state_flags (widget);
+        context = gtk_widget_get_style_context (widget);
+        gtk_style_context_save (context);
+        gtk_style_context_set_state (context, state);
+
+        cairo_save (cr);
+        gtk_render_focus (context, cr,
+                          0., 0.,
+                          gtk_widget_get_allocated_width (widget),
+                          gtk_widget_get_allocated_height (widget));
+        cairo_restore (cr);
+
+        gtk_style_context_restore (context);
+
 	return FALSE;
 }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]