AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "gtktrayicon-x11: Stop using set_double_buffered"

Browse Source 
This reverts commit 4a72563c7b.

It turns out that this commit broke statusicons under Xfce when
not using a compositor.

https://bugzilla.gnome.org/show_bug.cgi?id=737986
This commit is contained in:
Matthias Clasen 2014-10-15 14:37:25 -04:00
parent bcbec384da
commit 15af0e789b
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gtk/deprecated/gtktrayicon-x11.c
View File

@ -356,6 +356,27 @@ gtk_tray_icon_draw (GtkWidget *widget,
cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
cairo_paint (cr); cairo_paint (cr);
} }
else
{
GdkRectangle clip;
if (gdk_cairo_get_clip_rectangle (cr, &clip))
{
/* Clear to parent-relative pixmap
* We need to use direct X access here because GDK doesn't know about
* the parent realtive pixmap. */
cairo_surface_flush (target);
XClearArea (GDK_WINDOW_XDISPLAY (window),
GDK_WINDOW_XID (window),
clip.x, clip.y,
clip.width, clip.height,
False);
cairo_surface_mark_dirty_rectangle (target,
clip.x, clip.y,
clip.width, clip.height);
}
}
if (GTK_WIDGET_CLASS (gtk_tray_icon_parent_class)->draw) if (GTK_WIDGET_CLASS (gtk_tray_icon_parent_class)->draw)
retval = GTK_WIDGET_CLASS (gtk_tray_icon_parent_class)->draw (widget, cr); retval = GTK_WIDGET_CLASS (gtk_tray_icon_parent_class)->draw (widget, cr);
@ -481,6 +502,11 @@ gtk_tray_icon_get_visual_property (GtkTrayIcon *icon)
icon->priv->manager_visual_rgba = FALSE; icon->priv->manager_visual_rgba = FALSE;
} }
/* For the background-relative hack we use when we aren't
* using a real RGBA visual, we can't be double-buffered
*/
gtk_widget_set_double_buffered (GTK_WIDGET (icon), icon->priv->manager_visual_rgba);
if (type != None) if (type != None)
XFree (prop.prop); XFree (prop.prop);
} }