AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 10:50:10 +00:00
Code Issues Projects Releases Wiki Activity

gtk: Don't use gtk_render_activity()

Browse Source 
... in places where we draw a background. This was changed for GTK 3.0.0
to allow animations, but these days it doesn't make sense anymore to use
gtk_render_activity() for backgrounds.
This commit is contained in:
Benjamin Otte 2014-08-15 01:58:49 +02:00
parent b675a13233
commit 6c06bd55da
5 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/deprecated/gtkstyle.c
View File

@ -2045,15 +2045,10 @@ gtk_default_draw_box (GtkStyle *style,
cairo_save (cr);
if (gtk_style_context_has_class (context, GTK_STYLE_CLASS_PROGRESSBAR))
gtk_render_activity (context, cr, x, y, width, height);
else
{
gtk_render_background (context, cr, x, y, width, height);
gtk_render_background (context, cr, x, y, width, height);
if (shadow_type != GTK_SHADOW_NONE)
gtk_render_frame (context, cr, x, y, width, height);
}
if (shadow_type != GTK_SHADOW_NONE)
gtk_render_frame (context, cr, x, y, width, height);
cairo_restore (cr);
gtk_style_context_restore (context);

15
gtk/gtkcellrendererprogress.c
View File

@ -626,15 +626,16 @@ gtk_cell_renderer_progress_render (GtkCellRenderer *cell,
clip.y = bar_position;
}
gtk_style_context_save (context);
gtk_style_context_add_class (context, GTK_STYLE_CLASS_PROGRESSBAR);
if (bar_size > 0)
gtk_render_activity (context, cr,
clip.x, clip.y,
clip.width, clip.height);
{
gtk_style_context_save (context);
gtk_style_context_add_class (context, GTK_STYLE_CLASS_PROGRESSBAR);
gtk_style_context_restore (context);
gtk_render_background (context, cr, clip.x, clip.y, clip.width, clip.height);
gtk_render_frame (context, cr, clip.x, clip.y, clip.width, clip.height);
gtk_style_context_restore (context);
}
if (priv->label)
{

4
gtk/gtkentry.c
View File

@ -3937,8 +3937,8 @@ gtk_entry_draw_progress (GtkWidget *widget,
return;
gtk_entry_prepare_context_for_progress (entry, context);
gtk_render_activity (context, cr,
x, y, width, height);
gtk_render_background (context, cr, x, y, width, height);
gtk_render_frame (context, cr, x, y, width, height);
gtk_style_context_restore (context);
}

6
gtk/gtkprogressbar.c
View File

@ -784,7 +784,8 @@ gtk_progress_bar_paint_activity (GtkProgressBar *pbar,
gtk_style_context_add_class (context, GTK_STYLE_CLASS_BOTTOM);
}
gtk_render_activity (context, cr, area.x, area.y, area.width, area.height);
gtk_render_background (context, cr, area.x, area.y, area.width, area.height);
gtk_render_frame (context, cr, area.x, area.y, area.width, area.height);
gtk_style_context_restore (context);
}
@ -849,7 +850,8 @@ gtk_progress_bar_paint_continuous (GtkProgressBar *pbar,
gtk_style_context_add_class (context, GTK_STYLE_CLASS_BOTTOM);
}
gtk_render_activity (context, cr, area.x, area.y, area.width, area.height);
gtk_render_background (context, cr, area.x, area.y, area.width, area.height);
gtk_render_frame (context, cr, area.x, area.y, area.width, area.height);
gtk_style_context_restore (context);
}

5
gtk/gtkrange.c
View File

@ -2159,9 +2159,8 @@ gtk_range_draw (GtkWidget *widget,
fill_y += priv->trough.height - fill_height;
}
gtk_render_activity (context, cr,
fill_x, fill_y,
fill_width, fill_height);
gtk_render_background (context, cr, fill_x, fill_y, fill_width, fill_height);
gtk_render_frame (context, cr, fill_x, fill_y, fill_width, fill_height);
gtk_style_context_restore (context);
}