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

broooooooken pipe

Browse Source
This commit is contained in:
Kristian Rietveld
2006-12-06 21:40:02 +00:00
parent df3ada4d28
commit 980ca0ed46
1 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
gtk/gtkcellrendererprogress.c
View File

@ -39,9 +39,9 @@
enum enum
{ {
PROP_0, PROP_0,
PROP_VALUE, PROP_VALUE,
PROP_TEXT PROP_TEXT
}; };
struct _GtkCellRendererProgressPrivate struct _GtkCellRendererProgressPrivate
@ -339,37 +339,37 @@ gtk_cell_renderer_progress_render (GtkCellRenderer *cell,
gint x, y, w, h, perc_w, pos; gint x, y, w, h, perc_w, pos;
GdkRectangle clip; GdkRectangle clip;
gboolean is_rtl; gboolean is_rtl;
cairo_t *cr;
is_rtl = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL; is_rtl = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL;
cr = gdk_cairo_create (window);
x = cell_area->x + cell->xpad; x = cell_area->x + cell->xpad;
y = cell_area->y + cell->ypad; y = cell_area->y + cell->ypad;
w = cell_area->width - cell->xpad * 2; w = cell_area->width - cell->xpad * 2;
h = cell_area->height - cell->ypad * 2; h = cell_area->height - cell->ypad * 2;
cairo_rectangle (cr, x, y, w, h); /* FIXME: GtkProgressBar draws the box with "trough" detail,
gdk_cairo_set_source_color (cr, &widget->style->fg[GTK_STATE_NORMAL]); * but some engines don't paint anything with that detail for
cairo_fill (cr); * non-GtkProgressBar widgets.
*/
x += widget->style->xthickness; gtk_paint_box (widget->style,
y += widget->style->ythickness; window,
w -= widget->style->xthickness * 2; GTK_STATE_NORMAL, GTK_SHADOW_IN,
h -= widget->style->ythickness * 2; NULL, widget, NULL,
x, y, w, h);
cairo_rectangle (cr, x, y, w, h);
gdk_cairo_set_source_color (cr, &widget->style->bg[GTK_STATE_NORMAL]);
cairo_fill (cr);
perc_w = w * MAX (0, cellprogress->priv->value) / 100; perc_w = w * MAX (0, cellprogress->priv->value) / 100;
clip.x = is_rtl ? (x + w - perc_w) : x;
cairo_rectangle (cr, is_rtl ? (x + w - perc_w) : x, y, perc_w, h); clip.y = y;
gdk_cairo_set_source_color (cr, &widget->style->bg[GTK_STATE_SELECTED]); clip.width = perc_w;
cairo_fill (cr); clip.height = h;
gtk_paint_box (widget->style,
window,
GTK_STATE_SELECTED, GTK_SHADOW_OUT,
&clip, widget, "bar",
clip.x, clip.y,
clip.width, clip.height);
layout = gtk_widget_create_pango_layout (widget, cellprogress->priv->label); layout = gtk_widget_create_pango_layout (widget, cellprogress->priv->label);
pango_layout_get_pixel_extents (layout, NULL, &logical_rect); pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
@ -396,7 +396,6 @@ gtk_cell_renderer_progress_render (GtkCellRenderer *cell,
layout); layout);
g_object_unref (layout); g_object_unref (layout);
cairo_destroy (cr);
} }
#define __GTK_CELL_RENDERER_PROGRESS_C__ #define __GTK_CELL_RENDERER_PROGRESS_C__