callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

toolpalette: Remove composite support

Browse Source 
It seems to be very broken wrt input handling, causing random icons to
light up etc.
So until this is fixed, better remove composite support. It only removes
animations, so it's not a big loss for functionality.
This commit is contained in:
Benjamin Otte
2011-06-06 19:40:35 +02:00
parent a64bc46c9e
commit 4dbeac9275
2 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtktoolitemgroup.c
View File

@ -1207,7 +1207,6 @@ gtk_tool_item_group_realize (GtkWidget *widget)
GtkWidget *toplevel_window;
GdkWindow *window;
GdkWindowAttr attributes;
GdkDisplay *display;
gint attributes_mask;
guint border_width;
GtkStyleContext *context;
@ -1236,11 +1235,6 @@ gtk_tool_item_group_realize (GtkWidget *widget)
&attributes, attributes_mask);
gtk_widget_set_window (widget, window);
display = gdk_window_get_display (window);
if (gdk_display_supports_composite (display))
gdk_window_set_composited (window, TRUE);
gdk_window_set_user_data (window, widget);
gtk_style_context_set_background (context, window);

33
gtk/gtktoolpalette.c
View File

@ -696,38 +696,6 @@ gtk_tool_palette_size_allocate (GtkWidget *widget,
}
}
static gboolean
gtk_tool_palette_draw (GtkWidget *widget,
cairo_t *cr)
{
GtkToolPalette *palette = GTK_TOOL_PALETTE (widget);
GdkDisplay *display;
GdkWindow *window;
guint i;
window = gtk_widget_get_window (widget);
display = gdk_window_get_display (window);
if (!gdk_display_supports_composite (display))
return FALSE;
cairo_push_group (cr);
for (i = 0; i < palette->priv->groups->len; ++i)
{
GtkToolItemGroupInfo *info = g_ptr_array_index (palette->priv->groups, i);
if (info->widget)
_gtk_tool_item_group_paint (info->widget, cr);
}
cairo_pop_group_to_source (cr);
cairo_paint (cr);
return FALSE;
}
static void
gtk_tool_palette_realize (GtkWidget *widget)
{
@ -999,7 +967,6 @@ gtk_tool_palette_class_init (GtkToolPaletteClass *cls)
wclass->get_preferred_width = gtk_tool_palette_get_preferred_width;
wclass->get_preferred_height= gtk_tool_palette_get_preferred_height;
wclass->size_allocate = gtk_tool_palette_size_allocate;
wclass->draw = gtk_tool_palette_draw;
wclass->realize = gtk_tool_palette_realize;
cclass->add = gtk_tool_palette_add;