diff options
author | Robin Gareus <robin@gareus.org> | 2015-10-05 16:17:49 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2015-10-05 16:17:49 +0200 |
commit | 22b07e0233a29d9633ffa825a79503befaf2e16e (patch) | |
tree | 1d8b06056f8e12197158f5d906319767d3dedda5 /libs/clearlooks-newer | |
parent | e11ba7b79d68bc1070b170236c22123966d7bcc3 (diff) |
NOOP, remove trailing tabs/whitespace.
Diffstat (limited to 'libs/clearlooks-newer')
-rw-r--r-- | libs/clearlooks-newer/animation.c | 70 | ||||
-rw-r--r-- | libs/clearlooks-newer/cairo-support.c | 74 | ||||
-rw-r--r-- | libs/clearlooks-newer/clearlooks_draw.c | 342 | ||||
-rw-r--r-- | libs/clearlooks-newer/clearlooks_draw_glossy.c | 176 | ||||
-rw-r--r-- | libs/clearlooks-newer/clearlooks_draw_gummy.c | 16 | ||||
-rw-r--r-- | libs/clearlooks-newer/clearlooks_draw_inverted.c | 148 | ||||
-rw-r--r-- | libs/clearlooks-newer/clearlooks_rc_style.c | 4 | ||||
-rw-r--r-- | libs/clearlooks-newer/clearlooks_style.c | 268 | ||||
-rw-r--r-- | libs/clearlooks-newer/clearlooks_style.h | 2 | ||||
-rw-r--r-- | libs/clearlooks-newer/clearlooks_types.h | 12 | ||||
-rw-r--r-- | libs/clearlooks-newer/support.c | 46 | ||||
-rw-r--r-- | libs/clearlooks-newer/widget-information.c | 6 |
12 files changed, 582 insertions, 582 deletions
diff --git a/libs/clearlooks-newer/animation.c b/libs/clearlooks-newer/animation.c index 8339ed7c19..9fd530f201 100644 --- a/libs/clearlooks-newer/animation.c +++ b/libs/clearlooks-newer/animation.c @@ -31,7 +31,7 @@ struct _AnimationInfo { GTimer *timer; - + gdouble start_modifier; gdouble stop_time; GtkWidget *widget; @@ -107,11 +107,11 @@ static void destroy_animation_info_and_weak_unref (gpointer data) { AnimationInfo *animation_info = data; - + /* force a last redraw. This is so that if the animation is removed, * the widget is left in a sane state. */ force_widget_redraw (animation_info->widget); - + g_object_weak_unref (G_OBJECT (animation_info->widget), on_animated_widget_destruction, data); animation_info_destroy (animation_info); } @@ -122,7 +122,7 @@ lookup_animation_info (const GtkWidget *widget) { if (animated_widgets) return g_hash_table_lookup (animated_widgets, widget); - + return NULL; } @@ -131,26 +131,26 @@ static void add_animation (const GtkWidget *widget, gdouble stop_time) { AnimationInfo *value; - + /* object already in the list, do not add it twice */ if (lookup_animation_info (widget)) return; - + if (animated_widgets == NULL) animated_widgets = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, destroy_animation_info_and_weak_unref); - + value = g_new(AnimationInfo, 1); - + value->widget = (GtkWidget*) widget; - + value->timer = g_timer_new (); value->stop_time= stop_time; value->start_modifier = 0.0; g_object_weak_ref (G_OBJECT (widget), on_animated_widget_destruction, value); g_hash_table_insert (animated_widgets, (GtkWidget*) widget, value); - + start_timer (); } @@ -161,34 +161,34 @@ update_animation_info (gpointer key, gpointer value, gpointer user_data) { AnimationInfo *animation_info; GtkWidget *widget = key; - + animation_info = value; (void) user_data; - + g_assert ((widget != NULL) && (animation_info != NULL)); - + /* remove the widget from the hash table if it is not drawable */ if (!GTK_WIDGET_DRAWABLE (widget)) { return TRUE; } - + if (GE_IS_PROGRESS_BAR (widget)) { gfloat fraction = gtk_progress_bar_get_fraction (GTK_PROGRESS_BAR (widget)); - + /* stop animation for filled/not filled progress bars */ if (fraction <= 0.0 || fraction >= 1.0) return TRUE; } - + force_widget_redraw (widget); - + /* stop at stop_time */ if (animation_info->stop_time != 0 && g_timer_elapsed (animation_info->timer, NULL) > animation_info->stop_time) return TRUE; - + return FALSE; } @@ -197,21 +197,21 @@ static gboolean animation_timeout_handler (gpointer data) { (void) data; - + /*g_print("** TICK **\n");*/ - + /* enter threads as update_animation_info will use gtk/gdk. */ gdk_threads_enter (); g_hash_table_foreach_remove (animated_widgets, update_animation_info, NULL); /* leave threads again */ gdk_threads_leave (); - + if(g_hash_table_size(animated_widgets)==0) { stop_timer (); return FALSE; } - + return TRUE; } @@ -220,13 +220,13 @@ on_checkbox_toggle (GtkWidget *widget, gpointer data) { AnimationInfo *animation_info; (void) data; - + animation_info = lookup_animation_info (widget); - + if (animation_info != NULL) { gfloat elapsed = g_timer_elapsed (animation_info->timer, NULL); - + animation_info->start_modifier = elapsed - animation_info->start_modifier; } else @@ -239,7 +239,7 @@ static void on_connected_widget_destruction (gpointer data, GObject *widget) { (void) widget; - + connected_widgets = g_slist_remove (connected_widgets, data); g_free (data); } @@ -251,14 +251,14 @@ disconnect_all_signals (void) while (item != NULL) { SignalInfo *signal_info = (SignalInfo*) item->data; - + g_signal_handler_disconnect (signal_info->widget, signal_info->handler_id); g_object_weak_unref (G_OBJECT (signal_info->widget), on_connected_widget_destruction, signal_info); g_free (signal_info); - + item = g_slist_next (item); } - + g_slist_free (connected_widgets); connected_widgets = NULL; } @@ -281,7 +281,7 @@ void clearlooks_animation_progressbar_add (GtkWidget *progressbar) { gdouble fraction = gtk_progress_bar_get_fraction (GTK_PROGRESS_BAR (progressbar)); - + if (fraction < 1.0 && fraction > 0.0) add_animation ((GtkWidget*) progressbar, 0.0); } @@ -295,10 +295,10 @@ clearlooks_animation_connect_checkbox (GtkWidget *widget) if (!g_slist_find_custom (connected_widgets, widget, find_signal_info)) { SignalInfo * signal_info = g_new (SignalInfo, 1); - + signal_info->widget = widget; signal_info->handler_id = g_signal_connect ((GObject*)widget, "toggled", G_CALLBACK (on_checkbox_toggle), NULL); - + connected_widgets = g_slist_append (connected_widgets, signal_info); g_object_weak_ref (G_OBJECT (widget), on_connected_widget_destruction, signal_info); } @@ -317,7 +317,7 @@ gdouble clearlooks_animation_elapsed (gpointer data) { AnimationInfo *animation_info = lookup_animation_info (data); - + if (animation_info) return g_timer_elapsed (animation_info->timer, NULL) - animation_info->start_modifier; @@ -330,13 +330,13 @@ void clearlooks_animation_cleanup (void) { disconnect_all_signals (); - + if (animated_widgets != NULL) { g_hash_table_destroy (animated_widgets); animated_widgets = NULL; } - + stop_timer (); } #else /* !HAVE_ANIMATION */ diff --git a/libs/clearlooks-newer/cairo-support.c b/libs/clearlooks-newer/cairo-support.c index 4b82bb5758..e221a0d8e8 100644 --- a/libs/clearlooks-newer/cairo-support.c +++ b/libs/clearlooks-newer/cairo-support.c @@ -34,12 +34,12 @@ ge_hsb_from_color (const CairoColor *color, } *brightness = (max + min) / 2; - + if (fabs(max - min) < 0.0001) { *hue = 0; *saturation = 0; - } + } else { if (*brightness <= 0.5) @@ -81,7 +81,7 @@ ge_color_from_hsb (gdouble hue, gdouble m1, m2, m3; if (!color) return; - + if (brightness <= 0.5) m2 = brightness * (1 + saturation); else @@ -93,7 +93,7 @@ ge_color_from_hsb (gdouble hue, hue_shift[1] = hue; hue_shift[2] = hue - 120; - color_shift[0] = color_shift[1] = color_shift[2] = brightness; + color_shift[0] = color_shift[1] = color_shift[2] = brightness; i = (saturation == 0)?3:0; @@ -114,12 +114,12 @@ ge_color_from_hsb (gdouble hue, color_shift[i] = m1 + (m2 - m1) * (240 - m3) / 60; else color_shift[i] = m1; - } + } color->r = color_shift[0]; color->g = color_shift[1]; - color->b = color_shift[2]; - color->a = 1.0; + color->b = color_shift[2]; + color->a = 1.0; } void @@ -201,7 +201,7 @@ ge_shade_color(const CairoColor *base, gdouble shade_ratio, CairoColor *composit saturation = MAX(saturation, 0.0); ge_color_from_hsb (hue, saturation, brightness, composite); - composite->a = base->a; + composite->a = base->a; } void @@ -219,7 +219,7 @@ ge_saturate_color (const CairoColor *base, gdouble saturate_level, CairoColor *c saturation = MAX(saturation, 0.0); ge_color_from_hsb (hue, saturation, brightness, composite); - composite->a = base->a; + composite->a = base->a; } void @@ -261,7 +261,7 @@ ge_cairo_set_color (cairo_t *cr, const CairoColor *color) { g_return_if_fail (cr && color); - cairo_set_source_rgba (cr, color->r, color->g, color->b, color->a); + cairo_set_source_rgba (cr, color->r, color->g, color->b, color->a); } void @@ -282,7 +282,7 @@ ge_cairo_pattern_add_color_stop_color (cairo_pattern_t *pattern, { g_return_if_fail (pattern && color); - cairo_pattern_add_color_stop_rgba (pattern, offset, color->r, color->g, color->b, color->a); + cairo_pattern_add_color_stop_rgba (pattern, offset, color->r, color->g, color->b, color->a); } void @@ -302,7 +302,7 @@ ge_cairo_pattern_add_color_stop_shade(cairo_pattern_t *pattern, ge_shade_color(color, shade, &shaded); } - ge_cairo_pattern_add_color_stop_color(pattern, offset, &shaded); + ge_cairo_pattern_add_color_stop_color(pattern, offset, &shaded); } /* This function will draw a rounded corner at position x,y. If the radius @@ -370,22 +370,22 @@ ge_cairo_rounded_rectangle (cairo_t *cr, cairo_move_to (cr, x+radius, y); else cairo_move_to (cr, x, y); - + if (corners & CR_CORNER_TOPRIGHT) cairo_arc (cr, x+w-radius, y+radius, radius, G_PI * 1.5, G_PI * 2); else cairo_line_to (cr, x+w, y); - + if (corners & CR_CORNER_BOTTOMRIGHT) cairo_arc (cr, x+w-radius, y+h-radius, radius, 0, G_PI * 0.5); else cairo_line_to (cr, x+w, y+h); - + if (corners & CR_CORNER_BOTTOMLEFT) cairo_arc (cr, x+radius, y+h-radius, radius, G_PI * 0.5, G_PI); else cairo_line_to (cr, x, y+h); - + if (corners & CR_CORNER_TOPLEFT) cairo_arc (cr, x+radius, y+radius, radius, G_PI, G_PI * 1.5); else @@ -425,7 +425,7 @@ ge_cairo_simple_border (cairo_t *cr, g_return_if_fail (cr != NULL); g_return_if_fail (tl != NULL); g_return_if_fail (br != NULL); - + solid_color = (tl == br) || ((tl->r == br->r) && (tl->g == br->g) && (tl->b == br->b) && (tl->a == br->a)); @@ -437,16 +437,16 @@ ge_cairo_simple_border (cairo_t *cr, if (topleft_overlap) { - ge_cairo_set_color(cr, br); + ge_cairo_set_color(cr, br); cairo_move_to(cr, x + 0.5, y + height - 0.5); cairo_line_to(cr, x + width - 0.5, y + height - 0.5); cairo_line_to(cr, x + width - 0.5, y + 0.5); - + cairo_stroke (cr); } - ge_cairo_set_color(cr, tl); + ge_cairo_set_color(cr, tl); cairo_move_to(cr, x + 0.5, y + height - 0.5); cairo_line_to(cr, x + 0.5, y + 0.5); @@ -457,7 +457,7 @@ ge_cairo_simple_border (cairo_t *cr, if (!solid_color) { cairo_stroke(cr); - ge_cairo_set_color(cr, br); + ge_cairo_set_color(cr, br); } cairo_move_to(cr, x + 0.5, y + height - 0.5); @@ -479,7 +479,7 @@ void ge_cairo_polygon (cairo_t *cr, cairo_save(cr); - ge_cairo_set_color(cr, color); + ge_cairo_set_color(cr, color); cairo_move_to(cr, points[0].x, points[0].y); for (i = 1; i < npoints; i++) @@ -490,7 +490,7 @@ void ge_cairo_polygon (cairo_t *cr, cairo_line_to(cr, points[i].x, points[i].y); } } - + if ((points[npoints-1].x != points[0].x) || (points[npoints-1].y != points[0].y)) { @@ -511,7 +511,7 @@ void ge_cairo_line (cairo_t *cr, { cairo_save(cr); - ge_cairo_set_color(cr, color); + ge_cairo_set_color(cr, color); cairo_set_line_width (cr, 1); cairo_move_to(cr, x1 + 0.5, y1 + 0.5); @@ -531,13 +531,13 @@ ge_cairo_mirror (cairo_t *cr, gint *height) { cairo_matrix_t matrix; - + cairo_matrix_init_identity (&matrix); - + cairo_translate (cr, *x, *y); *x = 0; *y = 0; - + if (mirror & CR_MIRROR_HORIZONTAL) { cairo_matrix_scale (&matrix, -1, 1); @@ -566,7 +566,7 @@ ge_cairo_exchange_axis (cairo_t *cr, cairo_matrix_init (&matrix, 0, 1, 1, 0, 0, 0); cairo_transform (cr, &matrix); - + /* swap width/height */ tmp = *width; *x = 0; @@ -658,7 +658,7 @@ ge_cairo_pattern_fill(cairo_t *canvas, ***********************************************/ CairoPattern* ge_cairo_color_pattern(CairoColor *base) -{ +{ CairoPattern * result = g_new0(CairoPattern, 1); #if ((CAIRO_VERSION_MAJOR < 1) || ((CAIRO_VERSION_MAJOR == 1) && (CAIRO_VERSION_MINOR < 2))) @@ -674,7 +674,7 @@ ge_cairo_color_pattern(CairoColor *base) base->a); result->operator = CAIRO_OPERATOR_SOURCE; - + return result; } @@ -685,7 +685,7 @@ ge_cairo_color_pattern(CairoColor *base) ***********************************************/ CairoPattern* ge_cairo_pixbuf_pattern(GdkPixbuf *pixbuf) -{ +{ CairoPattern * result = g_new0(CairoPattern, 1); cairo_t *canvas; @@ -701,7 +701,7 @@ ge_cairo_pixbuf_pattern(GdkPixbuf *pixbuf) width = gdk_pixbuf_get_width(pixbuf); height = gdk_pixbuf_get_height(pixbuf); - + surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height); canvas = cairo_create(surface); @@ -728,7 +728,7 @@ ge_cairo_pixbuf_pattern(GdkPixbuf *pixbuf) ***********************************************/ CairoPattern* ge_cairo_pixmap_pattern(GdkPixmap *pixmap) -{ +{ CairoPattern * result = NULL; GdkPixbuf * pixbuf; @@ -741,7 +741,7 @@ ge_cairo_pixmap_pattern(GdkPixmap *pixmap) 0, 0, 0, 0, width, height); result = ge_cairo_pixbuf_pattern(pixbuf); - + g_object_unref (pixbuf); return result; @@ -762,7 +762,7 @@ ge_cairo_linear_shade_gradient_pattern(CairoColor *base, gboolean vertical) { CairoPattern * result = g_new0(CairoPattern, 1); - + #if ((CAIRO_VERSION_MAJOR < 1) || ((CAIRO_VERSION_MAJOR == 1) && (CAIRO_VERSION_MINOR < 2))) result->type = CAIRO_PATTERN_TYPE_LINEAR; #endif @@ -796,7 +796,7 @@ ge_cairo_pattern_destroy(CairoPattern *pattern) { if (pattern->handle) cairo_pattern_destroy(pattern->handle); - + g_free(pattern); } } @@ -810,7 +810,7 @@ const gchar* g_module_check_init (GModule *module) { (void) module; - + return gtk_check_version (GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION - GTK_INTERFACE_AGE); diff --git a/libs/clearlooks-newer/clearlooks_draw.c b/libs/clearlooks-newer/clearlooks_draw.c index 29803a2d71..bf01a002a4 100644 --- a/libs/clearlooks-newer/clearlooks_draw.c +++ b/libs/clearlooks-newer/clearlooks_draw.c @@ -104,9 +104,9 @@ clearlooks_draw_shadow (cairo_t *cr, const ClearlooksColors *colors, gfloat radi ge_shade_color (&colors->shade[6], 0.92, &shadow); cairo_set_line_width (cr, 1.0); - + cairo_set_source_rgba (cr, shadow.r, shadow.g, shadow.b, 0.1); - + cairo_move_to (cr, width, radius); ge_cairo_rounded_corner (cr, width, height, radius, CR_CORNER_BOTTOMRIGHT); cairo_line_to (cr, radius, height); @@ -156,42 +156,42 @@ clearlooks_draw_highlight_and_shade (cairo_t *cr, const ClearlooksColors *colors width -= 3; height -= 3; - + cairo_save (cr); - + /* Top/Left highlight */ if (corners & CR_CORNER_BOTTOMLEFT) cairo_move_to (cr, x, y+height-radius); else cairo_move_to (cr, x, y+height); - + ge_cairo_rounded_corner (cr, x, y, radius, corners & CR_CORNER_TOPLEFT); if (corners & CR_CORNER_TOPRIGHT) cairo_line_to (cr, x+width-radius, y); else cairo_line_to (cr, x+width, y); - + if (params->shadow & CL_SHADOW_OUT) ge_cairo_set_color (cr, &hilight); else ge_cairo_set_color (cr, &shadow); - + cairo_stroke (cr); - + /* Bottom/Right highlight -- this includes the corners */ cairo_move_to (cr, x+width-radius, y); /* topright and by radius to the left */ ge_cairo_rounded_corner (cr, x+width, y, radius, corners & CR_CORNER_TOPRIGHT); ge_cairo_rounded_corner (cr, x+width, y+height, radius, corners & CR_CORNER_BOTTOMRIGHT); ge_cairo_rounded_corner (cr, x, y+height, radius, corners & CR_CORNER_BOTTOMLEFT); - + if (params->shadow & CL_SHADOW_OUT) ge_cairo_set_color (cr, &shadow); else ge_cairo_set_color (cr, &hilight); - + cairo_stroke (cr); - + cairo_restore (cr); } @@ -206,7 +206,7 @@ clearlooks_set_border_gradient (cairo_t *cr, const CairoColor *color, double hil pattern = cairo_pattern_create_linear (0, 0, width, height); cairo_pattern_add_color_stop_rgb (pattern, 0, color->r, color->g, color->b); cairo_pattern_add_color_stop_rgb (pattern, 1, bottom_shade.r, bottom_shade.g, bottom_shade.b); - + cairo_set_source (cr, pattern); cairo_pattern_destroy (pattern); } @@ -229,7 +229,7 @@ clearlooks_draw_gripdots (cairo_t *cr, const ClearlooksColors *colors, int x, in { xoff = x -(xr * 3 / 2) + 3 * i; yoff = y -(yr * 3 / 2) + 3 * j; - + cairo_rectangle (cr, width/2+0.5+xoff, height/2+0.5+yoff, 2, 2); cairo_set_source_rgba (cr, hilight.r, hilight.g, hilight.b, 0.8+contrast); cairo_fill (cr); @@ -254,9 +254,9 @@ clearlooks_draw_button (cairo_t *cr, CairoColor shadow; ge_shade_color (border_normal, 0.925, &shadow); - + cairo_save (cr); - + cairo_translate (cr, x, y); cairo_set_line_width (cr, 1.0); @@ -275,23 +275,23 @@ clearlooks_draw_button (cairo_t *cr, cairo_translate (cr, 0.5, 0.5); params->style_functions->draw_inset (cr, ¶ms->parentbg, 0, 0, width-1, height-1, radius+1, params->corners); cairo_translate (cr, -0.5, -0.5); - } - + } + ge_cairo_rounded_rectangle (cr, xoffset+1, yoffset+1, width-(xoffset*2)-2, height-(yoffset*2)-2, radius, params->corners); - + if (!params->active) { cairo_pattern_t *pattern; gdouble shade_size = ((100.0/height)*8.0)/100.0; CairoColor top_shade, bottom_shade, middle_shade; - + ge_shade_color (fill, 1.1, &top_shade); ge_shade_color (fill, 0.98, &middle_shade); ge_shade_color (fill, 0.93, &bottom_shade); - + pattern = cairo_pattern_create_linear (0, 0, 0, height); cairo_pattern_add_color_stop_rgb (pattern, 0.0, top_shade.r, top_shade.g, top_shade.b); cairo_pattern_add_color_stop_rgb (pattern, shade_size, fill->r, fill->g, fill->b); @@ -307,7 +307,7 @@ clearlooks_draw_button (cairo_t *cr, else { cairo_pattern_t *pattern; - + ge_cairo_set_color (cr, fill); cairo_fill_preserve (cr); @@ -346,7 +346,7 @@ clearlooks_draw_button (cairo_t *cr, ge_cairo_set_color (cr, d); ge_cairo_stroke_rectangle (cr, 3.5, 3.5, width-7, height-7); } - + ge_cairo_rounded_rectangle (cr, xoffset + 0.5, yoffset + 0.5, width-(xoffset*2)-1, height-(yoffset*2)-1, radius, params->corners); if (params->disabled) @@ -356,9 +356,9 @@ clearlooks_draw_button (cairo_t *cr, clearlooks_set_border_gradient (cr, border_normal, 1.32, 0, height); else ge_cairo_set_color (cr, border_normal); - + cairo_stroke (cr); - + /* Draw the "shadow" */ if (!params->active) { @@ -368,7 +368,7 @@ clearlooks_draw_button (cairo_t *cr, cairo_line_to (cr, width-params->xthickness, height - params->ythickness - 1); cairo_set_source_rgba (cr, shadow.r, shadow.g, shadow.b, 0.1); cairo_stroke (cr); - + /* Draw topleft shadow */ clearlooks_draw_top_left_highlight (cr, fill, params, width, height, radius); } @@ -384,13 +384,13 @@ clearlooks_draw_entry (cairo_t *cr, const CairoColor *base = &colors->base[params->state_type]; CairoColor border = colors->shade[params->disabled ? 4 : 6]; double radius = MIN (params->radius, MIN ((width - 4.0) / 2.0, (height - 4.0) / 2.0)); - + if (params->focus) border = colors->spot[2]; cairo_translate (cr, x+0.5, y+0.5); cairo_set_line_width (cr, 1.0); - + /* Fill the background (shouldn't have to) */ cairo_rectangle (cr, -0.5, -0.5, width, height); ge_cairo_set_color (cr, ¶ms->parentbg); @@ -400,7 +400,7 @@ clearlooks_draw_entry (cairo_t *cr, cairo_rectangle (cr, 1.5, 1.5, width-4, height-4); ge_cairo_set_color (cr, base); cairo_fill (cr); - + params->style_functions->draw_inset (cr, ¶ms->parentbg, 0, 0, width-1, height-1, radius+1, params->corners); /* Draw the inner shadow */ @@ -472,20 +472,20 @@ clearlooks_draw_spinbutton_down (cairo_t *cr, ge_shade_color (&colors->bg[GTK_STATE_NORMAL], 0.8, &shadow); cairo_translate (cr, x+1, y+1); - + ge_cairo_rounded_rectangle (cr, 1, 1, width-4, height-4, radius, params->corners); - + ge_cairo_set_color (cr, &colors->bg[params->state_type]); - + cairo_fill_preserve (cr); - + pattern = cairo_pattern_create_linear (0, 0, 0, height); cairo_pattern_add_color_stop_rgb (pattern, 0.0, shadow.r, shadow.g, shadow.b); cairo_pattern_add_color_stop_rgba (pattern, 1.0, shadow.r, shadow.g, shadow.b, 0.0); - + cairo_set_source (cr, pattern); cairo_fill (cr); - + cairo_pattern_destroy (pattern); } @@ -503,13 +503,13 @@ clearlooks_scale_draw_gradient (cairo_t *cr, cairo_pattern_add_color_stop_rgb (pattern, 0.0, c1->r, c1->g, c1->b); cairo_pattern_add_color_stop_rgb (pattern, 1.0, c2->r, c2->g, c2->b); - cairo_rectangle (cr, x+0.5, y+0.5, width-1, height-1); + cairo_rectangle (cr, x+0.5, y+0.5, width-1, height-1); cairo_set_source (cr, pattern); cairo_fill (cr); cairo_pattern_destroy (pattern); - + ge_cairo_set_color (cr, c3); - ge_cairo_stroke_rectangle (cr, x, y, width, height); + ge_cairo_stroke_rectangle (cr, x, y, width, height); } #define TROUGH_SIZE 6 @@ -527,7 +527,7 @@ clearlooks_draw_scale_trough (cairo_t *cr, { trough_width = width-3; trough_height = TROUGH_SIZE-2; - + translate_x = x + 0.5; translate_y = y + 0.5 + (height/2) - (TROUGH_SIZE/2); } @@ -535,19 +535,19 @@ clearlooks_draw_scale_trough (cairo_t *cr, { trough_width = TROUGH_SIZE-2; trough_height = height-3; - + translate_x = x + 0.5 + (width/2) - (TROUGH_SIZE/2); translate_y = y + 0.5; } cairo_set_line_width (cr, 1.0); cairo_translate (cr, translate_x, translate_y); - + if (!slider->fill_level) params->style_functions->draw_inset (cr, ¶ms->parentbg, 0, 0, trough_width+2, trough_height+2, 0, 0); - + cairo_translate (cr, 1, 1); - + if (!slider->lower && ! slider->fill_level) clearlooks_scale_draw_gradient (cr, &colors->shade[3], /* top */ &colors->shade[2], /* bottom */ @@ -575,7 +575,7 @@ clearlooks_draw_slider (cairo_t *cr, cairo_pattern_t *pattern; - cairo_set_line_width (cr, 1.0); + cairo_set_line_width (cr, 1.0); cairo_translate (cr, x, y); if (params->prelight) @@ -619,7 +619,7 @@ clearlooks_draw_slider (cairo_t *cr, if (params->prelight) { CairoColor highlight; - ge_shade_color (spot, 1.5, &highlight); + ge_shade_color (spot, 1.5, &highlight); cairo_pattern_add_color_stop_rgb (pattern, 0.0, highlight.r, highlight.g, highlight.b); cairo_pattern_add_color_stop_rgb (pattern, 1.0, spot->r, spot->g, spot->b); cairo_set_source (cr, pattern); @@ -650,10 +650,10 @@ clearlooks_draw_slider (cairo_t *cr, { cairo_move_to (cr, 6, 0.5); cairo_line_to (cr, 6, height-1); - + cairo_move_to (cr, width-7, 0.5); cairo_line_to (cr, width-7, height-1); - + cairo_set_line_width (cr, 1.0); cairo_set_source_rgba (cr, border->r, border->g, @@ -672,7 +672,7 @@ clearlooks_draw_slider_button (cairo_t *cr, { double radius = MIN (params->radius, MIN ((width - 2.0) / 2.0, (height - 2.0) / 2.0)); cairo_set_line_width (cr, 1.0); - + if (!slider->horizontal) ge_cairo_exchange_axis (cr, &x, &y, &width, &height); cairo_translate (cr, x+0.5, y+0.5); @@ -694,15 +694,15 @@ clearlooks_draw_progressbar_trough (cairo_t *cr, CairoColor shadow; cairo_pattern_t *pattern; double radius = MIN (params->radius, MIN ((height-2.0) / 2.0, (width-2.0) / 2.0)); - + cairo_save (cr); cairo_set_line_width (cr, 1.0); - + /* Fill with bg color */ ge_cairo_set_color (cr, &colors->bg[params->state_type]); - - cairo_rectangle (cr, x, y, width, height); + + cairo_rectangle (cr, x, y, width, height); cairo_fill (cr); /* Create trough box */ @@ -724,8 +724,8 @@ clearlooks_draw_progressbar_trough (cairo_t *cr, /* Top shadow */ cairo_rectangle (cr, x+1, y+1, width-2, 4); pattern = cairo_pattern_create_linear (x, y, x, y+4); - cairo_pattern_add_color_stop_rgba (pattern, 0.0, shadow.r, shadow.g, shadow.b, 0.3); - cairo_pattern_add_color_stop_rgba (pattern, 1.0, shadow.r, shadow.g, shadow.b, 0.); + cairo_pattern_add_color_stop_rgba (pattern, 0.0, shadow.r, shadow.g, shadow.b, 0.3); + cairo_pattern_add_color_stop_rgba (pattern, 1.0, shadow.r, shadow.g, shadow.b, 0.); cairo_set_source (cr, pattern); cairo_fill (cr); cairo_pattern_destroy (pattern); @@ -733,8 +733,8 @@ clearlooks_draw_progressbar_trough (cairo_t *cr, /* Left shadow */ cairo_rectangle (cr, x+1, y+1, 4, height-2); pattern = cairo_pattern_create_linear (x, y, x+4, y); - cairo_pattern_add_color_stop_rgba (pattern, 0.0, shadow.r, shadow.g, shadow.b, 0.3); - cairo_pattern_add_color_stop_rgba (pattern, 1.0, shadow.r, shadow.g, shadow.b, 0.); + cairo_pattern_add_color_stop_rgba (pattern, 0.0, shadow.r, shadow.g, shadow.b, 0.3); + cairo_pattern_add_color_stop_rgba (pattern, 1.0, shadow.r, shadow.g, shadow.b, 0.); cairo_set_source (cr, pattern); cairo_fill (cr); cairo_pattern_destroy (pattern); @@ -776,7 +776,7 @@ clearlooks_draw_progressbar_fill (cairo_t *cr, stroke_width = height*2; x_step = (((float)stroke_width/10)*offset); /* This looks weird ... */ - + cairo_translate (cr, x, y); cairo_save (cr); @@ -804,16 +804,16 @@ clearlooks_draw_progressbar_fill (cairo_t *cr, cairo_line_to (cr, stroke_width-x_step, 0); cairo_line_to (cr, stroke_width/2-x_step, height); cairo_line_to (cr, -x_step, height); - + cairo_translate (cr, stroke_width, 0); tile_pos += stroke_width; } - + cairo_set_source_rgba (cr, colors->spot[2].r, colors->spot[2].g, colors->spot[2].b, 0.15); - + cairo_fill (cr); cairo_restore (cr); /* rounded clip region */ @@ -893,7 +893,7 @@ clearlooks_draw_progressbar_fill (cairo_t *cr, ge_cairo_set_color (cr, &shadow); cairo_stroke (cr); } - + cairo_restore (cr); cairo_restore (cr); /* rotation, mirroring */ @@ -908,9 +908,9 @@ clearlooks_draw_optionmenu (cairo_t *cr, { SeparatorParameters separator; int offset = params->ythickness + 1; - + params->style_functions->draw_button (cr, colors, params, x, y, width, height); - + separator.horizontal = FALSE; params->style_functions->draw_separator (cr, colors, params, &separator, x+optionmenu->linepos, y + offset, 2, height - offset*2); } @@ -923,7 +923,7 @@ clearlooks_draw_menu_item_separator (cairo_t *cr, int x, int y, int width, int height) { (void) widget; - + cairo_save (cr); cairo_set_line_cap (cr, CAIRO_LINE_CAP_BUTT); ge_cairo_set_color (cr, &colors->shade[5]); @@ -979,10 +979,10 @@ clearlooks_draw_menubar2 (cairo_t *cr, (void) menubar; ge_shade_color (&colors->bg[0], 0.96, &lower); - + cairo_translate (cr, x, y); cairo_rectangle (cr, 0, 0, width, height); - + /* Draw the gradient */ pattern = cairo_pattern_create_linear (0, 0, 0, height); cairo_pattern_add_color_stop_rgb (pattern, 0.0, colors->bg[0].r, @@ -994,7 +994,7 @@ clearlooks_draw_menubar2 (cairo_t *cr, cairo_set_source (cr, pattern); cairo_fill (cr); cairo_pattern_destroy (pattern); - + /* Draw bottom line */ cairo_set_line_width (cr, 1.0); cairo_move_to (cr, 0, height-0.5); @@ -1049,7 +1049,7 @@ clearlooks_get_frame_gap_clip (int x, int y, int width, int height, { (void) x; (void) y; - + if (frame->gap_side == CL_GAP_TOP) { CLEARLOOKS_RECTANGLE_SET ((*bevel), 1.5 + frame->gap_x, -0.5, @@ -1062,21 +1062,21 @@ clearlooks_get_frame_gap_clip (int x, int y, int width, int height, CLEARLOOKS_RECTANGLE_SET ((*bevel), 1.5 + frame->gap_x, height - 2.5, frame->gap_width - 3, 2.0); CLEARLOOKS_RECTANGLE_SET ((*border), 0.5 + frame->gap_x, height - 1.5, - frame->gap_width - 2, 2.0); + frame->gap_width - 2, 2.0); } else if (frame->gap_side == CL_GAP_LEFT) { CLEARLOOKS_RECTANGLE_SET ((*bevel), -0.5, 1.5 + frame->gap_x, 2.0, frame->gap_width - 3); CLEARLOOKS_RECTANGLE_SET ((*border), -0.5, 0.5 + frame->gap_x, - 1.0, frame->gap_width - 2); + 1.0, frame->gap_width - 2); } else if (frame->gap_side == CL_GAP_RIGHT) { CLEARLOOKS_RECTANGLE_SET ((*bevel), width - 2.5, 1.5 + frame->gap_x, 2.0, frame->gap_width - 3); CLEARLOOKS_RECTANGLE_SET ((*border), width - 1.5, 0.5 + frame->gap_x, - 1.0, frame->gap_width - 2); + 1.0, frame->gap_width - 2); } } @@ -1095,7 +1095,7 @@ clearlooks_draw_frame (cairo_t *cr, CairoColor hilight; ge_shade_color (&colors->bg[GTK_STATE_NORMAL], 1.05, &hilight); - + if (frame->shadow == CL_SHADOW_NONE) { const CairoColor *bg = &colors->bg[params->state_type]; ge_cairo_set_color (cr, bg); @@ -1104,14 +1104,14 @@ clearlooks_draw_frame (cairo_t *cr, cairo_stroke (cr); return; } - + if (frame->gap_x != -1) clearlooks_get_frame_gap_clip (x, y, width, height, frame, &bevel_clip, &frame_clip); - + cairo_set_line_width (cr, 1.0); cairo_translate (cr, x+0.5, y+0.5); - + /* save everything */ cairo_save (cr); /* Set clip for the bevel */ @@ -1123,7 +1123,7 @@ clearlooks_draw_frame (cairo_t *cr, cairo_rectangle (cr, bevel_clip.x, bevel_clip.y, bevel_clip.width, bevel_clip.height); cairo_clip (cr); } - + /* Draw the bevel */ if (frame->shadow == CL_SHADOW_ETCHED_IN || frame->shadow == CL_SHADOW_ETCHED_OUT) { @@ -1141,7 +1141,7 @@ clearlooks_draw_frame (cairo_t *cr, shadow.shadow = frame->shadow; clearlooks_draw_highlight_and_shade (cr, colors, &shadow, width, height, 0); } - + /* restore the previous clip region */ cairo_restore (cr); cairo_save (cr); @@ -1188,7 +1188,7 @@ clearlooks_draw_tab (cairo_t *cr, CairoColor hilight; cairo_pattern_t *pattern; - + double radius; double strip_size; @@ -1199,7 +1199,7 @@ clearlooks_draw_tab (cairo_t *cr, cairo_clip (cr); cairo_new_path (cr); - /* Translate and set line width */ + /* Translate and set line width */ cairo_set_line_width (cr, 1.0); cairo_translate (cr, x+0.5, y+0.5); @@ -1210,7 +1210,7 @@ clearlooks_draw_tab (cairo_t *cr, { height += 3.0; strip_size = 2.0/height; /* 2 pixel high strip */ - + if (tab->gap_side == CL_GAP_TOP) cairo_translate (cr, 0.0, -3.0); /* gap at the other side */ } @@ -1218,18 +1218,18 @@ clearlooks_draw_tab (cairo_t *cr, { width += 3.0; strip_size = 2.0/width; - + if (tab->gap_side == CL_GAP_LEFT) cairo_translate (cr, -3.0, 0.0); /* gap at the other side */ } - + /* Set the fill color */ fill = &colors->bg[params->state_type]; /* Set tab shape */ ge_cairo_rounded_rectangle (cr, 0, 0, width-1, height-1, radius, params->corners); - + /* Draw fill */ ge_cairo_set_color (cr, fill); cairo_fill (cr); @@ -1241,15 +1241,15 @@ clearlooks_draw_tab (cairo_t *cr, if (!params->active) { ShadowParameters shadow; - + shadow.shadow = CL_SHADOW_OUT; shadow.corners = params->corners; - + clearlooks_draw_highlight_and_shade (cr, colors, &shadow, width, height, radius); } - + if (params->active) { @@ -1260,7 +1260,7 @@ clearlooks_draw_tab (cairo_t *cr, tab->gap_side == CL_GAP_BOTTOM ? height : 0 ); ge_cairo_rounded_rectangle (cr, 0, 0, width-1, height-1, radius, params->corners); - + ge_shade_color (fill, 0.92, &shadow); cairo_pattern_add_color_stop_rgba (pattern, 0.0, hilight.r, hilight.g, hilight.b, 0.4); @@ -1278,9 +1278,9 @@ clearlooks_draw_tab (cairo_t *cr, tab->gap_side == CL_GAP_TOP ? height-2 : 0, tab->gap_side == CL_GAP_RIGHT ? width : 0, tab->gap_side == CL_GAP_BOTTOM ? height : 0 ); - + ge_cairo_rounded_rectangle (cr, 0, 0, width-1, height-1, radius, params->corners); - + cairo_pattern_add_color_stop_rgb (pattern, 0.0, stripe_fill->r, stripe_fill->g, stripe_fill->b); cairo_pattern_add_color_stop_rgb (pattern, strip_size, stripe_fill->r, stripe_fill->g, stripe_fill->b); @@ -1292,7 +1292,7 @@ clearlooks_draw_tab (cairo_t *cr, } ge_cairo_rounded_rectangle (cr, 0, 0, width-1, height-1, radius, params->corners); - + if (params->active) { ge_cairo_set_color (cr, border2); @@ -1304,7 +1304,7 @@ clearlooks_draw_tab (cairo_t *cr, tab->gap_side == CL_GAP_TOP ? height-2 : 2, tab->gap_side == CL_GAP_RIGHT ? width : 2, tab->gap_side == CL_GAP_BOTTOM ? height : 2 ); - + cairo_pattern_add_color_stop_rgb (pattern, 0.0, stripe_border->r, stripe_border->g, stripe_border->b); cairo_pattern_add_color_stop_rgb (pattern, strip_size, stripe_border->r, stripe_border->g, stripe_border->b); cairo_pattern_add_color_stop_rgb (pattern, strip_size, border1->r, border1->g, border1->b); @@ -1335,12 +1335,12 @@ clearlooks_draw_separator (cairo_t *cr, { cairo_set_line_width (cr, 1.0); cairo_translate (cr, x, y+0.5); - + cairo_move_to (cr, 0.0, 0.0); cairo_line_to (cr, width, 0.0); ge_cairo_set_color (cr, &color); cairo_stroke (cr); - + cairo_move_to (cr, 0.0, 1.0); cairo_line_to (cr, width, 1.0); ge_cairo_set_color (cr, &hilight); @@ -1350,12 +1350,12 @@ clearlooks_draw_separator (cairo_t *cr, { cairo_set_line_width (cr, 1.0); cairo_translate (cr, x+0.5, y); - + cairo_move_to (cr, 0.0, 0.0); cairo_line_to (cr, 0.0, height); ge_cairo_set_color (cr, &color); cairo_stroke (cr); - + cairo_move_to (cr, 1.0, 0.0); cairo_line_to (cr, 1.0, height); ge_cairo_set_color (cr, &hilight); @@ -1377,12 +1377,12 @@ clearlooks_draw_list_view_header (cairo_t *cr, CairoColor hilight; CairoColor shadow; - ge_shade_color (border, 1.5, &hilight); - ge_shade_color (border, 0.925, &shadow); + ge_shade_color (border, 1.5, &hilight); + ge_shade_color (border, 0.925, &shadow); cairo_translate (cr, x, y); cairo_set_line_width (cr, 1.0); - + /* Draw highlight */ if (header->order == CL_ORDER_FIRST) { @@ -1391,19 +1391,19 @@ clearlooks_draw_list_view_header (cairo_t *cr, } else cairo_move_to (cr, 0.0, 0.5); - + cairo_line_to (cr, width, 0.5); - + ge_cairo_set_color (cr, &hilight); cairo_stroke (cr); - + /* Draw bottom border */ cairo_move_to (cr, 0.0, height-0.5); cairo_line_to (cr, width, height-0.5); ge_cairo_set_color (cr, border); cairo_stroke (cr); - /* Draw bottom shade */ + /* Draw bottom shade */ pattern = cairo_pattern_create_linear (0.0, height-5.0, 0.0, height-1.0); cairo_pattern_add_color_stop_rgba (pattern, 0.0, shadow.r, shadow.g, shadow.b, 0.0); cairo_pattern_add_color_stop_rgba (pattern, 1.0, shadow.r, shadow.g, shadow.b, 0.3); @@ -1412,14 +1412,14 @@ clearlooks_draw_list_view_header (cairo_t *cr, cairo_set_source (cr, pattern); cairo_fill (cr); cairo_pattern_destroy (pattern); - + /* Draw resize grip */ if ((params->ltr && header->order != CL_ORDER_LAST) || (!params->ltr && header->order != CL_ORDER_FIRST) || header->resizable) { SeparatorParameters separator; separator.horizontal = FALSE; - + if (params->ltr) params->style_functions->draw_separator (cr, colors, params, &separator, width-1.5, 4.0, 2, height-8.0); @@ -1445,7 +1445,7 @@ clearlooks_draw_toolbar (cairo_t *cr, (void) widget; dark = &colors->shade[3]; ge_shade_color (fill, 1.1, &light); - + cairo_set_line_width (cr, 1.0); cairo_translate (cr, x, y); @@ -1507,10 +1507,10 @@ clearlooks_draw_menubaritem (cairo_t *cr, CairoColor fill_shade; CairoColor border = colors->spot[2]; cairo_pattern_t *pattern; - + ge_shade_color (&border, 1.05, &border); ge_shade_color (fill, 0.85, &fill_shade); - + cairo_set_line_width (cr, 1.0); ge_cairo_rounded_rectangle (cr, x + 0.5, y + 0.5, width - 1, height, widget->radius, widget->corners); @@ -1537,7 +1537,7 @@ clearlooks_draw_selected_cell (cairo_t *cr, CairoColor border; cairo_pattern_t *pattern; cairo_save (cr); - + cairo_translate (cr, x, y); if (params->focus) @@ -1560,8 +1560,8 @@ clearlooks_draw_selected_cell (cairo_t *cr, cairo_fill (cr); cairo_pattern_destroy (pattern); - - ge_shade_color(&upper_color, 0.8, &border); + + ge_shade_color(&upper_color, 0.8, &border); cairo_move_to (cr, 0, 0.5); cairo_rel_line_to (cr, width, 0); @@ -1586,18 +1586,18 @@ clearlooks_draw_scrollbar_trough (cairo_t *cr, CairoColor bg_shade; cairo_pattern_t *pattern; const CairoColor *border = &colors->shade[5]; - + (void) widget; bg = &colors->shade[2]; ge_shade_color (bg, 0.95, &bg_shade); - + cairo_set_line_width (cr, 1); /* cairo_translate (cr, x, y); */ - + if (scrollbar->horizontal) ge_cairo_exchange_axis (cr, &x, &y, &width, &height); - cairo_translate (cr, x, y); + cairo_translate (cr, x, y); /* Draw fill */ cairo_rectangle (cr, 1, 0, width-2, height); @@ -1607,12 +1607,12 @@ clearlooks_draw_scrollbar_trough (cairo_t *cr, /* Draw shadow */ pattern = cairo_pattern_create_linear (1, 0, 3, 0); cairo_pattern_add_color_stop_rgb (pattern, 0, bg_shade.r, bg_shade.g, bg_shade.b); - cairo_pattern_add_color_stop_rgb (pattern, 1.0, bg->r, bg->g, bg->b); + cairo_pattern_add_color_stop_rgb (pattern, 1.0, bg->r, bg->g, bg->b); cairo_rectangle (cr, 1, 0, 4, height); cairo_set_source (cr, pattern); cairo_fill (cr); cairo_pattern_destroy (pattern); - + /* Draw border */ ge_cairo_set_color (cr, border); ge_cairo_stroke_rectangle (cr, 0.5, 0.5, width-1, height-1); @@ -1633,7 +1633,7 @@ clearlooks_draw_scrollbar_stepper (cairo_t *cr, double radius = MIN (widget->radius, MIN ((width - 2.0) / 2.0, (height - 2.0) / 2.0)); ge_shade_color(&colors->shade[6], 1.05, &border); - + if (scrollbar->horizontal) { if (stepper->stepper == CL_STEPPER_A) @@ -1648,22 +1648,22 @@ clearlooks_draw_scrollbar_stepper (cairo_t *cr, else if (stepper->stepper == CL_STEPPER_D) corners = CR_CORNER_BOTTOMLEFT | CR_CORNER_BOTTOMRIGHT; } - + cairo_translate (cr, x, y); cairo_set_line_width (cr, 1); - + ge_cairo_rounded_rectangle (cr, 1, 1, width-2, height-2, radius, corners); - + if (scrollbar->horizontal) pattern = cairo_pattern_create_linear (0, 0, 0, height); else pattern = cairo_pattern_create_linear (0, 0, width, 0); - + s2 = colors->bg[widget->state_type]; ge_shade_color(&s2, 1.06, &s1); ge_shade_color(&s2, 0.98, &s3); ge_shade_color(&s2, 0.94, &s4); - + cairo_pattern_add_color_stop_rgb(pattern, 0, s1.r, s1.g, s1.b); cairo_pattern_add_color_stop_rgb(pattern, 0.5, s2.r, s2.g, s2.b); cairo_pattern_add_color_stop_rgb(pattern, 0.7, s3.r, s3.g, s3.b); @@ -1671,15 +1671,15 @@ clearlooks_draw_scrollbar_stepper (cairo_t *cr, cairo_set_source (cr, pattern); cairo_fill (cr); cairo_pattern_destroy (pattern); - + cairo_translate (cr, 0.5, 0.5); clearlooks_draw_top_left_highlight (cr, &s2, widget, width, height, (stepper->stepper == CL_STEPPER_A) ? radius : 0); cairo_translate (cr, -0.5, -0.5); - + ge_cairo_rounded_rectangle (cr, 0.5, 0.5, width-1, height-1, radius, corners); clearlooks_set_border_gradient (cr, &border, 1.2, (scrollbar->horizontal ? 0 : width), (scrollbar->horizontal ? height: 0)); cairo_stroke (cr); - + cairo_translate (cr, 0.5, 0.5); } @@ -1710,11 +1710,11 @@ clearlooks_draw_scrollbar_slider (cairo_t *cr, else height += 1; } - + if (!scrollbar->horizontal) ge_cairo_exchange_axis (cr, &x, &y, &width, &height); - cairo_translate (cr, x, y); + cairo_translate (cr, x, y); if (scrollbar->has_color) { @@ -1726,27 +1726,27 @@ clearlooks_draw_scrollbar_slider (cairo_t *cr, if (widget->prelight) ge_shade_color (&fill, 1.1, &fill); - + cairo_set_line_width (cr, 1); - + ge_shade_color (&fill, 1.3, &hilight); ge_shade_color (&fill, 1.1, &shade1); ge_shade_color (&fill, 1.05, &shade2); ge_shade_color (&fill, 0.98, &shade3); - + pattern = cairo_pattern_create_linear (1, 1, 1, height-2); cairo_pattern_add_color_stop_rgb (pattern, 0, shade1.r, shade1.g, shade1.b); cairo_pattern_add_color_stop_rgb (pattern, 0.5, shade2.r, shade2.g, shade2.b); - cairo_pattern_add_color_stop_rgb (pattern, 0.5, shade3.r, shade3.g, shade3.b); + cairo_pattern_add_color_stop_rgb (pattern, 0.5, shade3.r, shade3.g, shade3.b); cairo_pattern_add_color_stop_rgb (pattern, 1, fill.r, fill.g, fill.b); cairo_rectangle (cr, 1, 1, width-2, height-2); cairo_set_source (cr, pattern); cairo_fill (cr); cairo_pattern_destroy (pattern); - + cairo_set_source_rgba (cr, hilight.r, hilight.g, hilight.b, 0.5); ge_cairo_stroke_rectangle (cr, 1.5, 1.5, width-3, height-3); - + ge_cairo_set_color (cr, border); ge_cairo_stroke_rectangle (cr, 0.5, 0.5, width-1, height-1); } @@ -1760,12 +1760,12 @@ clearlooks_draw_scrollbar_slider (cairo_t *cr, int bar_x, i; ge_shade_color(&colors->shade[6], 1.05, &border); - + s2 = colors->bg[widget->state_type]; ge_shade_color(&s2, 1.06, &s1); ge_shade_color(&s2, 0.98, &s3); ge_shade_color(&s2, 0.94, &s4); - + pattern = cairo_pattern_create_linear(1, 1, 1, height-1); cairo_pattern_add_color_stop_rgb(pattern, 0, s1.r, s1.g, s1.b); cairo_pattern_add_color_stop_rgb(pattern, 0.5, s2.r, s2.g, s2.b); @@ -1776,20 +1776,20 @@ clearlooks_draw_scrollbar_slider (cairo_t *cr, cairo_set_source(cr, pattern); cairo_fill(cr); cairo_pattern_destroy(pattern); - + clearlooks_set_border_gradient (cr, &border, 1.2, 0, height); ge_cairo_stroke_rectangle (cr, 0.5, 0.5, width-1, height-1); - + cairo_move_to (cr, 1.5, height-1.5); cairo_line_to (cr, 1.5, 1.5); cairo_line_to (cr, width-1.5, 1.5); ge_shade_color (&s2, 1.3, &s5); cairo_set_source_rgba (cr, s5.r, s5.g, s5.b, 0.5); cairo_stroke(cr); - + /* draw handles */ cairo_set_line_width (cr, 1); - + bar_x = width/2 - 4; cairo_translate(cr, 0.5, 0.5); for (i=0; i<3; i++) @@ -1798,16 +1798,16 @@ clearlooks_draw_scrollbar_slider (cairo_t *cr, cairo_line_to (cr, bar_x, height-5); ge_cairo_set_color (cr, dark); cairo_stroke (cr); - + cairo_move_to (cr, bar_x+1, 4); cairo_line_to (cr, bar_x+1, height-5); ge_cairo_set_color (cr, light); cairo_stroke (cr); - + bar_x += 3; } } - + } static void @@ -1892,7 +1892,7 @@ clearlooks_draw_handle (cairo_t *cr, { const CairoColor *fill = &colors->bg[params->state_type]; int num_bars = 6; /* shut up gcc warnings */ - + switch (handle->type) { case CL_HANDLE_TOOLBAR: @@ -1909,11 +1909,11 @@ clearlooks_draw_handle (cairo_t *cr, ge_cairo_set_color (cr, fill); cairo_fill (cr); } - + cairo_translate (cr, x+0.5, y+0.5); - + cairo_set_line_width (cr, 1); - + if (handle->horizontal) { params->style_functions->draw_gripdots (cr, colors, 0, 0, width, height, num_bars, 2, 0.1); @@ -2037,28 +2037,28 @@ clearlooks_draw_radiobutton (cairo_t *cr, cairo_pattern_add_color_stop_rgba (pt, 0.5, shadow.r, shadow.b, shadow.g, 0.5); cairo_pattern_add_color_stop_rgba (pt, 0.5, highlight.r, highlight.g, highlight.b, 0.5); cairo_pattern_add_color_stop_rgb (pt, 1.0, highlight.r, highlight.g, highlight.b); - + cairo_translate (cr, x, y); - + cairo_set_line_width (cr, 2); - cairo_arc (cr, 7, 7, 6, 0, G_PI*2); + cairo_arc (cr, 7, 7, 6, 0, G_PI*2); cairo_set_source (cr, pt); cairo_stroke (cr); cairo_pattern_destroy (pt); cairo_set_line_width (cr, 1); - cairo_arc (cr, 7, 7, 5.5, 0, G_PI*2); - + cairo_arc (cr, 7, 7, 5.5, 0, G_PI*2); + if (!widget->disabled) { ge_cairo_set_color (cr, &colors->base[0]); cairo_fill_preserve (cr); } - + ge_cairo_set_color (cr, border); cairo_stroke (cr); - + if (draw_bullet) { if (inconsistent) @@ -2077,7 +2077,7 @@ clearlooks_draw_radiobutton (cairo_t *cr, cairo_arc (cr, 7, 7, 3, 0, G_PI*2); ge_cairo_set_color (cr, dot); cairo_fill (cr); - + cairo_arc (cr, 6, 6, 1, 0, G_PI*2); cairo_set_source_rgba (cr, highlight.r, highlight.g, highlight.b, 0.5); cairo_fill (cr); @@ -2099,7 +2099,7 @@ clearlooks_draw_checkbox (cairo_t *cr, inconsistent = (checkbox->shadow_type == GTK_SHADOW_ETCHED_IN); draw_bullet |= inconsistent; - + if (widget->disabled) { border = &colors->shade[5]; @@ -2113,11 +2113,11 @@ clearlooks_draw_checkbox (cairo_t *cr, cairo_translate (cr, x, y); cairo_set_line_width (cr, 1); - + if (widget->xthickness > 2 && widget->ythickness > 2) { widget->style_functions->draw_inset (cr, &widget->parentbg, 0.5, 0.5, width-1, height-1, 1, CR_CORNER_ALL); - + /* Draw the rectangle for the checkbox itself */ ge_cairo_rounded_rectangle (cr, 1.5, 1.5, width-3, height-3, (widget->radius > 0)? 1 : 0, CR_CORNER_ALL); } @@ -2126,13 +2126,13 @@ clearlooks_draw_checkbox (cairo_t *cr, /* Draw the rectangle for the checkbox itself */ ge_cairo_rounded_rectangle (cr, 0.5, 0.5, width-1, height-1, (widget->radius > 0)? 1 : 0, CR_CORNER_ALL); } - + if (!widget->disabled) { ge_cairo_set_color (cr, &colors->base[0]); cairo_fill_preserve (cr); } - + ge_cairo_set_color (cr, border); cairo_stroke (cr); @@ -2149,13 +2149,13 @@ clearlooks_draw_checkbox (cairo_t *cr, cairo_set_line_width (cr, 1.7); cairo_move_to (cr, 0.5 + (width*0.2), (height*0.5)); cairo_line_to (cr, 0.5 + (width*0.4), (height*0.7)); - + cairo_curve_to (cr, 0.5 + (width*0.4), (height*0.7), 0.5 + (width*0.5), (height*0.4), 0.5 + (width*0.70), (height*0.25)); } - + ge_cairo_set_color (cr, dot); cairo_stroke (cr); } @@ -2174,7 +2174,7 @@ clearlooks_draw_normal_arrow (cairo_t *cr, const CairoColor *color, arrow_width = MIN (height * 2.0 + MAX (1.0, ceil (height * 2.0 / 6.0 * 2.0) / 2.0) / 2.0, width); line_width_2 = MAX (1.0, ceil (arrow_width / 6.0 * 2.0) / 2.0) / 2.0; arrow_height = arrow_width / 2.0 + line_width_2; - + cairo_translate (cr, x, y - arrow_height / 2.0); cairo_move_to (cr, -arrow_width / 2.0, line_width_2); @@ -2185,10 +2185,10 @@ clearlooks_draw_normal_arrow (cairo_t *cr, const CairoColor *color, cairo_line_to (cr, arrow_width / 2.0, line_width_2); cairo_line_to (cr, 0, arrow_height); cairo_close_path (cr); - + ge_cairo_set_color (cr, color); cairo_fill (cr); - + cairo_restore (cr); } @@ -2199,13 +2199,13 @@ clearlooks_draw_combo_arrow (cairo_t *cr, const CairoColor *color, double arrow_width = MIN (height * 2 / 3.0, width); double arrow_height = arrow_width / 2.0; double gap_size = 1.0 * arrow_height; - + cairo_save (cr); cairo_translate (cr, x, y - (arrow_height + gap_size) / 2.0); cairo_rotate (cr, G_PI); clearlooks_draw_normal_arrow (cr, color, 0, 0, arrow_width, arrow_height); cairo_restore (cr); - + clearlooks_draw_normal_arrow (cr, color, x, y + (arrow_height + gap_size) / 2.0, arrow_width, arrow_height); } @@ -2215,7 +2215,7 @@ _clearlooks_draw_arrow (cairo_t *cr, const CairoColor *color, double x, double y, double width, double height) { double rotate; - + if (dir == CL_DIRECTION_LEFT) rotate = G_PI*1.5; else if (dir == CL_DIRECTION_RIGHT) @@ -2226,11 +2226,11 @@ _clearlooks_draw_arrow (cairo_t *cr, const CairoColor *color, rotate = 0; else return; - + if (type == CL_ARROW_NORMAL) { cairo_translate (cr, x, y); - cairo_rotate (cr, -rotate); + cairo_rotate (cr, -rotate); clearlooks_draw_normal_arrow (cr, color, 0, 0, width, height); } else if (type == CL_ARROW_COMBO) @@ -2249,10 +2249,10 @@ clearlooks_draw_arrow (cairo_t *cr, { const CairoColor *color = &colors->fg[widget->state_type]; gdouble tx, ty; - + tx = x + width/2.0; ty = y + height/2.0; - + if (widget->disabled) { _clearlooks_draw_arrow (cr, &colors->shade[0], @@ -2261,7 +2261,7 @@ clearlooks_draw_arrow (cairo_t *cr, } cairo_identity_matrix (cr); - + _clearlooks_draw_arrow (cr, color, arrow->direction, arrow->type, tx, ty, width, height); } diff --git a/libs/clearlooks-newer/clearlooks_draw_glossy.c b/libs/clearlooks-newer/clearlooks_draw_glossy.c index 164ea2b33a..cf3c96a451 100644 --- a/libs/clearlooks-newer/clearlooks_draw_glossy.c +++ b/libs/clearlooks-newer/clearlooks_draw_glossy.c @@ -60,7 +60,7 @@ clearlooks_draw_glossy_gradient (cairo_t *cr, cairo_set_source (cr, pt); ge_cairo_rounded_rectangle (cr, x, y, width, height, radius, corners); cairo_fill (cr); - + cairo_pattern_destroy (pt); } @@ -203,42 +203,42 @@ clearlooks_glossy_draw_highlight_and_shade (cairo_t *cr, /* not really sure of shading ratios... we will think */ ge_shade_color (bg_color, 0.8, &shadow); ge_shade_color (bg_color, 1.2, &highlight); - + cairo_save (cr); - + /* Top/Left highlight */ if (corners & CR_CORNER_BOTTOMLEFT) cairo_move_to (cr, x, y+height-radius); else cairo_move_to (cr, x, y+height); - + ge_cairo_rounded_corner (cr, x, y, radius, corners & CR_CORNER_TOPLEFT); if (corners & CR_CORNER_TOPRIGHT) cairo_line_to (cr, x+width-radius, y); else cairo_line_to (cr, x+width, y); - + if (params->shadow & CL_SHADOW_OUT) cairo_set_source_rgba (cr, highlight.r, highlight.g, highlight.b, 0.5); else cairo_set_source_rgba (cr, shadow.r, shadow.g, shadow.b, 0.5); - + cairo_stroke (cr); - + /* Bottom/Right highlight -- this includes the corners */ cairo_move_to (cr, x+width-radius, y); /* topright and by radius to the left */ ge_cairo_rounded_corner (cr, x+width, y, radius, corners & CR_CORNER_TOPRIGHT); ge_cairo_rounded_corner (cr, x+width, y+height, radius, corners & CR_CORNER_BOTTOMRIGHT); ge_cairo_rounded_corner (cr, x, y+height, radius, corners & CR_CORNER_BOTTOMLEFT); - + if (params->shadow & CL_SHADOW_OUT) cairo_set_source_rgba (cr, shadow.r, shadow.g, shadow.b, 0.5); else cairo_set_source_rgba (cr, highlight.r, highlight.g, highlight.b, 0.5); - + cairo_stroke (cr); - + cairo_restore (cr); } @@ -255,7 +255,7 @@ clearlooks_glossy_draw_button (cairo_t *cr, double radius; cairo_pattern_t *pattern; - + cairo_save (cr); cairo_translate (cr, x, y); cairo_set_line_width (cr, 1.0); @@ -293,7 +293,7 @@ clearlooks_glossy_draw_button (cairo_t *cr, ge_cairo_set_color (cr, &glow); cairo_stroke (cr); } - + /* if (!(params->enable_glow && !params->active && !params->disabled)) */ if (!(params->prelight && params->enable_glow && !params->active)) { if (!(params->disabled)) @@ -308,7 +308,7 @@ clearlooks_glossy_draw_button (cairo_t *cr, clearlooks_draw_glossy_gradient (cr, xoffset+1, yoffset+1, width-(xoffset*2)-2, height-(yoffset*2)-2, &fill, params->disabled, radius, params->corners); - + /* Pressed button shadow */ if (params->active) { @@ -320,16 +320,16 @@ clearlooks_glossy_draw_button (cairo_t *cr, ge_cairo_rounded_rectangle (cr, xoffset+1, yoffset+1, width-(xoffset*2)-2, height, radius, params->corners & (CR_CORNER_TOPLEFT | CR_CORNER_TOPRIGHT | CR_CORNER_BOTTOMLEFT)); cairo_clip (cr); cairo_rectangle (cr, xoffset+1, yoffset+1, width-(xoffset*2)-2, 3); - + pattern = cairo_pattern_create_linear (xoffset+1, yoffset+1, xoffset+1, yoffset+4); cairo_pattern_add_color_stop_rgba (pattern, 0.0, shadow.r, shadow.g, shadow.b, 0.58); cairo_pattern_add_color_stop_rgba (pattern, 1.0, shadow.r, shadow.g, shadow.b, 0.0); cairo_set_source (cr, pattern); cairo_fill (cr); cairo_pattern_destroy (pattern); - + cairo_rectangle (cr, xoffset+1, yoffset+1, 3, height-(yoffset*2)-2); - + pattern = cairo_pattern_create_linear (xoffset+1, yoffset+1, xoffset+4, yoffset+1); cairo_pattern_add_color_stop_rgba (pattern, 0.0, shadow.r, shadow.g, shadow.b, 0.58); cairo_pattern_add_color_stop_rgba (pattern, 1.0, shadow.r, shadow.g, shadow.b, 0.0); @@ -339,13 +339,13 @@ clearlooks_glossy_draw_button (cairo_t *cr, cairo_restore (cr); } - + /* Default button highlight */ if (params->is_default && !params->active && !params->disabled) { const CairoColor *glow = &colors->spot[0]; double hh = (height-5)/2.0 + 1; - + cairo_rectangle (cr, 3.5, 3.5, width-7, height-7); ge_cairo_set_color (cr, glow); cairo_stroke (cr); @@ -355,7 +355,7 @@ clearlooks_glossy_draw_button (cairo_t *cr, cairo_rel_line_to (cr, width-5, 0); cairo_rel_line_to (cr, 0, hh); ge_cairo_set_color (cr, glow); cairo_stroke (cr); - + hh--; glow = &colors->spot[1]; @@ -364,7 +364,7 @@ clearlooks_glossy_draw_button (cairo_t *cr, ge_cairo_set_color (cr, glow); cairo_stroke (cr); } - + /* Border */ if (params->is_default || (params->prelight && params->enable_glow)) border_normal = colors->spot[2]; @@ -390,14 +390,14 @@ clearlooks_glossy_draw_progressbar_trough (cairo_t *cr, CairoColor shadow; cairo_pattern_t *pattern; double radius = MIN (params->radius, MIN ((height-2.0) / 2.0, (width-2.0) / 2.0)); - + cairo_save (cr); cairo_set_line_width (cr, 1.0); - + /* Fill with bg color */ ge_cairo_set_color (cr, &colors->bg[params->state_type]); - + cairo_rectangle (cr, x, y, width, height); cairo_fill (cr); @@ -474,7 +474,7 @@ clearlooks_glossy_draw_progressbar_fill (cairo_t *cr, stroke_width = height*2; x_step = (((float)stroke_width/10)*offset); /* This looks weird ... */ - + cairo_translate (cr, x, y); cairo_save (cr); @@ -505,16 +505,16 @@ clearlooks_glossy_draw_progressbar_fill (cairo_t *cr, cairo_line_to (cr, stroke_width-x_step, 0); cairo_line_to (cr, stroke_width/2-x_step, height); cairo_line_to (cr, -x_step, height); - + cairo_translate (cr, stroke_width, 0); tile_pos += stroke_width; } - + cairo_set_source_rgba (cr, colors->spot[2].r, colors->spot[2].g, colors->spot[2].b, 0.15); - + cairo_fill (cr); cairo_restore (cr); /* rounded clip region */ @@ -592,7 +592,7 @@ clearlooks_glossy_draw_progressbar_fill (cairo_t *cr, ge_cairo_set_color (cr, &shadow); cairo_stroke (cr); } - + cairo_restore (cr); cairo_restore (cr); /* rotation, mirroring */ @@ -616,7 +616,7 @@ clearlooks_glossy_scale_draw_gradient (cairo_t *cr, cairo_set_source (cr, pattern); cairo_fill (cr); cairo_pattern_destroy (pattern); - + clearlooks_set_mixed_color (cr, c3, c1, 0.3); ge_cairo_stroke_rectangle (cr, x, y, width, height); } @@ -636,7 +636,7 @@ clearlooks_glossy_draw_scale_trough (cairo_t *cr, { trough_width = width-3; trough_height = TROUGH_SIZE-2; - + translate_x = x + 0.5; translate_y = y + 0.5 + (height/2) - (TROUGH_SIZE/2); } @@ -644,7 +644,7 @@ clearlooks_glossy_draw_scale_trough (cairo_t *cr, { trough_width = TROUGH_SIZE-2; trough_height = height-3; - + translate_x = x + 0.5 + (width/2) - (TROUGH_SIZE/2); translate_y = y + 0.5; } @@ -654,9 +654,9 @@ clearlooks_glossy_draw_scale_trough (cairo_t *cr, if (!slider->fill_level) params->style_functions->draw_inset (cr, ¶ms->parentbg, 0, 0, trough_width+2, trough_height+2, 0, 0); - + cairo_translate (cr, 1, 1); - + if (!slider->lower && !slider->fill_level) clearlooks_glossy_scale_draw_gradient (cr, &colors->shade[3], /* top */ &colors->shade[2], /* bottom */ @@ -686,7 +686,7 @@ clearlooks_glossy_draw_tab (cairo_t *cr, CairoColor hilight; cairo_pattern_t *pattern; - + double radius; radius = MIN (params->radius, MIN ((width - 2.0) / 2.0, (height - 2.0) / 2.0)); @@ -706,25 +706,25 @@ clearlooks_glossy_draw_tab (cairo_t *cr, if (tab->gap_side == CL_GAP_TOP || tab->gap_side == CL_GAP_BOTTOM) { height += 3.0; - + if (tab->gap_side == CL_GAP_TOP) cairo_translate (cr, 0.0, -3.0); /* gap at the other side */ } else { width += 3.0; - + if (tab->gap_side == CL_GAP_LEFT) cairo_translate (cr, -3.0, 0.0); /* gap at the other side */ } - + /* Set the fill color */ fill = &colors->bg[params->state_type]; /* Set tab shape */ ge_cairo_rounded_rectangle (cr, 0, 0, width-1, height-1, radius, params->corners); - + /* Draw fill */ ge_cairo_set_color (cr, fill); cairo_fill (cr); @@ -735,10 +735,10 @@ clearlooks_glossy_draw_tab (cairo_t *cr, if (!params->active) { ShadowParameters shadow; - + shadow.shadow = CL_SHADOW_OUT; shadow.corners = params->corners; - + clearlooks_glossy_draw_highlight_and_shade (cr, &colors->bg[0], &shadow, width, height, radius); @@ -754,7 +754,7 @@ clearlooks_glossy_draw_tab (cairo_t *cr, tab->gap_side == CL_GAP_BOTTOM ? height : 0); ge_cairo_rounded_rectangle (cr, 0, 0, width-1, height-1, radius, params->corners); - + ge_shade_color (fill, 1.06, &shadow); ge_shade_color (fill, 1.18, &hilight); ge_shade_color (fill, 1.12, &f1); @@ -777,9 +777,9 @@ clearlooks_glossy_draw_tab (cairo_t *cr, tab->gap_side == CL_GAP_TOP ? height-2 : 0, tab->gap_side == CL_GAP_RIGHT ? width : 0, tab->gap_side == CL_GAP_BOTTOM ? height : 0); - + ge_cairo_rounded_rectangle (cr, 0, 0, width-1, height-1, radius, params->corners); - + cairo_pattern_add_color_stop_rgba (pattern, 0.0, stripe_fill->r, stripe_fill->g, stripe_fill->b, 0.5); cairo_pattern_add_color_stop_rgba (pattern, 0.8, fill->r, fill->g, fill->b, 0.0); @@ -789,7 +789,7 @@ clearlooks_glossy_draw_tab (cairo_t *cr, } ge_cairo_rounded_rectangle (cr, 0, 0, width-1, height-1, radius, params->corners); - + if (params->active) { ge_cairo_set_color (cr, border); @@ -801,7 +801,7 @@ clearlooks_glossy_draw_tab (cairo_t *cr, tab->gap_side == CL_GAP_TOP ? height-2 : 2, tab->gap_side == CL_GAP_RIGHT ? width : 2, tab->gap_side == CL_GAP_BOTTOM ? height : 2); - + cairo_pattern_add_color_stop_rgb (pattern, 0.0, stripe_border->r, stripe_border->g, stripe_border->b); cairo_pattern_add_color_stop_rgb (pattern, 0.8, border->r, border->g, border->b); cairo_set_source (cr, pattern); @@ -822,7 +822,7 @@ clearlooks_glossy_draw_slider (cairo_t *cr, CairoColor a, b, c, d; cairo_pattern_t *pattern; - cairo_set_line_width (cr, 1.0); + cairo_set_line_width (cr, 1.0); cairo_translate (cr, x, y); cairo_translate (cr, -0.5, -0.5); @@ -840,7 +840,7 @@ clearlooks_glossy_draw_slider (cairo_t *cr, pattern = cairo_pattern_create_linear (1, 1, 1, height-2); cairo_pattern_add_color_stop_rgb (pattern, 0, a.r, a.g, a.b); cairo_pattern_add_color_stop_rgb (pattern, 0.5, b.r, b.g, b.b); - cairo_pattern_add_color_stop_rgb (pattern, 0.5, c.r, c.g, c.b); + cairo_pattern_add_color_stop_rgb (pattern, 0.5, c.r, c.g, c.b); cairo_pattern_add_color_stop_rgb (pattern, 1.0, d.r, d.g, d.b); cairo_rectangle (cr, 1, 1, width-2, height-2); cairo_set_source (cr, pattern); @@ -868,12 +868,12 @@ clearlooks_glossy_draw_slider_button (cairo_t *cr, double radius = MIN (params->radius, MIN ((width - 1.0) / 2.0, (height - 1.0) / 2.0)); cairo_set_line_width (cr, 1.0); - + if (!slider->horizontal) ge_cairo_exchange_axis (cr, &x, &y, &width, &height); cairo_translate (cr, x+0.5, y+0.5); - + params->style_functions->draw_shadow (cr, colors, radius, width-1, height-1); params->style_functions->draw_slider (cr, colors, params, 1, 1, width-2, height-2); } @@ -891,7 +891,7 @@ clearlooks_glossy_draw_scrollbar_stepper (cairo_t *cr, CairoColor fill, s1, s2, s4; cairo_pattern_t *pattern; double radius = MIN (widget->radius, MIN ((width - 2.0) / 2.0, (height - 2.0) / 2.0)); - + if (scrollbar->horizontal) { if (stepper->stepper == CL_STEPPER_A) @@ -906,22 +906,22 @@ clearlooks_glossy_draw_scrollbar_stepper (cairo_t *cr, else if (stepper->stepper == CL_STEPPER_D) corners = CR_CORNER_BOTTOMLEFT | CR_CORNER_BOTTOMRIGHT; } - + cairo_translate (cr, x, y); cairo_set_line_width (cr, 1); - + ge_cairo_rounded_rectangle (cr, 1, 1, width-2, height-2, radius, corners); - + if (scrollbar->horizontal) pattern = cairo_pattern_create_linear (0, 0, 0, height); else pattern = cairo_pattern_create_linear (0, 0, width, 0); - + fill = colors->bg[widget->state_type]; ge_shade_color(&fill, 1.16, &s1); ge_shade_color(&fill, 1.08, &s2); ge_shade_color(&fill, 1.08, &s4); - + cairo_pattern_add_color_stop_rgb(pattern, 0, s1.r, s1.g, s1.b); cairo_pattern_add_color_stop_rgb(pattern, 0.5, s2.r, s2.g, s2.b); cairo_pattern_add_color_stop_rgb(pattern, 0.5, fill.r, fill.g, fill.b); @@ -929,16 +929,16 @@ clearlooks_glossy_draw_scrollbar_stepper (cairo_t *cr, cairo_set_source (cr, pattern); cairo_fill (cr); cairo_pattern_destroy (pattern); - + cairo_translate (cr, 0.5, 0.5); cairo_translate (cr, -0.5, -0.5); - + ge_cairo_rounded_rectangle (cr, 0.5, 0.5, width-1, height-1, radius, corners); clearlooks_set_mixed_color (cr, border, &fill, 0.2); if (widget->prelight) ge_cairo_set_color (cr, &colors->spot[2]); cairo_stroke (cr); - + cairo_translate (cr, 0.5, 0.5); } @@ -975,7 +975,7 @@ clearlooks_glossy_draw_scrollbar_slider (cairo_t *cr, else height += 1; } - + if (!scrollbar->horizontal) ge_cairo_exchange_axis (cr, &x, &y, &width, &height); @@ -983,14 +983,14 @@ clearlooks_glossy_draw_scrollbar_slider (cairo_t *cr, if (widget->prelight) ge_shade_color (&fill, 1.1, &fill); - + cairo_set_line_width (cr, 1); - + ge_shade_color (&fill, 1.25, &hilight); ge_shade_color (&fill, 1.16, &shade1); ge_shade_color (&fill, 1.08, &shade2); ge_shade_color (&fill, 1.08, &shade3); - + pattern = cairo_pattern_create_linear (1, 1, 1, height-2); cairo_pattern_add_color_stop_rgb (pattern, 0, shade1.r, shade1.g, shade1.b); cairo_pattern_add_color_stop_rgb (pattern, 0.5, shade2.r, shade2.g, shade2.b); @@ -1000,7 +1000,7 @@ clearlooks_glossy_draw_scrollbar_slider (cairo_t *cr, cairo_set_source (cr, pattern); cairo_fill (cr); cairo_pattern_destroy (pattern); - + if (scrollbar->has_color) { cairo_set_source_rgba (cr, hilight.r, hilight.g, hilight.b, 0.5); @@ -1050,7 +1050,7 @@ clearlooks_glossy_draw_list_view_header (cairo_t *cr, cairo_fill (cr); cairo_pattern_destroy (pattern); - + /* Draw highlight */ if (header->order == CL_ORDER_FIRST) { @@ -1059,19 +1059,19 @@ clearlooks_glossy_draw_list_view_header (cairo_t *cr, } else cairo_move_to (cr, 0.0, 0.5); - + cairo_line_to (cr, width, 0.5); - + cairo_set_source_rgba (cr, hilight.r, hilight.g, hilight.b, 0.5); cairo_stroke (cr); - + /* Draw resize grip */ if ((params->ltr && header->order != CL_ORDER_LAST) || (!params->ltr && header->order != CL_ORDER_FIRST) || header->resizable) { SeparatorParameters separator; separator.horizontal = FALSE; - + if (params->ltr) params->style_functions->draw_separator (cr, colors, params, &separator, width-1.5, 4.0, 2, height-8.0); @@ -1090,7 +1090,7 @@ clearlooks_glossy_draw_toolbar (cairo_t *cr, { CairoColor light; const CairoColor *dark; - + const CairoColor *fill = &colors->bg[GTK_STATE_NORMAL]; dark = &colors->shade[3]; @@ -1099,15 +1099,15 @@ clearlooks_glossy_draw_toolbar (cairo_t *cr, (void) height; ge_shade_color (fill, 1.1, &light); - + cairo_set_line_width (cr, 1.0); cairo_translate (cr, x, y); - + if (toolbar->style == 1) /* Enable Extra features */ { cairo_pattern_t *pattern; CairoColor shade1, shade2, shade3; - + ge_shade_color (fill, 1.08, &shade1); ge_shade_color (fill, 1.04, &shade2); ge_shade_color (fill, 1.04, &shade3); @@ -1137,7 +1137,7 @@ clearlooks_glossy_draw_toolbar (cairo_t *cr, cairo_line_to (cr, width-1, 0.5); ge_cairo_set_color (cr, &light); cairo_stroke (cr); - } + } } /* Draw shadow */ @@ -1271,9 +1271,9 @@ clearlooks_glossy_draw_radiobutton (cairo_t *cr, cairo_pattern_add_color_stop_rgba (pt, 0.5, shadow.r, shadow.b, shadow.g, 0.5); cairo_pattern_add_color_stop_rgba (pt, 0.5, highlight.r, highlight.g, highlight.b, 0.5); cairo_pattern_add_color_stop_rgb (pt, 1.0, highlight.r, highlight.g, highlight.b); - + cairo_translate (cr, x, y); - + cairo_set_line_width (cr, 2); cairo_arc (cr, 7, 7, 6, 0, G_PI*2); cairo_set_source (cr, pt); @@ -1283,19 +1283,19 @@ clearlooks_glossy_draw_radiobutton (cairo_t *cr, cairo_set_line_width (cr, 1); cairo_arc (cr, 7, 7, 5.5, 0, G_PI*2); - + if (!widget->disabled) { if (widget->prelight) clearlooks_set_mixed_color (cr, &colors->base[0], &colors->spot[1], 0.5); - else + else ge_cairo_set_color (cr, &colors->base[0]); cairo_fill_preserve (cr); } - + ge_cairo_set_color (cr, border); cairo_stroke (cr); - + if (draw_bullet) { if (inconsistent) @@ -1314,7 +1314,7 @@ clearlooks_glossy_draw_radiobutton (cairo_t *cr, cairo_arc (cr, 7, 7, 3, 0, G_PI*2); ge_cairo_set_color (cr, dot); cairo_fill (cr); - + cairo_arc (cr, 6, 6, 1, 0, G_PI*2); cairo_set_source_rgba (cr, highlight.r, highlight.g, highlight.b, 0.5); cairo_fill (cr); @@ -1336,7 +1336,7 @@ clearlooks_glossy_draw_checkbox (cairo_t *cr, inconsistent = (checkbox->shadow_type == GTK_SHADOW_ETCHED_IN); draw_bullet |= inconsistent; - + if (widget->disabled) { border = &colors->shade[5]; @@ -1346,19 +1346,19 @@ clearlooks_glossy_draw_checkbox (cairo_t *cr, { if (widget->prelight) border = &colors->spot[2]; - else + else border = &colors->shade[6]; dot = &colors->text[GTK_STATE_NORMAL]; } cairo_translate (cr, x, y); cairo_set_line_width (cr, 1); - + if (widget->xthickness > 2 && widget->ythickness > 2) { widget->style_functions->draw_inset (cr, &widget->parentbg, 0.5, 0.5, width-1, height-1, (widget->radius > 0)? 1 : 0, CR_CORNER_ALL); - + /* Draw the rectangle for the checkbox itself */ ge_cairo_rounded_rectangle (cr, 1.5, 1.5, width-3, height-3, (widget->radius > 0)? 1 : 0, CR_CORNER_ALL); @@ -1369,7 +1369,7 @@ clearlooks_glossy_draw_checkbox (cairo_t *cr, ge_cairo_rounded_rectangle (cr, 0.5, 0.5, width-1, height-1, (widget->radius > 0)? 1 : 0, CR_CORNER_ALL); } - + if (!widget->disabled) { if (widget->prelight) @@ -1378,7 +1378,7 @@ clearlooks_glossy_draw_checkbox (cairo_t *cr, ge_cairo_set_color (cr, &colors->base[0]); cairo_fill_preserve (cr); } - + ge_cairo_set_color (cr, border); cairo_stroke (cr); @@ -1395,13 +1395,13 @@ clearlooks_glossy_draw_checkbox (cairo_t *cr, cairo_set_line_width (cr, 1.7); cairo_move_to (cr, 0.5 + (width*0.2), (height*0.5)); cairo_line_to (cr, 0.5 + (width*0.4), (height*0.7)); - + cairo_curve_to (cr, 0.5 + (width*0.4), (height*0.7), 0.5 + (width*0.5), (height*0.4), 0.5 + (width*0.70), (height*0.25)); } - + ge_cairo_set_color (cr, dot); cairo_stroke (cr); } diff --git a/libs/clearlooks-newer/clearlooks_draw_gummy.c b/libs/clearlooks-newer/clearlooks_draw_gummy.c index 748d163468..97aca7eeac 100644 --- a/libs/clearlooks-newer/clearlooks_draw_gummy.c +++ b/libs/clearlooks-newer/clearlooks_draw_gummy.c @@ -123,7 +123,7 @@ clearlooks_gummy_draw_highlight_and_shade (cairo_t *cr, cairo_set_source_rgba (cr, highlight.r, highlight.g, highlight.b, 0.5); else cairo_set_source_rgba (cr, shadow.r, shadow.g, shadow.b, 0.5); - + cairo_stroke (cr); /* Bottom/Right highlight -- this includes the corners */ @@ -465,7 +465,7 @@ clearlooks_gummy_draw_progressbar_fill (cairo_t *cr, cairo_line_to (cr, stroke_width-x_step, 0); cairo_line_to (cr, stroke_width/2-x_step, height); cairo_line_to (cr, -x_step, height); - + cairo_translate (cr, stroke_width, 0); tile_pos += stroke_width; } @@ -846,7 +846,7 @@ clearlooks_gummy_draw_slider (cairo_t *cr, int bar_x, i; int shift_x; - cairo_set_line_width (cr, 1.0); + cairo_set_line_width (cr, 1.0); cairo_translate (cr, x, y); cairo_translate (cr, -0.5, -0.5); @@ -1445,7 +1445,7 @@ clearlooks_gummy_draw_checkbox (cairo_t *cr, { if (widget->prelight) border = &colors->spot[2]; - else + else border = &colors->shade[6]; dot = &colors->text[GTK_STATE_NORMAL]; } @@ -1457,7 +1457,7 @@ clearlooks_gummy_draw_checkbox (cairo_t *cr, { widget->style_functions->draw_inset (cr, &widget->parentbg, 0.5, 0.5, width-1, height-1, (widget->radius > 0)? 1 : 0, CR_CORNER_ALL); - + /* Draw the rectangle for the checkbox itself */ ge_cairo_rounded_rectangle (cr, 1.5, 1.5, width-3, height-3, (widget->radius > 0)? 1 : 0, CR_CORNER_ALL); @@ -1468,12 +1468,12 @@ clearlooks_gummy_draw_checkbox (cairo_t *cr, ge_cairo_rounded_rectangle (cr, 0.5, 0.5, width-1, height-1, (widget->radius > 0)? 1 : 0, CR_CORNER_ALL); } - + if (!widget->disabled) - { + { if (widget->prelight) clearlooks_set_mixed_color (cr, &colors->base[0], &colors->spot[1], 0.5); - else + else ge_cairo_set_color (cr, &colors->base[0]); cairo_fill_preserve (cr); } diff --git a/libs/clearlooks-newer/clearlooks_draw_inverted.c b/libs/clearlooks-newer/clearlooks_draw_inverted.c index 6b8939ce51..2156b841b0 100644 --- a/libs/clearlooks-newer/clearlooks_draw_inverted.c +++ b/libs/clearlooks-newer/clearlooks_draw_inverted.c @@ -63,7 +63,7 @@ clearlooks_set_border_gradient (cairo_t *cr, const CairoColor *color, double hil pattern = cairo_pattern_create_linear (0, 0, width, height); cairo_pattern_add_color_stop_rgb (pattern, 0, color->r, color->g, color->b); cairo_pattern_add_color_stop_rgb (pattern, 1, bottom_shade.r, bottom_shade.g, bottom_shade.b); - + cairo_set_source (cr, pattern); cairo_pattern_destroy (pattern); } @@ -76,16 +76,16 @@ clearlooks_inverted_draw_button (cairo_t *cr, { double xoffset = 0, yoffset = 0; double radius = params->radius; - const CairoColor *fill = &colors->bg[params->state_type]; + const CairoColor *fill = &colors->bg[params->state_type]; const CairoColor *border_disabled = &colors->shade[4]; CairoColor border_normal; CairoColor shadow; ge_shade_color(&colors->shade[6], 1.05, &border_normal); ge_shade_color (&border_normal, 0.925, &shadow); - + cairo_save (cr); - + cairo_translate (cr, x, y); cairo_set_line_width (cr, 1.0); @@ -104,21 +104,21 @@ clearlooks_inverted_draw_button (cairo_t *cr, cairo_translate (cr, 0.5, 0.5); params->style_functions->draw_inset (cr, ¶ms->parentbg, 0, 0, width-1, height-1, radius+1, params->corners); cairo_translate (cr, -0.5, -0.5); - } - + } + ge_cairo_rounded_rectangle (cr, xoffset+1, yoffset+1, width-(xoffset*2)-2, height-(yoffset*2)-2, radius, params->corners); - + if (!params->active) { cairo_pattern_t *pattern; CairoColor top_shade, bottom_shade; - ge_shade_color (fill, 0.95, &top_shade); + ge_shade_color (fill, 0.95, &top_shade); ge_shade_color (fill, 1.05, &bottom_shade); - + pattern = cairo_pattern_create_linear (0, 0, 0, height); cairo_pattern_add_color_stop_rgb (pattern, 0.0, top_shade.r, top_shade.g, top_shade.b); cairo_pattern_add_color_stop_rgb (pattern, 1.0, bottom_shade.r, bottom_shade.g, bottom_shade.b); @@ -129,7 +129,7 @@ clearlooks_inverted_draw_button (cairo_t *cr, else { cairo_pattern_t *pattern; - + ge_cairo_set_color (cr, fill); cairo_fill_preserve (cr); @@ -168,7 +168,7 @@ clearlooks_inverted_draw_button (cairo_t *cr, ge_cairo_set_color (cr, d); ge_cairo_stroke_rectangle (cr, 3.5, 3.5, width-7, height-7); } - + if (params->disabled) ge_cairo_set_color (cr, border_disabled); else @@ -176,12 +176,12 @@ clearlooks_inverted_draw_button (cairo_t *cr, clearlooks_set_border_gradient (cr, &border_normal, 1.32, 0, height); else ge_cairo_set_color (cr, &border_normal); - + ge_cairo_rounded_rectangle (cr, xoffset + 0.5, yoffset + 0.5, width-(xoffset*2)-1, height-(yoffset*2)-1, radius, params->corners); cairo_stroke (cr); - + /* Draw the "shadow" */ if (!params->active) { @@ -191,7 +191,7 @@ clearlooks_inverted_draw_button (cairo_t *cr, cairo_line_to (cr, width-params->xthickness, height - params->ythickness - 1); cairo_set_source_rgba (cr, shadow.r, shadow.g, shadow.b, 0.1); cairo_stroke (cr); - + /* Draw topleft shadow */ clearlooks_draw_top_left_highlight (cr, fill, params, width, height, radius); } @@ -233,7 +233,7 @@ clearlooks_inverted_draw_progressbar_fill (cairo_t *cr, stroke_width = height*2; x_step = (((float)stroke_width/10)*offset); /* This looks weird ... */ - + cairo_translate (cr, x, y); cairo_save (cr); @@ -244,7 +244,7 @@ clearlooks_inverted_draw_progressbar_fill (cairo_t *cr, ge_cairo_rounded_rectangle (cr, -radius, 0, width + radius, height, radius, CR_CORNER_TOPRIGHT | CR_CORNER_BOTTOMRIGHT); cairo_clip (cr); - + ge_shade_color (&colors->spot[1], 1.05, &top_shade); /* Draw the background gradient */ @@ -264,16 +264,16 @@ clearlooks_inverted_draw_progressbar_fill (cairo_t *cr, cairo_line_to (cr, stroke_width-x_step, 0); cairo_line_to (cr, stroke_width/2-x_step, height); cairo_line_to (cr, -x_step, height); - + cairo_translate (cr, stroke_width, 0); tile_pos += stroke_width; } - + cairo_set_source_rgba (cr, colors->spot[2].r, colors->spot[2].g, colors->spot[2].b, 0.15); - + cairo_fill (cr); cairo_restore (cr); /* rounded clip region */ @@ -353,7 +353,7 @@ clearlooks_inverted_draw_progressbar_fill (cairo_t *cr, ge_cairo_set_color (cr, &shadow); cairo_stroke (cr); } - + cairo_restore (cr); cairo_restore (cr); /* rotation, mirroring */ @@ -398,10 +398,10 @@ clearlooks_inverted_draw_menubaritem (cairo_t *cr, CairoColor fill_shade; CairoColor border = colors->spot[2]; cairo_pattern_t *pattern; - + ge_shade_color (&border, 1.05, &border); ge_shade_color (fill, 0.85, &fill_shade); - + cairo_set_line_width (cr, 1.0); ge_cairo_rounded_rectangle (cr, x + 0.5, y + 0.5, width - 1, height, widget->radius, widget->corners); @@ -433,7 +433,7 @@ clearlooks_inverted_draw_tab (cairo_t *cr, CairoColor shadow; cairo_pattern_t *pattern; - + double radius; double strip_size; @@ -444,7 +444,7 @@ clearlooks_inverted_draw_tab (cairo_t *cr, cairo_clip (cr); cairo_new_path (cr); - /* Translate and set line width */ + /* Translate and set line width */ cairo_set_line_width (cr, 1.0); cairo_translate (cr, x+0.5, y+0.5); @@ -455,7 +455,7 @@ clearlooks_inverted_draw_tab (cairo_t *cr, { height += 3.0; strip_size = 2.0/height; /* 2 pixel high strip */ - + if (tab->gap_side == CL_GAP_TOP) cairo_translate (cr, 0.0, -3.0); /* gap at the other side */ } @@ -463,18 +463,18 @@ clearlooks_inverted_draw_tab (cairo_t *cr, { width += 3.0; strip_size = 2.0/width; - + if (tab->gap_side == CL_GAP_LEFT) cairo_translate (cr, -3.0, 0.0); /* gap at the other side */ } - + /* Set the fill color */ fill = &colors->bg[params->state_type]; /* Set tab shape */ ge_cairo_rounded_rectangle (cr, 0, 0, width-1, height-1, radius, params->corners); - + /* Draw fill */ ge_cairo_set_color (cr, fill); cairo_fill (cr); @@ -489,7 +489,7 @@ clearlooks_inverted_draw_tab (cairo_t *cr, tab->gap_side == CL_GAP_BOTTOM ? height : 0 ); ge_cairo_rounded_rectangle (cr, 0, 0, width-1, height-1, radius, params->corners); - + ge_shade_color (fill, 0.92, &shadow); cairo_pattern_add_color_stop_rgba (pattern, 0.0, hilight.r, hilight.g, hilight.b, 0.4); @@ -507,9 +507,9 @@ clearlooks_inverted_draw_tab (cairo_t *cr, tab->gap_side == CL_GAP_TOP ? height-2 : 0, tab->gap_side == CL_GAP_RIGHT ? width : 0, tab->gap_side == CL_GAP_BOTTOM ? height : 0 ); - + ge_cairo_rounded_rectangle (cr, 0, 0, width-1, height-1, radius, params->corners); - + cairo_pattern_add_color_stop_rgb (pattern, 0.0, stripe_fill->r, stripe_fill->g, stripe_fill->b); cairo_pattern_add_color_stop_rgb (pattern, strip_size, stripe_fill->r, stripe_fill->g, stripe_fill->b); @@ -521,10 +521,10 @@ clearlooks_inverted_draw_tab (cairo_t *cr, } ge_cairo_rounded_rectangle (cr, 0, 0, width-1, height-1, radius, params->corners); - + if (params->active) { - ge_cairo_set_color (cr, border2); + ge_cairo_set_color (cr, border2); cairo_stroke (cr); } else @@ -533,7 +533,7 @@ clearlooks_inverted_draw_tab (cairo_t *cr, tab->gap_side == CL_GAP_TOP ? height-2 : 2, tab->gap_side == CL_GAP_RIGHT ? width : 2, tab->gap_side == CL_GAP_BOTTOM ? height : 2 ); - + cairo_pattern_add_color_stop_rgb (pattern, 0.0, stripe_border->r, stripe_border->g, stripe_border->b); cairo_pattern_add_color_stop_rgb (pattern, strip_size, stripe_border->r, stripe_border->g, stripe_border->b); cairo_pattern_add_color_stop_rgb (pattern, strip_size, border1->r, border1->g, border1->b); @@ -557,7 +557,7 @@ clearlooks_inverted_draw_slider (cairo_t *cr, cairo_pattern_t *pattern; - cairo_set_line_width (cr, 1.0); + cairo_set_line_width (cr, 1.0); cairo_translate (cr, x, y); if (params->disabled) @@ -634,10 +634,10 @@ clearlooks_inverted_draw_slider (cairo_t *cr, { cairo_move_to (cr, 6, 0.5); cairo_line_to (cr, 6, height-1); - + cairo_move_to (cr, width-7, 0.5); cairo_line_to (cr, width-7, height-1); - + cairo_set_line_width (cr, 1.0); cairo_set_source_rgba (cr, border->r, border->g, @@ -656,7 +656,7 @@ clearlooks_inverted_draw_slider_button (cairo_t *cr, { double radius = MIN (params->radius, MIN ((width - 2.0) / 2.0, (height - 2.0) / 2.0)); cairo_set_line_width (cr, 1.0); - + if (!slider->horizontal) ge_cairo_exchange_axis (cr, &x, &y, &width, &height); cairo_translate (cr, x+0.5, y+0.5); @@ -683,12 +683,12 @@ clearlooks_inverted_draw_list_view_header (cairo_t *cr, CairoColor shadow; ge_shade_color (border, 1.5, &hilight); - ge_shade_color (fill, 1.05, &hilight_header); - ge_shade_color (fill, 0.95, &shadow); + ge_shade_color (fill, 1.05, &hilight_header); + ge_shade_color (fill, 0.95, &shadow); cairo_translate (cr, x, y); cairo_set_line_width (cr, 1.0); - + /* Draw highlight */ if (header->order == CL_ORDER_FIRST) { @@ -697,19 +697,19 @@ clearlooks_inverted_draw_list_view_header (cairo_t *cr, } else cairo_move_to (cr, 0.0, 0.5); - + cairo_line_to (cr, width, 0.5); - + ge_cairo_set_color (cr, &hilight); cairo_stroke (cr); - + /* Draw bottom border */ cairo_move_to (cr, 0.0, height-0.5); cairo_line_to (cr, width, height-0.5); ge_cairo_set_color (cr, border); cairo_stroke (cr); - /* Draw bottom shade */ + /* Draw bottom shade */ pattern = cairo_pattern_create_linear (0.0, 0, 0.0, height-1.0); cairo_pattern_add_color_stop_rgb (pattern, 0.0, shadow.r, shadow.g, shadow.b); cairo_pattern_add_color_stop_rgb (pattern, 1.0, hilight_header.r, hilight_header.g, hilight_header.b); @@ -718,14 +718,14 @@ clearlooks_inverted_draw_list_view_header (cairo_t *cr, cairo_set_source (cr, pattern); cairo_fill (cr); cairo_pattern_destroy (pattern); - + /* Draw resize grip */ if ((params->ltr && header->order != CL_ORDER_LAST) || (!params->ltr && header->order != CL_ORDER_FIRST) || header->resizable) { SeparatorParameters separator; separator.horizontal = FALSE; - + if (params->ltr) params->style_functions->draw_separator (cr, colors, params, &separator, width-1.5, 4.0, 2, height-8.0); @@ -749,7 +749,7 @@ clearlooks_inverted_draw_scrollbar_stepper (cairo_t *cr, CairoColor s1, s2, s3; cairo_pattern_t *pattern; double radius = MIN (widget->radius, MIN ((width - 2.0) / 2.0, (height - 2.0) / 2.0)); - + ge_shade_color(&colors->shade[6], 1.05, &border); if (scrollbar->horizontal) @@ -766,21 +766,21 @@ clearlooks_inverted_draw_scrollbar_stepper (cairo_t *cr, else if (stepper->stepper == CL_STEPPER_D) corners = CR_CORNER_BOTTOMLEFT | CR_CORNER_BOTTOMRIGHT; } - + cairo_translate (cr, x, y); cairo_set_line_width (cr, 1); - + ge_cairo_rounded_rectangle (cr, 1, 1, width-2, height-2, radius, corners); - + if (scrollbar->horizontal) pattern = cairo_pattern_create_linear (0, 0, 0, height); else pattern = cairo_pattern_create_linear (0, 0, width, 0); - + s1 = colors->bg[widget->state_type]; ge_shade_color(&s1, 0.95, &s2); ge_shade_color(&s1, 1.05, &s3); - + cairo_pattern_add_color_stop_rgb(pattern, 0, s2.r, s2.g, s2.b); cairo_pattern_add_color_stop_rgb(pattern, 1.0, s3.r, s3.g, s3.b); cairo_set_source (cr, pattern); @@ -789,10 +789,10 @@ clearlooks_inverted_draw_scrollbar_stepper (cairo_t *cr, clearlooks_draw_top_left_highlight (cr, &s1, widget, width, height, radius); - ge_cairo_rounded_rectangle (cr, 0.5, 0.5, width-1, height-1, radius, corners); + ge_cairo_rounded_rectangle (cr, 0.5, 0.5, width-1, height-1, radius, corners); clearlooks_set_border_gradient (cr, &border, 1.2, (scrollbar->horizontal ? 0 : width), (scrollbar->horizontal ? height: 0)); cairo_stroke (cr); - + cairo_translate (cr, 0.5, 0.5); } @@ -823,11 +823,11 @@ clearlooks_inverted_draw_scrollbar_slider (cairo_t *cr, else height += 1; } - + if (!scrollbar->horizontal) ge_cairo_exchange_axis (cr, &x, &y, &width, &height); - cairo_translate (cr, x, y); + cairo_translate (cr, x, y); if (scrollbar->has_color) { @@ -836,30 +836,30 @@ clearlooks_inverted_draw_scrollbar_slider (cairo_t *cr, CairoColor hilight; CairoColor shade1, shade2, shade3; cairo_pattern_t *pattern; - + if (widget->prelight) ge_shade_color (&fill, 1.1, &fill); - + cairo_set_line_width (cr, 1); - + ge_shade_color (&fill, 1.3, &hilight); ge_shade_color (&fill, 1.1, &shade1); ge_shade_color (&fill, 1.05, &shade2); ge_shade_color (&fill, 0.98, &shade3); - + pattern = cairo_pattern_create_linear (1, 1, 1, height-2); cairo_pattern_add_color_stop_rgb (pattern, 0, fill.r, fill.g, fill.b); cairo_pattern_add_color_stop_rgb (pattern, 0.5, shade3.r, shade3.g, shade3.b); - cairo_pattern_add_color_stop_rgb (pattern, 0.5, shade2.r, shade2.g, shade2.b); + cairo_pattern_add_color_stop_rgb (pattern, 0.5, shade2.r, shade2.g, shade2.b); cairo_pattern_add_color_stop_rgb (pattern, 1.0, shade1.r, shade1.g, shade1.b); cairo_rectangle (cr, 1, 1, width-2, height-2); cairo_set_source (cr, pattern); cairo_fill (cr); cairo_pattern_destroy (pattern); - + cairo_set_source_rgba (cr, hilight.r, hilight.g, hilight.b, 0.5); ge_cairo_stroke_rectangle (cr, 1.5, 1.5, width-3, height-3); - + ge_cairo_set_color (cr, border); ge_cairo_stroke_rectangle (cr, 0.5, 0.5, width-1, height-1); } @@ -869,9 +869,9 @@ clearlooks_inverted_draw_scrollbar_slider (cairo_t *cr, CairoColor s1, s2, s3; cairo_pattern_t *pattern; int bar_x, i; - + const CairoColor *dark = &colors->shade[4]; - const CairoColor *light = &colors->shade[0]; + const CairoColor *light = &colors->shade[0]; ge_shade_color(&colors->shade[6], 1.05, &border); @@ -888,15 +888,15 @@ clearlooks_inverted_draw_scrollbar_slider (cairo_t *cr, cairo_set_source(cr, pattern); cairo_fill(cr); cairo_pattern_destroy(pattern); - + clearlooks_draw_top_left_highlight (cr, &s2, widget, width, height, 0); clearlooks_set_border_gradient (cr, &border, 1.2, 0, height); ge_cairo_stroke_rectangle (cr, 0.5, 0.5, width-1, height-1); - + /* draw handles */ cairo_set_line_width (cr, 1); - + bar_x = width/2 - 4; cairo_translate(cr, 0.5, 0.5); for (i=0; i<3; i++) @@ -905,12 +905,12 @@ clearlooks_inverted_draw_scrollbar_slider (cairo_t *cr, cairo_line_to (cr, bar_x, height-5); ge_cairo_set_color (cr, dark); cairo_stroke (cr); - + cairo_move_to (cr, bar_x+1, 4); cairo_line_to (cr, bar_x+1, height-5); ge_cairo_set_color (cr, light); cairo_stroke (cr); - + bar_x += 3; } } @@ -927,7 +927,7 @@ clearlooks_inverted_draw_selected_cell (cairo_t *cr, CairoColor border; cairo_pattern_t *pattern; cairo_save (cr); - + cairo_translate (cr, x, y); if (params->focus) @@ -951,7 +951,7 @@ clearlooks_inverted_draw_selected_cell (cairo_t *cr, cairo_fill (cr); cairo_pattern_destroy (pattern); - ge_shade_color(&upper_color, 0.8, &border); + ge_shade_color(&upper_color, 0.8, &border); cairo_move_to (cr, 0, 0.5); cairo_rel_line_to (cr, width, 0); @@ -975,7 +975,7 @@ clearlooks_register_style_inverted (ClearlooksStyleFunctions *functions) functions->draw_menubaritem = clearlooks_inverted_draw_menubaritem; functions->draw_tab = clearlooks_inverted_draw_tab; functions->draw_list_view_header = clearlooks_inverted_draw_list_view_header; - functions->draw_scrollbar_stepper = clearlooks_inverted_draw_scrollbar_stepper; + functions->draw_scrollbar_stepper = clearlooks_inverted_draw_scrollbar_stepper; functions->draw_scrollbar_slider = clearlooks_inverted_draw_scrollbar_slider; functions->draw_selected_cell = clearlooks_inverted_draw_selected_cell; } diff --git a/libs/clearlooks-newer/clearlooks_rc_style.c b/libs/clearlooks-newer/clearlooks_rc_style.c index a4f8032e65..fdce13af1c 100644 --- a/libs/clearlooks-newer/clearlooks_rc_style.c +++ b/libs/clearlooks-newer/clearlooks_rc_style.c @@ -333,7 +333,7 @@ static guint clearlooks_rc_style_parse (GtkRcStyle *rc_style, GtkSettings *settings, GScanner *scanner) - + { static GQuark scope_id = 0; ClearlooksRcStyle *clearlooks_style = CLEARLOOKS_RC_STYLE (rc_style); @@ -482,6 +482,6 @@ static GtkStyle * clearlooks_rc_style_create_style (GtkRcStyle *rc_style) { (void) rc_style; - + return GTK_STYLE (g_object_new (CLEARLOOKS_TYPE_STYLE, NULL)); } diff --git a/libs/clearlooks-newer/clearlooks_style.c b/libs/clearlooks-newer/clearlooks_style.c index 59e64d5430..b1257f4878 100644 --- a/libs/clearlooks-newer/clearlooks_style.c +++ b/libs/clearlooks-newer/clearlooks_style.c @@ -65,7 +65,7 @@ clearlooks_set_widget_parameters (const GtkWidget *widget, params->active = (state_type == GTK_STATE_ACTIVE); params->prelight = (state_type == GTK_STATE_PRELIGHT); - params->disabled = (state_type == GTK_STATE_INSENSITIVE); + params->disabled = (state_type == GTK_STATE_INSENSITIVE); params->state_type = (ClearlooksStateType)state_type; params->corners = CR_CORNER_ALL; params->ltr = ge_widget_is_ltr ((GtkWidget*)widget); @@ -76,10 +76,10 @@ clearlooks_set_widget_parameters (const GtkWidget *widget, if (!params->active && widget && GE_IS_TOGGLE_BUTTON (widget)) params->active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)); - + params->xthickness = style->xthickness; params->ythickness = style->ythickness; - + /* This is used in GtkEntry to fake transparency. The reason to do this * is that the entry has it's entire background filled with base[STATE]. * This is not a very good solution as it will eg. fail if one changes @@ -91,7 +91,7 @@ clearlooks_set_widget_parameters (const GtkWidget *widget, static void clearlooks_style_draw_flat_box (DRAW_ARGS) { - if (detail && + if (detail && state_type == GTK_STATE_SELECTED && ( !strncmp ("cell_even", detail, 9) || !strncmp ("cell_odd", detail, 8))) @@ -162,7 +162,7 @@ clearlooks_style_draw_shadow (DRAW_ARGS) (DETAIL ("frame") && ge_is_in_combo_box (widget))) { WidgetParameters params; - + clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); /* Override the entries state type, because we are too lame to handle this via @@ -175,25 +175,25 @@ clearlooks_style_draw_shadow (DRAW_ARGS) width += style->xthickness; if (!params.ltr) x -= style->xthickness; - + if (params.ltr) params.corners = CR_CORNER_TOPLEFT | CR_CORNER_BOTTOMLEFT; else params.corners = CR_CORNER_TOPRIGHT | CR_CORNER_BOTTOMRIGHT; } - + STYLE_FUNCTION (draw_entry) (cr, &clearlooks_style->colors, ¶ms, x, y, width, height); } else if (DETAIL ("frame") && widget && GE_IS_STATUSBAR (widget->parent)) { WidgetParameters params; - + clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); gtk_style_apply_default_background (style, window, TRUE, state_type, area, x, y, width, height); - + STYLE_FUNCTION (draw_statusbar) (cr, colors, ¶ms, x, y, width, height); } @@ -204,10 +204,10 @@ clearlooks_style_draw_shadow (DRAW_ARGS) frame.shadow = shadow_type; frame.gap_x = -1; /* No gap will be drawn */ frame.border = &colors->shade[4]; - + clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); params.corners = CR_CORNER_NONE; - + if (widget && !g_str_equal ("XfcePanelWindow", gtk_widget_get_name (gtk_widget_get_toplevel (widget)))) STYLE_FUNCTION(draw_frame) (cr, colors, ¶ms, &frame, x, y, width, height); @@ -230,10 +230,10 @@ clearlooks_style_draw_shadow (DRAW_ARGS) frame.border = &colors->shade[5]; clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); params.corners = CR_CORNER_ALL; - + STYLE_FUNCTION(draw_frame) (cr, colors, ¶ms, &frame, x, y, width, height); } - + cairo_destroy (cr); } @@ -257,13 +257,13 @@ clearlooks_style_draw_box_gap (DRAW_ARGS, WidgetParameters params; FrameParameters frame; gboolean start, end; - + frame.shadow = shadow_type; frame.gap_side = gap_side; frame.gap_x = gap_x; frame.gap_width = gap_width; frame.border = &colors->shade[5]; - + clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); clearlooks_get_notebook_tab_position (widget, &start, &end); @@ -314,7 +314,7 @@ clearlooks_style_draw_box_gap (DRAW_ARGS, ge_cairo_rounded_rectangle (cr, x, y, width, height, params.radius, params.corners); ge_cairo_set_color (cr, &colors->bg[GTK_STATE_NORMAL]); cairo_fill (cr); - + STYLE_FUNCTION(draw_frame) (cr, colors, ¶ms, &frame, x, y, width, height); } @@ -325,8 +325,8 @@ clearlooks_style_draw_box_gap (DRAW_ARGS, x, y, width, height, gap_side, gap_x, gap_width); } - - cairo_destroy (cr); + + cairo_destroy (cr); } static void @@ -340,16 +340,16 @@ clearlooks_style_draw_extension (DRAW_ARGS, GtkPositionType gap_side) SANITIZE_SIZE cr = ge_gdk_drawable_to_cairo (window, area); - + if (DETAIL ("tab")) { WidgetParameters params; TabParameters tab; - + clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); - + tab.gap_side = (ClearlooksGapSide)gap_side; - + switch (gap_side) { case CL_GAP_BOTTOM: @@ -364,7 +364,7 @@ clearlooks_style_draw_extension (DRAW_ARGS, GtkPositionType gap_side) case CL_GAP_LEFT: params.corners = CR_CORNER_TOPRIGHT | CR_CORNER_BOTTOMRIGHT; } - + STYLE_FUNCTION(draw_tab) (cr, colors, ¶ms, &tab, x, y, width, height); } @@ -375,7 +375,7 @@ clearlooks_style_draw_extension (DRAW_ARGS, GtkPositionType gap_side) gap_side); } - + cairo_destroy (cr); } @@ -386,15 +386,15 @@ clearlooks_style_draw_handle (DRAW_ARGS, GtkOrientation orientation) ClearlooksColors *colors = &clearlooks_style->colors; cairo_t *cr; gboolean is_horizontal; - + CHECK_ARGS SANITIZE_SIZE - + cr = ge_gdk_drawable_to_cairo (window, area); - + /* Evil hack to work around broken orientation for toolbars */ is_horizontal = (width > height); - + if (DETAIL ("handlebox")) { WidgetParameters params; @@ -403,7 +403,7 @@ clearlooks_style_draw_handle (DRAW_ARGS, GtkOrientation orientation) clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); handle.type = CL_HANDLE_TOOLBAR; handle.horizontal = is_horizontal; - + /* Is this ever true? -Daniel */ if (GE_IS_TOOLBAR (widget) && shadow_type != GTK_SHADOW_NONE) { @@ -417,7 +417,7 @@ clearlooks_style_draw_handle (DRAW_ARGS, GtkOrientation orientation) STYLE_FUNCTION(draw_toolbar) (cr, colors, ¶ms, &toolbar, x, y, width, height); cairo_restore (cr); } - + STYLE_FUNCTION(draw_handle) (cr, colors, ¶ms, &handle, x, y, width, height); } @@ -429,7 +429,7 @@ clearlooks_style_draw_handle (DRAW_ARGS, GtkOrientation orientation) clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); handle.type = CL_HANDLE_SPLITTER; handle.horizontal = orientation == GTK_ORIENTATION_HORIZONTAL; - + STYLE_FUNCTION(draw_handle) (cr, colors, ¶ms, &handle, x, y, width, height); } @@ -441,7 +441,7 @@ clearlooks_style_draw_handle (DRAW_ARGS, GtkOrientation orientation) clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); handle.type = CL_HANDLE_TOOLBAR; handle.horizontal = is_horizontal; - + /* Is this ever true? -Daniel */ if (GE_IS_TOOLBAR (widget) && shadow_type != GTK_SHADOW_NONE) { @@ -455,7 +455,7 @@ clearlooks_style_draw_handle (DRAW_ARGS, GtkOrientation orientation) STYLE_FUNCTION(draw_toolbar) (cr, colors, ¶ms, &toolbar, x, y, width, height); cairo_restore (cr); } - + STYLE_FUNCTION(draw_handle) (cr, colors, ¶ms, &handle, x, y, width, height); } @@ -480,7 +480,7 @@ clearlooks_style_draw_box (DRAW_ARGS) { WidgetParameters params; MenuBarParameters menubar; - + clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); menubar.style = clearlooks_style->menubarstyle; @@ -495,18 +495,18 @@ clearlooks_style_draw_box (DRAW_ARGS) { WidgetParameters params; ListViewHeaderParameters header; - + gint columns, column_index; gboolean resizable = TRUE; - + /* XXX: This makes unknown treeview header CL_ORDER_MIDDLE, in need for something nicer */ columns = 3; column_index = 1; - + clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); - + params.corners = CR_CORNER_NONE; - + if (GE_IS_TREE_VIEW (widget->parent)) { clearlooks_treeview_get_header_index (GTK_TREE_VIEW(widget->parent), @@ -518,18 +518,18 @@ clearlooks_style_draw_box (DRAW_ARGS) clearlooks_clist_get_header_index (GTK_CLIST(widget->parent), widget, &column_index, &columns); } - + header.resizable = resizable; - + if (column_index == 0) header.order = params.ltr ? CL_ORDER_FIRST : CL_ORDER_LAST; else if (column_index == columns-1) header.order = params.ltr ? CL_ORDER_LAST : CL_ORDER_FIRST; else header.order = CL_ORDER_MIDDLE; - + gtk_style_apply_default_background (style, window, FALSE, state_type, area, x, y, width, height); - + STYLE_FUNCTION(draw_list_view_header) (cr, colors, ¶ms, &header, x, y, width, height); } @@ -562,7 +562,7 @@ clearlooks_style_draw_box (DRAW_ARGS) if (GE_IS_TOGGLE_BUTTON (widget) && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) params.active = TRUE; - + STYLE_FUNCTION(draw_button) (cr, &clearlooks_style->colors, ¶ms, x, y, width, height); } @@ -572,14 +572,14 @@ clearlooks_style_draw_box (DRAW_ARGS) { WidgetParameters params; clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); - + if (style->xthickness == 3) { width++; if (params.ltr) x--; } - + if (DETAIL ("spinbutton_up")) { height+=2; @@ -595,28 +595,28 @@ clearlooks_style_draw_box (DRAW_ARGS) else params.corners = CR_CORNER_BOTTOMLEFT; } - + STYLE_FUNCTION(draw_spinbutton_down) (cr, &clearlooks_style->colors, ¶ms, x, y, width, height); } } else if (DETAIL ("spinbutton")) { WidgetParameters params; - + clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); - + if (params.ltr) params.corners = CR_CORNER_TOPRIGHT | CR_CORNER_BOTTOMRIGHT; else params.corners = CR_CORNER_TOPLEFT | CR_CORNER_BOTTOMLEFT; - + if (style->xthickness == 3) { if (params.ltr) x--; width++; } - + STYLE_FUNCTION(draw_spinbutton) (cr, &clearlooks_style->colors, ¶ms, x, y, width, height); } @@ -624,15 +624,15 @@ clearlooks_style_draw_box (DRAW_ARGS) { WidgetParameters params; SliderParameters slider; - + clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); params.corners = CR_CORNER_NONE; - + slider.lower = DETAIL ("trough-lower"); slider.fill_level = DETAIL ("trough-fill-level") || DETAIL ("trough-fill-level-full"); slider.horizontal = (GTK_RANGE (widget)->orientation == GTK_ORIENTATION_HORIZONTAL); - + STYLE_FUNCTION(draw_scale_trough) (cr, &clearlooks_style->colors, ¶ms, &slider, x, y, width, height); @@ -640,9 +640,9 @@ clearlooks_style_draw_box (DRAW_ARGS) else if (DETAIL ("trough") && widget && GE_IS_PROGRESS_BAR (widget)) { WidgetParameters params; - - clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); - + + clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); + STYLE_FUNCTION(draw_progressbar_trough) (cr, colors, ¶ms, x, y, width, height); } @@ -650,16 +650,16 @@ clearlooks_style_draw_box (DRAW_ARGS) { WidgetParameters params; ScrollBarParameters scrollbar; - + clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); params.corners = CR_CORNER_NONE; - + scrollbar.horizontal = TRUE; scrollbar.junction = clearlooks_scrollbar_get_junction (widget); - + if (GE_IS_RANGE (widget)) scrollbar.horizontal = GTK_RANGE (widget)->orientation == GTK_ORIENTATION_HORIZONTAL; - + if (scrollbar.horizontal) { x += 2; @@ -670,7 +670,7 @@ clearlooks_style_draw_box (DRAW_ARGS) y += 2; height -= 4; } - + STYLE_FUNCTION(draw_scrollbar_trough) (cr, colors, ¶ms, &scrollbar, x, y, width, height); } @@ -682,9 +682,9 @@ clearlooks_style_draw_box (DRAW_ARGS) #ifdef HAVE_ANIMATION if(clearlooks_style->animation && CL_IS_PROGRESS_BAR (widget)) - { + { gboolean activity_mode = GTK_PROGRESS (widget)->activity_mode; - + if (!activity_mode) clearlooks_animation_progressbar_add ((gpointer)widget); } @@ -706,7 +706,7 @@ clearlooks_style_draw_box (DRAW_ARGS) progressbar.value = 0; progressbar.pulsing = FALSE; } - + if (!params.ltr) { if (progressbar.orientation == GTK_PROGRESS_LEFT_TO_RIGHT) @@ -750,12 +750,12 @@ clearlooks_style_draw_box (DRAW_ARGS) tmp.height += 2; } } - + cairo_reset_clip (cr); gdk_cairo_rectangle (cr, &tmp); cairo_clip (cr); } - + STYLE_FUNCTION(draw_progressbar_fill) (cr, colors, ¶ms, &progressbar, x, y, width, height, 10 - (int)(elapsed * 10.0) % 10); @@ -764,29 +764,29 @@ clearlooks_style_draw_box (DRAW_ARGS) { WidgetParameters params; OptionMenuParameters optionmenu; - + GtkRequisition indicator_size; GtkBorder indicator_spacing; - + clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); - + params.enable_glow = TRUE; ge_option_menu_get_props (widget, &indicator_size, &indicator_spacing); - + if (ge_widget_is_ltr (widget)) optionmenu.linepos = width - (indicator_size.width + indicator_spacing.left + indicator_spacing.right) - 1; else optionmenu.linepos = (indicator_size.width + indicator_spacing.left + indicator_spacing.right) + 1; - + STYLE_FUNCTION(draw_optionmenu) (cr, colors, ¶ms, &optionmenu, - x, y, width, height); + x, y, width, height); } else if (DETAIL ("menuitem")) { WidgetParameters params; clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); - + if (widget && GE_IS_MENU_BAR (widget->parent)) { params.corners = CR_CORNER_TOPLEFT | CR_CORNER_TOPRIGHT; @@ -794,7 +794,7 @@ clearlooks_style_draw_box (DRAW_ARGS) STYLE_FUNCTION(draw_menubaritem) (cr, colors, ¶ms, x, y, width, height); } else - { + { params.corners = CR_CORNER_ALL; STYLE_FUNCTION(draw_menuitem) (cr, colors, ¶ms, x, y, width, height); } @@ -805,15 +805,15 @@ clearlooks_style_draw_box (DRAW_ARGS) ScrollBarParameters scrollbar; ScrollBarStepperParameters stepper; GdkRectangle this_rectangle; - + this_rectangle.x = x; this_rectangle.y = y; this_rectangle.width = width; this_rectangle.height = height; - + clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); params.corners = CR_CORNER_NONE; - + scrollbar.has_color = FALSE; scrollbar.horizontal = TRUE; scrollbar.junction = clearlooks_scrollbar_get_junction (widget); @@ -823,7 +823,7 @@ clearlooks_style_draw_box (DRAW_ARGS) } scrollbar.horizontal = DETAIL ("hscrollbar"); - + stepper.stepper = clearlooks_scrollbar_get_stepper (widget, &this_rectangle); STYLE_FUNCTION(draw_scrollbar_stepper) (cr, colors, ¶ms, &scrollbar, &stepper, @@ -845,14 +845,14 @@ clearlooks_style_draw_box (DRAW_ARGS) } else if (DETAIL ("trough")) { - + } else if (DETAIL ("menu")) { WidgetParameters params; - + clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); - + STYLE_FUNCTION(draw_menu_frame) (cr, colors, ¶ms, x, y, width, height); } else if (DETAIL ("hseparator") || DETAIL ("vseparator")) @@ -878,7 +878,7 @@ clearlooks_style_draw_box (DRAW_ARGS) clearlooks_parent_class->draw_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height); } - + cairo_destroy (cr); } @@ -894,21 +894,21 @@ clearlooks_style_draw_slider (DRAW_ARGS, GtkOrientation orientation) CHECK_ARGS SANITIZE_SIZE - + if (DETAIL ("hscale") || DETAIL ("vscale")) { WidgetParameters params; SliderParameters slider; - + clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); - + slider.horizontal = (orientation == GTK_ORIENTATION_HORIZONTAL); slider.lower = FALSE; slider.fill_level = FALSE; - + if (clearlooks_style->style == CL_STYLE_GLOSSY) /* XXX! */ params.corners = CR_CORNER_ALL; - + STYLE_FUNCTION(draw_slider_button) (cr, &clearlooks_style->colors, ¶ms, &slider, x, y, width, height); @@ -940,7 +940,7 @@ clearlooks_style_draw_slider (DRAW_ARGS, GtkOrientation orientation) if ((clearlooks_style->style == CL_STYLE_GLOSSY || clearlooks_style->style == CL_STYLE_GUMMY) && !scrollbar.has_color) scrollbar.color = colors->bg[0]; - + STYLE_FUNCTION(draw_scrollbar_slider) (cr, colors, ¶ms, &scrollbar, x, y, width, height); } @@ -961,7 +961,7 @@ clearlooks_style_draw_option (DRAW_ARGS) CheckboxParameters checkbox; cairo_t *cr; ClearlooksStyle *clearlooks_style = CLEARLOOKS_STYLE (style); - + (void) detail; CHECK_ARGS @@ -969,12 +969,12 @@ clearlooks_style_draw_option (DRAW_ARGS) cr = ge_gdk_drawable_to_cairo (window, area); colors = &clearlooks_style->colors; - + checkbox.shadow_type = shadow_type; checkbox.in_menu = (widget && GTK_IS_MENU(widget->parent)); - + clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); - + STYLE_FUNCTION(draw_radiobutton) (cr, colors, ¶ms, &checkbox, x, y, width, height); cairo_destroy (cr); @@ -992,11 +992,11 @@ clearlooks_style_draw_check (DRAW_ARGS) SANITIZE_SIZE cr = ge_gdk_drawable_to_cairo (window, area); - + clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); - + params.corners = CR_CORNER_ALL; - + checkbox.shadow_type = shadow_type; checkbox.in_cell = DETAIL("cellcheck"); @@ -1004,7 +1004,7 @@ clearlooks_style_draw_check (DRAW_ARGS) STYLE_FUNCTION(draw_checkbox) (cr, &clearlooks_style->colors, ¶ms, &checkbox, x, y, width, height); - + cairo_destroy (cr); } @@ -1041,7 +1041,7 @@ clearlooks_style_draw_vline (GtkStyle *style, * (and even if, a normal one should be better on menu bars) */ STYLE_FUNCTION(draw_separator) (cr, colors, NULL, &separator, x, y1, 2, y2-y1+1); - + cairo_destroy (cr); } @@ -1069,16 +1069,16 @@ clearlooks_style_draw_hline (GtkStyle *style, colors = &clearlooks_style->colors; cr = ge_gdk_drawable_to_cairo (window, area); - + separator.horizontal = TRUE; - + if (!DETAIL ("menuitem")) STYLE_FUNCTION(draw_separator) (cr, colors, NULL, &separator, x1, y, x2-x1+1, 2); else STYLE_FUNCTION(draw_menu_item_separator) (cr, colors, NULL, &separator, x1, y, x2-x1+1, 2); - + cairo_destroy (cr); } @@ -1097,22 +1097,22 @@ clearlooks_style_draw_shadow_gap (DRAW_ARGS, cr = ge_gdk_drawable_to_cairo (window, area); colors = &clearlooks_style->colors; - + if (DETAIL ("frame")) { WidgetParameters params; FrameParameters frame; - + frame.shadow = shadow_type; frame.gap_side = gap_side; frame.gap_x = gap_x; frame.gap_width = gap_width; frame.border = &colors->shade[5]; - + clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); params.corners = CR_CORNER_ALL; - + STYLE_FUNCTION(draw_frame) (cr, colors, ¶ms, &frame, x, y, width, height); } @@ -1122,7 +1122,7 @@ clearlooks_style_draw_shadow_gap (DRAW_ARGS, widget, detail, x, y, width, height, gap_side, gap_x, gap_width); } - + cairo_destroy (cr); } @@ -1157,7 +1157,7 @@ clearlooks_style_draw_resize_grip (GtkStyle *style, cr = ge_gdk_drawable_to_cairo (window, area); - clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); + clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); STYLE_FUNCTION(draw_resize_grip) (cr, colors, ¶ms, &grip, x, y, width, height); @@ -1170,7 +1170,7 @@ clearlooks_style_draw_tab (DRAW_ARGS) { ClearlooksColors *colors; WidgetParameters params; - ArrowParameters arrow; + ArrowParameters arrow; cairo_t *cr; ClearlooksStyle *clearlooks_style = CLEARLOOKS_STYLE (style); @@ -1180,12 +1180,12 @@ clearlooks_style_draw_tab (DRAW_ARGS) CHECK_ARGS SANITIZE_SIZE - + cr = ge_gdk_drawable_to_cairo (window, area); clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); arrow.type = CL_ARROW_COMBO; - arrow.direction = CL_DIRECTION_DOWN; + arrow.direction = CL_DIRECTION_DOWN; STYLE_FUNCTION(draw_arrow) (cr, colors, ¶ms, &arrow, x, y, width, height); @@ -1231,12 +1231,12 @@ clearlooks_style_draw_arrow (GtkStyle *style, clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); arrow.type = CL_ARROW_NORMAL; arrow.direction = (ClearlooksDirection)arrow_type; - + if (ge_is_combo_box (widget, FALSE) && !ge_is_combo_box_entry (widget)) { arrow.type = CL_ARROW_COMBO; } - + /* I have no idea why, but the arrow of GtkCombo is larger than in other places. * Subtracting 3 seems to fix this. */ if (widget && widget->parent && GE_IS_COMBO (widget->parent->parent)) @@ -1247,9 +1247,9 @@ clearlooks_style_draw_arrow (GtkStyle *style, x += 2; width -= 3; } - + STYLE_FUNCTION(draw_arrow) (cr, colors, ¶ms, &arrow, x, y, width, height); - + cairo_destroy (cr); } @@ -1258,12 +1258,12 @@ clearlooks_style_init_from_rc (GtkStyle * style, GtkRcStyle * rc_style) { ClearlooksStyle *clearlooks_style = CLEARLOOKS_STYLE (style); - + clearlooks_parent_class->init_from_rc (style, rc_style); - + g_assert ((CLEARLOOKS_RC_STYLE (rc_style)->style < CL_NUM_STYLES)); clearlooks_style->style = CLEARLOOKS_RC_STYLE (rc_style)->style; - + clearlooks_style->menubarstyle = CLEARLOOKS_RC_STYLE (rc_style)->menubarstyle; clearlooks_style->toolbarstyle = CLEARLOOKS_RC_STYLE (rc_style)->toolbarstyle; clearlooks_style->has_scrollbar_color = CLEARLOOKS_RC_STYLE (rc_style)->flags & CL_FLAG_SCROLLBAR_COLOR; @@ -1284,11 +1284,11 @@ clearlooks_style_realize (GtkStyle * style) CairoColor bg_normal; double contrast; int i; - + clearlooks_parent_class->realize (style); contrast = CLEARLOOKS_RC_STYLE (style->rc_style)->contrast; - + /* Lighter to darker */ ge_gdk_color_to_cairo (&style->bg[GTK_STATE_NORMAL], &bg_normal); @@ -1296,13 +1296,13 @@ clearlooks_style_realize (GtkStyle * style) { ge_shade_color(&bg_normal, (shades[i]-0.7) * contrast + 0.7, &clearlooks_style->colors.shade[i]); } - + ge_gdk_color_to_cairo (&style->bg[GTK_STATE_SELECTED], &spot_color); - + ge_shade_color(&spot_color, 1.42, &clearlooks_style->colors.spot[0]); ge_shade_color(&spot_color, 1.05, &clearlooks_style->colors.spot[1]); ge_shade_color(&spot_color, 0.65, &clearlooks_style->colors.spot[2]); - + for (i=0; i<5; i++) { ge_gdk_color_to_cairo (&style->fg[i], &clearlooks_style->colors.fg[i]); @@ -1405,7 +1405,7 @@ clearlooks_style_copy (GtkStyle * style, GtkStyle * src) { ClearlooksStyle * cl_style = CLEARLOOKS_STYLE (style); ClearlooksStyle * cl_src = CLEARLOOKS_STYLE (src); - + cl_style->colors = cl_src->colors; cl_style->menubarstyle = cl_src->menubarstyle; cl_style->toolbarstyle = cl_src->toolbarstyle; @@ -1415,7 +1415,7 @@ clearlooks_style_copy (GtkStyle * style, GtkStyle * src) cl_style->animation = cl_src->animation; cl_style->radius = cl_src->radius; cl_style->style = cl_src->style; - + clearlooks_parent_class->copy (style, src); } @@ -1508,7 +1508,7 @@ clearlooks_style_draw_layout (GtkStyle * style, ge_shade_color (¶ms.parentbg, 1.2, &temp); else ge_shade_color (&colors->bg[widget->state], 1.2, &temp); - + etched.red = (int) (temp.r * 65535); etched.green = (int) (temp.g * 65535); etched.blue = (int) (temp.b * 65535); @@ -1550,11 +1550,11 @@ clearlooks_style_draw_render_icon (GtkStyle *style, * GtkIconSet can be used without a style and if so * it uses this function. */ - + base_pixbuf = gtk_icon_source_get_pixbuf (source); - + g_return_val_if_fail (base_pixbuf != NULL, NULL); - + if (widget && gtk_widget_has_screen (widget)) { screen = gtk_widget_get_screen (widget); settings = gtk_settings_get_for_screen (screen); @@ -1566,7 +1566,7 @@ clearlooks_style_draw_render_icon (GtkStyle *style, GTK_NOTE (MULTIHEAD, g_warning ("Using the default screen for gtk_default_render_icon()")); } - + if (size != (GtkIconSize) -1 && !gtk_icon_size_lookup_for_settings (settings, size, &width, &height)) { g_warning (G_STRLOC ": invalid icon size '%d'", size); @@ -1580,21 +1580,21 @@ clearlooks_style_draw_render_icon (GtkStyle *style, scaled = scale_or_ref (base_pixbuf, width, height); else scaled = g_object_ref (base_pixbuf); - + /* If the state was wildcarded, then generate a state. */ if (gtk_icon_source_get_state_wildcarded (source)) { if (state == GTK_STATE_INSENSITIVE) { stated = set_transparency (scaled, 0.3); gdk_pixbuf_saturate_and_pixelate (stated, stated, 0.1, FALSE); - + g_object_unref (scaled); } else if (state == GTK_STATE_PRELIGHT) { stated = gdk_pixbuf_copy (scaled); - + gdk_pixbuf_saturate_and_pixelate (scaled, stated, 1.2, FALSE); - + g_object_unref (scaled); } else { stated = scaled; @@ -1616,7 +1616,7 @@ static void clearlooks_style_class_init (ClearlooksStyleClass * klass) { GtkStyleClass *style_class = GTK_STYLE_CLASS (klass); - + clearlooks_style_class = CLEARLOOKS_STYLE_CLASS (klass); clearlooks_parent_class = g_type_class_peek_parent (klass); diff --git a/libs/clearlooks-newer/clearlooks_style.h b/libs/clearlooks-newer/clearlooks_style.h index 78f3ca1675..b306836453 100644 --- a/libs/clearlooks-newer/clearlooks_style.h +++ b/libs/clearlooks-newer/clearlooks_style.h @@ -48,7 +48,7 @@ struct _ClearlooksStyle ClearlooksColors colors; ClearlooksStyles style; - + guint8 menubarstyle; guint8 toolbarstyle; GdkColor scrollbar_color; diff --git a/libs/clearlooks-newer/clearlooks_types.h b/libs/clearlooks-newer/clearlooks_types.h index 6559f3c16c..893113cc9e 100644 --- a/libs/clearlooks-newer/clearlooks_types.h +++ b/libs/clearlooks-newer/clearlooks_types.h @@ -125,7 +125,7 @@ typedef struct CairoColor bg[5]; CairoColor base[5]; CairoColor text[5]; - + CairoColor shade[9]; CairoColor spot[3]; } ClearlooksColors; @@ -141,9 +141,9 @@ typedef struct boolean enable_glow; gfloat radius; - + ClearlooksStateType state_type; - + uint8 corners; uint8 xthickness; uint8 ythickness; @@ -189,7 +189,7 @@ typedef struct typedef struct { CairoCorners corners; - ClearlooksShadowType shadow; + ClearlooksShadowType shadow; } ShadowParameters; typedef struct @@ -301,7 +301,7 @@ struct _ClearlooksStyleFunctions const WidgetParameters *widget, const OptionMenuParameters *optionmenu, int x, int y, int width, int height); - + void (*draw_inset) (cairo_t *cr, const CairoColor *bg_color, double x, double y, double w, double h, @@ -415,7 +415,7 @@ struct _ClearlooksStyleFunctions const WidgetParameters *widget, const ArrowParameters *arrow, int x, int y, int width, int height); - + void (*draw_checkbox) (cairo_t *cr, const ClearlooksColors *colors, const WidgetParameters *widget, diff --git a/libs/clearlooks-newer/support.c b/libs/clearlooks-newer/support.c index 6d4d8a286d..c3ac9a8864 100644 --- a/libs/clearlooks-newer/support.c +++ b/libs/clearlooks-newer/support.c @@ -49,7 +49,7 @@ void clearlooks_clist_get_header_index (GtkCList *clist, GtkWidget *button, { int i; *columns = clist->columns; - + for (i=0; i<*columns; i++) { if (clist->column[i].button == button) @@ -66,22 +66,22 @@ clearlooks_get_parent_bg (const GtkWidget *widget, CairoColor *color) GtkStateType state_type; const GtkWidget *parent; GdkColor *gcolor; - + if (widget == NULL) return; - + parent = widget->parent; - + while (parent && GTK_WIDGET_NO_WINDOW (parent) && !((GTK_IS_NOTEBOOK (parent)) || (GTK_IS_TOOLBAR (parent)))) parent = parent->parent; if (parent == NULL) return; - + state_type = GTK_WIDGET_STATE (parent); - + gcolor = &parent->style->bg[state_type]; - + ge_gdk_color_to_cairo (gcolor, color); } @@ -101,12 +101,12 @@ clearlooks_scrollbar_get_stepper (GtkWidget *widget, check_rectangle.y = widget->allocation.y; check_rectangle.width = stepper->width; check_rectangle.height = stepper->height; - + orientation = GTK_RANGE (widget)->orientation; - + if (widget->allocation.x == -1 && widget->allocation.y == -1) return CL_STEPPER_UNKNOWN; - + if (gdk_rectangle_intersect (stepper, &check_rectangle, &tmp)) value = CL_STEPPER_A; @@ -116,7 +116,7 @@ clearlooks_scrollbar_get_stepper (GtkWidget *widget, check_rectangle.x = widget->allocation.x + stepper->width; else check_rectangle.y = widget->allocation.y + stepper->height; - + if (gdk_rectangle_intersect (stepper, &check_rectangle, &tmp)) value = CL_STEPPER_B; } @@ -127,7 +127,7 @@ clearlooks_scrollbar_get_stepper (GtkWidget *widget, check_rectangle.x = widget->allocation.x + widget->allocation.width - (stepper->width * 2); else check_rectangle.y = widget->allocation.y + widget->allocation.height - (stepper->height * 2); - + if (gdk_rectangle_intersect (stepper, &check_rectangle, &tmp)) value = CL_STEPPER_C; } @@ -138,11 +138,11 @@ clearlooks_scrollbar_get_stepper (GtkWidget *widget, check_rectangle.x = widget->allocation.x + widget->allocation.width - stepper->width; else check_rectangle.y = widget->allocation.y + widget->allocation.height - stepper->height; - + if (gdk_rectangle_intersect (stepper, &check_rectangle, &tmp)) value = CL_STEPPER_D; } - + return value; } @@ -150,13 +150,13 @@ ClearlooksStepper clearlooks_scrollbar_visible_steppers (GtkWidget *widget) { ClearlooksStepper steppers = 0; - + if (!GE_IS_RANGE (widget)) return 0; - + if (GTK_RANGE (widget)->has_stepper_a) steppers |= CL_STEPPER_A; - + if (GTK_RANGE (widget)->has_stepper_b) steppers |= CL_STEPPER_B; @@ -171,27 +171,27 @@ clearlooks_scrollbar_visible_steppers (GtkWidget *widget) ClearlooksJunction clearlooks_scrollbar_get_junction (GtkWidget *widget) -{ +{ GtkAdjustment *adj; ClearlooksJunction junction = CL_JUNCTION_NONE; - + if (!GE_IS_RANGE (widget)) return CL_JUNCTION_NONE; adj = GTK_RANGE (widget)->adjustment; - + if (adj->value <= adj->lower && (GTK_RANGE (widget)->has_stepper_a || GTK_RANGE (widget)->has_stepper_b)) { junction |= CL_JUNCTION_BEGIN; } - + if (adj->value >= adj->upper - adj->page_size && (GTK_RANGE (widget)->has_stepper_c || GTK_RANGE (widget)->has_stepper_d)) { junction |= CL_JUNCTION_END; } - + return junction; } @@ -245,7 +245,7 @@ clearlooks_get_notebook_tab_position (GtkWidget *widget, GtkWidget *tab_label; gboolean expand; GtkPackType pack_type; - + tab_child = gtk_notebook_get_nth_page (notebook, i); /* Skip invisible tabs */ diff --git a/libs/clearlooks-newer/widget-information.c b/libs/clearlooks-newer/widget-information.c index 0b30c52b72..1a4fe31039 100644 --- a/libs/clearlooks-newer/widget-information.c +++ b/libs/clearlooks-newer/widget-information.c @@ -156,7 +156,7 @@ ge_is_bonobo_dock_item (GtkWidget * widget) result = TRUE; child = NULL; } - } + } if (children) g_list_free(children); @@ -278,7 +278,7 @@ ge_button_get_default_border (GtkWidget *widget, { GtkBorder default_border = {1, 1, 1, 1}; GtkBorder *tmp_border = NULL; - + if (widget && GE_IS_BUTTON (widget)) gtk_widget_style_get (widget, "default-border", &tmp_border, NULL); @@ -298,7 +298,7 @@ gboolean ge_widget_is_ltr (GtkWidget *widget) { GtkTextDirection dir = GTK_TEXT_DIR_NONE; - + if (GE_IS_WIDGET (widget)) dir = gtk_widget_get_direction (widget); |