debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use cairo to draw static throbber and avoid unused code paths

Browse source
This commit is contained in:
Christian Dywan 2010-10-14 20:59:47 +02:00
parent 54d037f689
commit 18946b10b2
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
katze/katze-throbber.c
View file

@ -855,14 +855,8 @@ static gboolean
katze_throbber_expose_event (GtkWidget* widget, katze_throbber_expose_event (GtkWidget* widget,
GdkEventExpose* event) GdkEventExpose* event)
{ {
gint ax, ay;
KatzeThrobber* throbber = KATZE_THROBBER (widget); KatzeThrobber* throbber = KATZE_THROBBER (widget);
#if HAVE_SPINNER
if (throbber->animated)
return GTK_WIDGET_CLASS (katze_throbber_parent_class)->expose_event (widget, event);
#endif
if (G_UNLIKELY (!throbber->width || !throbber->height)) if (G_UNLIKELY (!throbber->width || !throbber->height))
return TRUE; return TRUE;
@ -873,6 +867,9 @@ katze_throbber_expose_event (GtkWidget* widget,
if (!throbber->animated && (throbber->static_pixbuf if (!throbber->animated && (throbber->static_pixbuf
|| throbber->static_icon_name || throbber->static_stock_id)) || throbber->static_icon_name || throbber->static_stock_id))
{ {
gint ax, ay;
cairo_t* cr;
if (G_UNLIKELY (!throbber->static_pixbuf && throbber->static_icon_name)) if (G_UNLIKELY (!throbber->static_pixbuf && throbber->static_icon_name))
{ {
icon_theme_changed (KATZE_THROBBER (widget)); icon_theme_changed (KATZE_THROBBER (widget));
@ -902,13 +899,17 @@ katze_throbber_expose_event (GtkWidget* widget,
katze_throbber_aligned_coords (widget, &ax, &ay); katze_throbber_aligned_coords (widget, &ax, &ay);
gdk_draw_pixbuf (event->window, NULL, throbber->static_pixbuf, cr = gdk_cairo_create (gtk_widget_get_window (widget));
0, 0, ax, ay, gdk_cairo_set_source_pixbuf (cr, throbber->static_pixbuf, ax, ay);
throbber->width, throbber->height, cairo_paint (cr);
GDK_RGB_DITHER_NONE, 0, 0); cairo_destroy (cr);
} }
else else
{ {
#if HAVE_SPINNER
if (throbber->animated)
return GTK_WIDGET_CLASS (katze_throbber_parent_class)->expose_event (widget, event);
#else
gint cols, rows; gint cols, rows;
if (G_UNLIKELY (throbber->icon_name && !throbber->pixbuf)) if (G_UNLIKELY (throbber->icon_name && !throbber->pixbuf))
@ -969,6 +970,7 @@ katze_throbber_expose_event (GtkWidget* widget,
g_object_notify (G_OBJECT (throbber), "pixbuf"); g_object_notify (G_OBJECT (throbber), "pixbuf");
g_object_thaw_notify (G_OBJECT (throbber)); g_object_thaw_notify (G_OBJECT (throbber));
} }
#endif
} }
return TRUE; return TRUE;