aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRobert Carr <racarr@canonical.com>2011-09-06 10:47:17 -0400
committerRobert Carr <racarr@canonical.com>2011-09-06 10:47:17 -0400
commit7bc5c9732169e3b644269202301330bd77142340 (patch)
treed37fecf0ca84a3832749daba494db5648dac1ddf /src
parent2f38eb3911444fed2905a42110b75f8a89f9e667 (diff)
downloadayatana-ido-7bc5c9732169e3b644269202301330bd77142340.tar.gz
ayatana-ido-7bc5c9732169e3b644269202301330bd77142340.tar.bz2
ayatana-ido-7bc5c9732169e3b644269202301330bd77142340.zip
Use gtk_render_background
Diffstat (limited to 'src')
-rw-r--r--src/idooffscreenproxy.c41
-rw-r--r--src/idoscalemenuitem.c1
2 files changed, 16 insertions, 26 deletions
diff --git a/src/idooffscreenproxy.c b/src/idooffscreenproxy.c
index 470720f..b022ad0 100644
--- a/src/idooffscreenproxy.c
+++ b/src/idooffscreenproxy.c
@@ -108,6 +108,8 @@ ido_offscreen_proxy_init (IdoOffscreenProxy *proxy)
| GDK_SCROLL_MASK
| GDK_ENTER_NOTIFY_MASK
| GDK_LEAVE_NOTIFY_MASK);
+
+ gtk_container_set_border_width (GTK_CONTAINER (proxy), 0);
}
GtkWidget *
@@ -130,7 +132,6 @@ pick_offscreen_child (GdkWindow *offscreen_window,
// if (widget_x >= 0 && widget_x < child_area.width &&
// widget_y >= 0 && widget_y < child_area.height)
//return proxy->priv->offscreen_window;
- exit(0);
return proxy->priv->offscreen_window;
}
@@ -424,8 +425,8 @@ ido_offscreen_proxy_damage (GtkWidget *widget,
return TRUE;
}
-static void
-get_background_color (GdkRGBA *color)
+static GtkStyleContext *
+get_menu_style_context ()
{
GtkStyleContext *sc;
GtkWidgetPath *path;
@@ -436,12 +437,11 @@ get_background_color (GdkRGBA *color)
sc = gtk_style_context_new();
gtk_style_context_set_path (sc, path);
- gtk_style_context_add_class (sc, "menu");
- gtk_style_context_get_background_color (sc, GTK_STATE_FLAG_ACTIVE, color);
+ gtk_style_context_add_class (sc, GTK_STYLE_CLASS_MENU);
-
gtk_widget_path_free (path);
- g_object_unref (sc);
+
+ return sc;
}
static gboolean
@@ -450,11 +450,18 @@ ido_offscreen_proxy_draw (GtkWidget *widget,
{
IdoOffscreenProxy *proxy = IDO_OFFSCREEN_PROXY (widget);
GdkWindow *window;
- GdkRGBA bg_color;
+ GtkStyleContext *sc;
window = gtk_widget_get_window (widget);
- get_background_color (&bg_color);
+ sc = get_menu_style_context();
+
+ gtk_render_background (sc, cr,
+ -1, -1,
+ gdk_window_get_width (window)+2,
+ gdk_window_get_height (window)+2);
+
+
if (gtk_cairo_should_draw_window (cr, window))
{
@@ -464,28 +471,12 @@ ido_offscreen_proxy_draw (GtkWidget *widget,
{
surface = gdk_offscreen_window_get_surface (proxy->priv->offscreen_window);
- cairo_set_source_rgba(cr, bg_color.red, bg_color.green,
- bg_color.blue, 1);
- cairo_paint(cr);
-
cairo_set_source_surface (cr, surface, 0, 0);
cairo_paint (cr);
}
}
else if (gtk_cairo_should_draw_window (cr, proxy->priv->offscreen_window))
{
- cairo_save (cr);
- cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
- cairo_paint(cr);
- cairo_restore (cr);
-
- // gtk_render_background (gtk_widget_get_style_context (widget), cr,
- // 0, 0,
- // gdk_window_get_width (proxy->priv->offscreen_window),
- // gdk_window_get_height (proxy->priv->offscreen_window));
-
-
-
if (proxy->priv->child)
gtk_container_propagate_draw (GTK_CONTAINER (widget),
diff --git a/src/idoscalemenuitem.c b/src/idoscalemenuitem.c
index 1f0881a..3f27c57 100644
--- a/src/idoscalemenuitem.c
+++ b/src/idoscalemenuitem.c
@@ -477,7 +477,6 @@ ido_scale_menu_item_button_press_event (GtkWidget *menuitem,
GdkEventButton *event)
{
IdoScaleMenuItemPrivate *priv = GET_PRIVATE (menuitem);
- GtkWidget *scale = priv->scale;
gdouble x;
// can we block emissions of "grab-notify" on parent??