murrine r89 - in trunk: . src
- From: acimitan svn gnome org
- To: svn-commits-list gnome org
- Subject: murrine r89 - in trunk: . src
- Date: Tue, 30 Sep 2008 00:40:30 +0000 (UTC)
Author: acimitan
Date: Tue Sep 30 00:40:30 2008
New Revision: 89
URL: http://svn.gnome.org/viewvc/murrine?rev=89&view=rev
Log:
2008-09-30 Andrea Cimitan <andrea cimitan gmail com>
* src/cairo-support.c (murrine_pattern_add_color_stop_rgb),
(murrine_pattern_add_color_stop_rgba), (murrine_rounded_corner),
(clearlooks_rounded_rectangle), (murrine_draw_lightborder),
(murrine_set_gradient):
* src/cairo-support.h:
* src/murrine_draw.c (murrine_draw_button),
(murrine_draw_spinbutton_down), (murrine_draw_progressbar_trough),
(murrine_draw_menubar), (murrine_draw_toolbar), (murrine_draw_tab),
(murrine_draw_list_view_header):
* src/murrine_draw_rgba.c (murrine_rgba_draw_button),
(murrine_rgba_draw_progressbar_trough),
(murrine_rgba_draw_menubar), (murrine_rgba_draw_toolbar),
(murrine_rgba_draw_tab):
* src/murrine_style.c (murrine_style_draw_flat_box):
Renamed pattern variables to pat, less chars :)
Modified:
trunk/ChangeLog
trunk/src/cairo-support.c
trunk/src/cairo-support.h
trunk/src/murrine_draw.c
trunk/src/murrine_draw_rgba.c
trunk/src/murrine_style.c
Modified: trunk/src/cairo-support.c
==============================================================================
--- trunk/src/cairo-support.c (original)
+++ trunk/src/cairo-support.c Tue Sep 30 00:40:30 2008
@@ -298,21 +298,21 @@
}
void
-murrine_pattern_add_color_stop_rgb (cairo_pattern_t *pattern, double pos,
+murrine_pattern_add_color_stop_rgb (cairo_pattern_t *pat, double pos,
const MurrineRGB *color)
{
- g_return_if_fail (pattern && color);
+ g_return_if_fail (pat && color);
- cairo_pattern_add_color_stop_rgb (pattern, pos, color->r, color->g, color->b);
+ cairo_pattern_add_color_stop_rgb (pat, pos, color->r, color->g, color->b);
}
void
-murrine_pattern_add_color_stop_rgba (cairo_pattern_t *pattern, double pos,
+murrine_pattern_add_color_stop_rgba (cairo_pattern_t *pat, double pos,
const MurrineRGB *color, double alpha)
{
- g_return_if_fail (pattern && color);
+ g_return_if_fail (pat && color);
- cairo_pattern_add_color_stop_rgba (pattern, pos, color->r, color->g, color->b, alpha);
+ cairo_pattern_add_color_stop_rgba (pat, pos, color->r, color->g, color->b, alpha);
}
void
@@ -333,16 +333,16 @@
cairo_line_to (cr, x, y);
break;
case MRN_CORNER_TOPLEFT:
- cairo_arc (cr, x + radius, y + radius, radius, G_PI, G_PI * 3/2);
+ cairo_arc (cr, x+radius, y+radius, radius, G_PI, G_PI*3/2);
break;
case MRN_CORNER_TOPRIGHT:
- cairo_arc (cr, x - radius, y + radius, radius, G_PI * 3/2, G_PI * 2);
+ cairo_arc (cr, x-radius, y+radius, radius, G_PI*3/2, G_PI*2);
break;
case MRN_CORNER_BOTTOMRIGHT:
- cairo_arc (cr, x - radius, y - radius, radius, 0, G_PI * 1/2);
+ cairo_arc (cr, x-radius, y-radius, radius, 0, G_PI*1/2);
break;
case MRN_CORNER_BOTTOMLEFT:
- cairo_arc (cr, x + radius, y - radius, radius, G_PI * 1/2, G_PI);
+ cairo_arc (cr, x+radius, y-radius, radius, G_PI*1/2, G_PI);
break;
default:
@@ -418,22 +418,22 @@
cairo_move_to (cr, x, y);
if (corners & MRN_CORNER_TOPRIGHT)
- cairo_arc (cr, x+w-radius, y+radius, radius, M_PI * 1.5, M_PI * 2);
+ cairo_arc (cr, x+w-radius, y+radius, radius, M_PI*1.5, M_PI*2);
else
cairo_line_to (cr, x+w, y);
if (corners & MRN_CORNER_BOTTOMRIGHT)
- cairo_arc (cr, x+w-radius, y+h-radius, radius, 0, M_PI * 0.5);
+ cairo_arc (cr, x+w-radius, y+h-radius, radius, 0, M_PI*0.5);
else
cairo_line_to (cr, x+w, y+h);
if (corners & MRN_CORNER_BOTTOMLEFT)
- cairo_arc (cr, x+radius, y+h-radius, radius, M_PI * 0.5, M_PI);
+ cairo_arc (cr, x+radius, y+h-radius, radius, M_PI*0.5, M_PI);
else
cairo_line_to (cr, x, y+h);
if (corners & MRN_CORNER_TOPLEFT)
- cairo_arc (cr, x+radius, y+radius, radius, M_PI, M_PI * 1.5);
+ cairo_arc (cr, x+radius, y+radius, radius, M_PI, M_PI*1.5);
else
cairo_line_to (cr, x, y);
}
@@ -581,7 +581,7 @@
int glazestyle, int lightborderstyle,
int radius, uint8 corners)
{
- cairo_pattern_t *pattern;
+ cairo_pattern_t *pat;
MurrineRGB shade1, shade2, shade3, shade4;
double alpha_value = mrn_gradient.use_rgba ? mrn_gradient.rgba_opacity : 1.0;
@@ -603,17 +603,17 @@
radius < 2 ? cairo_rectangle (cr, x, y, width, height) :
clearlooks_rounded_rectangle (cr, x, y, width, height, radius-1, corners);
- pattern = cairo_pattern_create_linear (x, y, !horizontal ? width+x : x, !horizontal ? y : height+y);
- murrine_pattern_add_color_stop_rgba (pattern, 0.00, &shade1, 0.5*alpha_value);
- murrine_pattern_add_color_stop_rgba (pattern, 0.49, &shade2, 0.5*alpha_value);
- murrine_pattern_add_color_stop_rgba (pattern, 0.49, &shade3, 0.5*alpha_value);
- murrine_pattern_add_color_stop_rgba (pattern, fill_pos, &shade4, 0.5*alpha_value);
- murrine_pattern_add_color_stop_rgba (pattern, fill_pos, &shade4,
- lightborderstyle > 0 ? 0.5*alpha_value : 0.0);
- murrine_pattern_add_color_stop_rgba (pattern, 1.00, &shade4,
- lightborderstyle > 0 ? 0.5*alpha_value : 0.0);
- cairo_set_source (cr, pattern);
- cairo_pattern_destroy (pattern);
+ pat = cairo_pattern_create_linear (x, y, !horizontal ? width+x : x, !horizontal ? y : height+y);
+ murrine_pattern_add_color_stop_rgba (pat, 0.00, &shade1, 0.5*alpha_value);
+ murrine_pattern_add_color_stop_rgba (pat, 0.49, &shade2, 0.5*alpha_value);
+ murrine_pattern_add_color_stop_rgba (pat, 0.49, &shade3, 0.5*alpha_value);
+ murrine_pattern_add_color_stop_rgba (pat, fill_pos, &shade4, 0.5*alpha_value);
+ murrine_pattern_add_color_stop_rgba (pat, fill_pos, &shade4,
+ lightborderstyle > 0 ? 0.5*alpha_value : 0.0);
+ murrine_pattern_add_color_stop_rgba (pat, 1.00, &shade4,
+ lightborderstyle > 0 ? 0.5*alpha_value : 0.0);
+ cairo_set_source (cr, pat);
+ cairo_pattern_destroy (pat);
cairo_stroke (cr);
@@ -648,7 +648,7 @@
if (gradients)
{
- cairo_pattern_t *pattern;
+ cairo_pattern_t *pat;
MurrineRGB shade1, shade2, shade3, shade4;
murrine_shade (color, mrn_gradient.gradient_shades[0], &shade1);
@@ -656,15 +656,15 @@
murrine_shade (color, mrn_gradient.gradient_shades[2], &shade3);
murrine_shade (color, mrn_gradient.gradient_shades[3], &shade4);
- pattern = cairo_pattern_create_linear (x, y, width+x, height+y);
+ pat = cairo_pattern_create_linear (x, y, width+x, height+y);
- murrine_pattern_add_color_stop_rgba (pattern, 0.00, &shade1, alpha_value);
- murrine_pattern_add_color_stop_rgba (pattern, 0.49, &shade2, alpha_value);
- murrine_pattern_add_color_stop_rgba (pattern, 0.49, &shade3, alpha_value);
- murrine_pattern_add_color_stop_rgba (pattern, 1.00, &shade4, alpha_value);
+ murrine_pattern_add_color_stop_rgba (pat, 0.00, &shade1, alpha_value);
+ murrine_pattern_add_color_stop_rgba (pat, 0.49, &shade2, alpha_value);
+ murrine_pattern_add_color_stop_rgba (pat, 0.49, &shade3, alpha_value);
+ murrine_pattern_add_color_stop_rgba (pat, 1.00, &shade4, alpha_value);
- cairo_set_source (cr, pattern);
- cairo_pattern_destroy (pattern);
+ cairo_set_source (cr, pat);
+ cairo_pattern_destroy (pat);
}
else
{
Modified: trunk/src/cairo-support.h
==============================================================================
--- trunk/src/cairo-support.h (original)
+++ trunk/src/cairo-support.h Tue Sep 30 00:40:30 2008
@@ -41,10 +41,10 @@
const MurrineRGB *color,
double alpha);
-G_GNUC_INTERNAL void murrine_pattern_add_color_stop_rgb (cairo_pattern_t *pattern, double pos,
+G_GNUC_INTERNAL void murrine_pattern_add_color_stop_rgb (cairo_pattern_t *pat, double pos,
const MurrineRGB *color);
-G_GNUC_INTERNAL void murrine_pattern_add_color_stop_rgba (cairo_pattern_t *pattern, double pos,
+G_GNUC_INTERNAL void murrine_pattern_add_color_stop_rgba (cairo_pattern_t *pat, double pos,
const MurrineRGB *color, double alpha);
G_GNUC_INTERNAL void rotate_mirror_translate (cairo_t *cr,
Modified: trunk/src/murrine_draw.c
==============================================================================
--- trunk/src/murrine_draw.c (original)
+++ trunk/src/murrine_draw.c Tue Sep 30 00:40:30 2008
@@ -206,7 +206,7 @@
/* Draw pressed button shadow */
if (widget->active)
{
- cairo_pattern_t *pattern;
+ cairo_pattern_t *pat;
MurrineRGB shadow;
murrine_shade (&fill, 0.94, &shadow);
@@ -219,20 +219,20 @@
cairo_clip (cr);
cairo_rectangle (cr, xos+1, yos+1, width-(xos*2)-2, 3);
- pattern = cairo_pattern_create_linear (xos+1, yos+1, xos+1, yos+4);
- murrine_pattern_add_color_stop_rgba (pattern, 0.0, &shadow, 0.58);
- murrine_pattern_add_color_stop_rgba (pattern, 1.0, &shadow, 0.0);
- cairo_set_source (cr, pattern);
+ pat = cairo_pattern_create_linear (xos+1, yos+1, xos+1, yos+4);
+ murrine_pattern_add_color_stop_rgba (pat, 0.0, &shadow, 0.58);
+ murrine_pattern_add_color_stop_rgba (pat, 1.0, &shadow, 0.0);
+ cairo_set_source (cr, pat);
cairo_fill (cr);
- cairo_pattern_destroy (pattern);
+ cairo_pattern_destroy (pat);
cairo_rectangle (cr, xos+1, yos+1, 3, height-(yos*2)-2);
- pattern = cairo_pattern_create_linear (xos+1, yos+1, xos+4, yos+1);
- murrine_pattern_add_color_stop_rgba (pattern, 0.0, &shadow, 0.58);
- murrine_pattern_add_color_stop_rgba (pattern, 1.0, &shadow, 0.0);
- cairo_set_source (cr, pattern);
+ pat = cairo_pattern_create_linear (xos+1, yos+1, xos+4, yos+1);
+ murrine_pattern_add_color_stop_rgba (pat, 0.0, &shadow, 0.58);
+ murrine_pattern_add_color_stop_rgba (pat, 1.0, &shadow, 0.0);
+ cairo_set_source (cr, pat);
cairo_fill (cr);
- cairo_pattern_destroy (pattern);
+ cairo_pattern_destroy (pat);
cairo_restore (cr);
}
@@ -296,7 +296,7 @@
const WidgetParameters *widget,
int x, int y, int width, int height)
{
- cairo_pattern_t *pattern;
+ cairo_pattern_t *pat;
MurrineRGB shadow;
murrine_shade (&colors->bg[0], 0.8, &shadow);
@@ -305,13 +305,12 @@
cairo_rectangle (cr, 1, 1, width-4, height-4);
- pattern = cairo_pattern_create_linear (0, 0, 0, height);
- murrine_pattern_add_color_stop_rgb (pattern, 0.0, &shadow);
- murrine_pattern_add_color_stop_rgba (pattern, 1.0, &shadow, 0.0);
- cairo_set_source (cr, pattern);
+ pat = cairo_pattern_create_linear (0, 0, 0, height);
+ murrine_pattern_add_color_stop_rgb (pat, 0.0, &shadow);
+ murrine_pattern_add_color_stop_rgba (pat, 1.0, &shadow, 0.0);
+ cairo_set_source (cr, pat);
cairo_fill (cr);
-
- cairo_pattern_destroy (pattern);
+ cairo_pattern_destroy (pat);
}
static void
@@ -457,28 +456,28 @@
if (widget->mrn_gradient.gradients)
{
- cairo_pattern_t *pattern;
+ cairo_pattern_t *pat;
MurrineRGB shadow;
murrine_shade (border, 0.94, &shadow);
/* Top shadow */
cairo_rectangle (cr, x+1, y+1, width-2, 4);
- pattern = cairo_pattern_create_linear (x, y, x, y+4);
- murrine_pattern_add_color_stop_rgba (pattern, 0.0, &shadow, 0.24);
- murrine_pattern_add_color_stop_rgba (pattern, 1.0, &shadow, 0.);
- cairo_set_source (cr, pattern);
+ pat = cairo_pattern_create_linear (x, y, x, y+4);
+ murrine_pattern_add_color_stop_rgba (pat, 0.0, &shadow, 0.24);
+ murrine_pattern_add_color_stop_rgba (pat, 1.0, &shadow, 0.);
+ cairo_set_source (cr, pat);
cairo_fill (cr);
- cairo_pattern_destroy (pattern);
+ cairo_pattern_destroy (pat);
/* Left shadow */
cairo_rectangle (cr, x+1, y+1, 4, height-2);
- pattern = cairo_pattern_create_linear (x, y, x+4, y);
- murrine_pattern_add_color_stop_rgba (pattern, 0.0, &shadow, 0.24);
- murrine_pattern_add_color_stop_rgba (pattern, 1.0, &shadow, 0.);
- cairo_set_source (cr, pattern);
+ pat = cairo_pattern_create_linear (x, y, x+4, y);
+ murrine_pattern_add_color_stop_rgba (pat, 0.0, &shadow, 0.24);
+ murrine_pattern_add_color_stop_rgba (pat, 1.0, &shadow, 0.);
+ cairo_set_source (cr, pat);
cairo_fill (cr);
- cairo_pattern_destroy (pattern);
+ cairo_pattern_destroy (pat);
}
}
@@ -610,33 +609,33 @@
}
case 2:
{
- cairo_pattern_t *pattern;
+ cairo_pattern_t *pat;
double alpha = !widget->mrn_gradient.use_rgba ? 1.0 : 0.7;
MurrineRGB lower;
murrine_shade (fill, 0.95, &lower);
- pattern = cairo_pattern_create_linear (0, 0, 0, height);
- murrine_pattern_add_color_stop_rgba (pattern, 0.0, fill, alpha);
- murrine_pattern_add_color_stop_rgba (pattern, 1.0, &lower, alpha);
- cairo_set_source (cr, pattern);
+ pat = cairo_pattern_create_linear (0, 0, 0, height);
+ murrine_pattern_add_color_stop_rgba (pat, 0.0, fill, alpha);
+ murrine_pattern_add_color_stop_rgba (pat, 1.0, &lower, alpha);
+ cairo_set_source (cr, pat);
cairo_fill (cr);
- cairo_pattern_destroy (pattern);
+ cairo_pattern_destroy (pat);
break;
}
case 3:
{
- cairo_pattern_t *pattern;
+ cairo_pattern_t *pat;
int counter = -height;
MurrineRGB low, top;
murrine_shade (fill, 0.9, &top);
murrine_shade (fill, 1.1, &low);
- pattern = cairo_pattern_create_linear (0, 0, 0, height);
- murrine_pattern_add_color_stop_rgb (pattern, 0.0, &top);
- murrine_pattern_add_color_stop_rgb (pattern, 1.0, &low);
- cairo_set_source (cr, pattern);
+ pat = cairo_pattern_create_linear (0, 0, 0, height);
+ murrine_pattern_add_color_stop_rgb (pat, 0.0, &top);
+ murrine_pattern_add_color_stop_rgb (pat, 1.0, &low);
+ cairo_set_source (cr, pat);
cairo_fill (cr);
- cairo_pattern_destroy (pattern);
+ cairo_pattern_destroy (pat);
cairo_set_line_width (cr, 1.0);
@@ -709,15 +708,15 @@
}
case 2:
{
- cairo_pattern_t *pattern;
+ cairo_pattern_t *pat;
MurrineRGB lower;
murrine_shade (fill, 0.95, &lower);
- pattern = cairo_pattern_create_linear (0, 0, 0, height);
- murrine_pattern_add_color_stop_rgb (pattern, 0.0, fill);
- murrine_pattern_add_color_stop_rgb (pattern, 1.0, &lower);
- cairo_set_source (cr, pattern);
+ pat = cairo_pattern_create_linear (0, 0, 0, height);
+ murrine_pattern_add_color_stop_rgb (pat, 0.0, fill);
+ murrine_pattern_add_color_stop_rgb (pat, 1.0, &lower);
+ cairo_set_source (cr, pat);
cairo_fill (cr);
- cairo_pattern_destroy (pattern);
+ cairo_pattern_destroy (pat);
break;
}
}
@@ -868,7 +867,7 @@
const MurrineRGB *stripe_border = &colors->spot[2];
const MurrineRGB *fill = &colors->bg[widget->state_type];
const MurrineRGB *border = &colors->shade[!widget->active ? 5 : 4];
- cairo_pattern_t* pattern;
+ cairo_pattern_t *pat;
/* Set clip */
cairo_rectangle (cr, x, y, width, height);
@@ -917,28 +916,28 @@
switch (tab->gap_side)
{
case MRN_GAP_TOP:
- pattern = cairo_pattern_create_linear (0, height-2, 0, 0);
+ pat = cairo_pattern_create_linear (0, height-2, 0, 0);
break;
case MRN_GAP_BOTTOM:
- pattern = cairo_pattern_create_linear (0, 1, 0, height);
+ pat = cairo_pattern_create_linear (0, 1, 0, height);
break;
case MRN_GAP_LEFT:
- pattern = cairo_pattern_create_linear (width-2, 0, 1, 0);
+ pat = cairo_pattern_create_linear (width-2, 0, 1, 0);
break;
case MRN_GAP_RIGHT:
- pattern = cairo_pattern_create_linear (1, 0, width-2, 0);
+ pat = cairo_pattern_create_linear (1, 0, width-2, 0);
break;
}
murrine_rounded_rectangle_closed (cr, 0, 0, width-1, height-1, widget->roundness, widget->corners);
- murrine_pattern_add_color_stop_rgb (pattern, 0.00, &shade1);
- murrine_pattern_add_color_stop_rgb (pattern, 0.45, &shade2);
- murrine_pattern_add_color_stop_rgb (pattern, 0.45, &shade3);
- murrine_pattern_add_color_stop_rgb (pattern, 1.00, &shade4);
- cairo_set_source (cr, pattern);
+ murrine_pattern_add_color_stop_rgb (pat, 0.00, &shade1);
+ murrine_pattern_add_color_stop_rgb (pat, 0.45, &shade2);
+ murrine_pattern_add_color_stop_rgb (pat, 0.45, &shade3);
+ murrine_pattern_add_color_stop_rgb (pat, 1.00, &shade4);
+ cairo_set_source (cr, pat);
cairo_fill (cr);
- cairo_pattern_destroy (pattern);
+ cairo_pattern_destroy (pat);
/* Draw lightborder */
murrine_shade (fill, widget->lightborder_ratio*highlight_ratio_custom, &highlight);
@@ -950,28 +949,28 @@
switch (tab->gap_side)
{
case MRN_GAP_TOP:
- pattern = cairo_pattern_create_linear (0, height-2, 0, 0);
+ pat = cairo_pattern_create_linear (0, height-2, 0, 0);
break;
case MRN_GAP_BOTTOM:
- pattern = cairo_pattern_create_linear (0, 1, 0, height);
+ pat = cairo_pattern_create_linear (0, 1, 0, height);
break;
case MRN_GAP_LEFT:
- pattern = cairo_pattern_create_linear (width-2, 0, 1, 0);
+ pat = cairo_pattern_create_linear (width-2, 0, 1, 0);
break;
case MRN_GAP_RIGHT:
- pattern = cairo_pattern_create_linear (1, 0, width-2, 0);
+ pat = cairo_pattern_create_linear (1, 0, width-2, 0);
break;
}
murrine_rounded_rectangle_closed (cr, 1, 1, width-3, height-3, widget->roundness, widget->corners);
- murrine_pattern_add_color_stop_rgba (pattern, 0.00, &shade1, 0.5);
- murrine_pattern_add_color_stop_rgba (pattern, 0.45, &shade2, 0.5);
- murrine_pattern_add_color_stop_rgba (pattern, 0.45, &shade3, 0.5);
- murrine_pattern_add_color_stop_rgba (pattern, 1.00, &shade4, 0.5);
- cairo_set_source (cr, pattern);
+ murrine_pattern_add_color_stop_rgba (pat, 0.00, &shade1, 0.5);
+ murrine_pattern_add_color_stop_rgba (pat, 0.45, &shade2, 0.5);
+ murrine_pattern_add_color_stop_rgba (pat, 0.45, &shade3, 0.5);
+ murrine_pattern_add_color_stop_rgba (pat, 1.00, &shade4, 0.5);
+ cairo_set_source (cr, pat);
cairo_stroke (cr);
- cairo_pattern_destroy (pattern);
+ cairo_pattern_destroy (pat);
}
else
{
@@ -988,28 +987,28 @@
switch (tab->gap_side)
{
case MRN_GAP_TOP:
- pattern = cairo_pattern_create_linear (0, height-2, 0, 0);
+ pat = cairo_pattern_create_linear (0, height-2, 0, 0);
break;
case MRN_GAP_BOTTOM:
- pattern = cairo_pattern_create_linear (0, 0, 0, height);
+ pat = cairo_pattern_create_linear (0, 0, 0, height);
break;
case MRN_GAP_LEFT:
- pattern = cairo_pattern_create_linear (width-2, 0, 0, 0);
+ pat = cairo_pattern_create_linear (width-2, 0, 0, 0);
break;
case MRN_GAP_RIGHT:
- pattern = cairo_pattern_create_linear (0, 0, width, 0);
+ pat = cairo_pattern_create_linear (0, 0, width, 0);
break;
}
murrine_rounded_rectangle_closed (cr, 0, 0, width-1, height-1, widget->roundness, widget->corners);
- murrine_pattern_add_color_stop_rgb (pattern, 0.00, &shade1);
- murrine_pattern_add_color_stop_rgb (pattern, 0.45, &shade2);
- murrine_pattern_add_color_stop_rgb (pattern, 0.45, &shade3);
- murrine_pattern_add_color_stop_rgb (pattern, 1.00, &shade4);
- cairo_set_source (cr, pattern);
+ murrine_pattern_add_color_stop_rgb (pat, 0.00, &shade1);
+ murrine_pattern_add_color_stop_rgb (pat, 0.45, &shade2);
+ murrine_pattern_add_color_stop_rgb (pat, 0.45, &shade3);
+ murrine_pattern_add_color_stop_rgb (pat, 1.00, &shade4);
+ cairo_set_source (cr, pat);
cairo_fill (cr);
- cairo_pattern_destroy (pattern);
+ cairo_pattern_destroy (pat);
/* Draw lightborder */
murrine_shade (fill, widget->lightborder_ratio*highlight_ratio_custom, &highlight);
@@ -1021,28 +1020,28 @@
switch (tab->gap_side)
{
case MRN_GAP_TOP:
- pattern = cairo_pattern_create_linear (0, height-2, 0, 0);
+ pat = cairo_pattern_create_linear (0, height-2, 0, 0);
break;
case MRN_GAP_BOTTOM:
- pattern = cairo_pattern_create_linear (0, 0, 0, height);
+ pat = cairo_pattern_create_linear (0, 0, 0, height);
break;
case MRN_GAP_LEFT:
- pattern = cairo_pattern_create_linear (width-2, 0, 0, 0);
+ pat = cairo_pattern_create_linear (width-2, 0, 0, 0);
break;
case MRN_GAP_RIGHT:
- pattern = cairo_pattern_create_linear (0, 0, width, 0);
+ pat = cairo_pattern_create_linear (0, 0, width, 0);
break;
}
murrine_rounded_rectangle_closed (cr, 1, 1, width-3, height-3, widget->roundness, widget->corners);
- murrine_pattern_add_color_stop_rgba (pattern, 0.00, &shade1, 0.5);
- murrine_pattern_add_color_stop_rgba (pattern, 0.45, &shade2, 0.5);
- murrine_pattern_add_color_stop_rgba (pattern, 0.45, &shade3, 0.5);
- murrine_pattern_add_color_stop_rgb (pattern, 1.00, &shade4);
- cairo_set_source (cr, pattern);
+ murrine_pattern_add_color_stop_rgba (pat, 0.00, &shade1, 0.5);
+ murrine_pattern_add_color_stop_rgba (pat, 0.45, &shade2, 0.5);
+ murrine_pattern_add_color_stop_rgba (pat, 0.45, &shade3, 0.5);
+ murrine_pattern_add_color_stop_rgb (pat, 1.00, &shade4);
+ cairo_set_source (cr, pat);
cairo_stroke (cr);
- cairo_pattern_destroy (pattern);
+ cairo_pattern_destroy (pat);
}
murrine_set_color_rgb (cr, border);
@@ -1158,12 +1157,12 @@
}
else
{
- cairo_pattern_t *pattern;
- pattern = cairo_pattern_create_linear (0.0, height-4.0, 0.0, height-1.0);
- murrine_pattern_add_color_stop_rgba (pattern, 0.0, &shadow_header, 0.0);
- murrine_pattern_add_color_stop_rgb (pattern, 1.0, &shadow_header);
- cairo_set_source (cr, pattern);
- cairo_pattern_destroy (pattern);
+ cairo_pattern_t *pat;
+ pat = cairo_pattern_create_linear (0.0, height-4.0, 0.0, height-1.0);
+ murrine_pattern_add_color_stop_rgba (pat, 0.0, &shadow_header, 0.0);
+ murrine_pattern_add_color_stop_rgb (pat, 1.0, &shadow_header);
+ cairo_set_source (cr, pat);
+ cairo_pattern_destroy (pat);
cairo_rectangle (cr, 0.0, height-4.0, width, 3.0);
}
cairo_fill (cr);
Modified: trunk/src/murrine_draw_rgba.c
==============================================================================
--- trunk/src/murrine_draw_rgba.c (original)
+++ trunk/src/murrine_draw_rgba.c Tue Sep 30 00:40:30 2008
@@ -207,7 +207,7 @@
/* Draw pressed button shadow */
if (widget->active)
{
- cairo_pattern_t *pattern;
+ cairo_pattern_t *pat;
MurrineRGB shadow;
murrine_shade (&fill, 0.94, &shadow);
@@ -220,20 +220,20 @@
cairo_clip (cr);
cairo_rectangle (cr, xos+1, yos+1, width-(xos*2)-2, 3);
- pattern = cairo_pattern_create_linear (xos+1, yos+1, xos+1, yos+4);
- murrine_pattern_add_color_stop_rgba (pattern, 0.0, &shadow, 0.58);
- murrine_pattern_add_color_stop_rgba (pattern, 1.0, &shadow, 0.0);
- cairo_set_source (cr, pattern);
+ pat = cairo_pattern_create_linear (xos+1, yos+1, xos+1, yos+4);
+ murrine_pattern_add_color_stop_rgba (pat, 0.0, &shadow, 0.58);
+ murrine_pattern_add_color_stop_rgba (pat, 1.0, &shadow, 0.0);
+ cairo_set_source (cr, pat);
cairo_fill (cr);
- cairo_pattern_destroy (pattern);
+ cairo_pattern_destroy (pat);
cairo_rectangle (cr, xos+1, yos+1, 3, height-(yos*2)-2);
- pattern = cairo_pattern_create_linear (xos+1, yos+1, xos+4, yos+1);
- murrine_pattern_add_color_stop_rgba (pattern, 0.0, &shadow, 0.58);
- murrine_pattern_add_color_stop_rgba (pattern, 1.0, &shadow, 0.0);
- cairo_set_source (cr, pattern);
+ pat = cairo_pattern_create_linear (xos+1, yos+1, xos+4, yos+1);
+ murrine_pattern_add_color_stop_rgba (pat, 0.0, &shadow, 0.58);
+ murrine_pattern_add_color_stop_rgba (pat, 1.0, &shadow, 0.0);
+ cairo_set_source (cr, pat);
cairo_fill (cr);
- cairo_pattern_destroy (pattern);
+ cairo_pattern_destroy (pat);
cairo_restore (cr);
}
@@ -407,28 +407,28 @@
if (widget->mrn_gradient.gradients)
{
- cairo_pattern_t *pattern;
+ cairo_pattern_t *pat;
MurrineRGB shadow;
murrine_shade (border, 0.94, &shadow);
/* Top shadow */
cairo_rectangle (cr, x+1, y+1, width-2, 4);
- pattern = cairo_pattern_create_linear (x, y, x, y+4);
- murrine_pattern_add_color_stop_rgba (pattern, 0.0, &shadow, 0.26);
- murrine_pattern_add_color_stop_rgba (pattern, 1.0, &shadow, 0.0);
- cairo_set_source (cr, pattern);
+ pat = cairo_pattern_create_linear (x, y, x, y+4);
+ murrine_pattern_add_color_stop_rgba (pat, 0.0, &shadow, 0.26);
+ murrine_pattern_add_color_stop_rgba (pat, 1.0, &shadow, 0.0);
+ cairo_set_source (cr, pat);
cairo_fill (cr);
- cairo_pattern_destroy (pattern);
+ cairo_pattern_destroy (pat);
/* Left shadow */
cairo_rectangle (cr, x+1, y+1, 4, height-2);
- pattern = cairo_pattern_create_linear (x, y, x+4, y);
- murrine_pattern_add_color_stop_rgba (pattern, 0.0, &shadow, 0.26);
- murrine_pattern_add_color_stop_rgba (pattern, 1.0, &shadow, 0.0);
- cairo_set_source (cr, pattern);
+ pat = cairo_pattern_create_linear (x, y, x+4, y);
+ murrine_pattern_add_color_stop_rgba (pat, 0.0, &shadow, 0.26);
+ murrine_pattern_add_color_stop_rgba (pat, 1.0, &shadow, 0.0);
+ cairo_set_source (cr, pat);
cairo_fill (cr);
- cairo_pattern_destroy (pattern);
+ cairo_pattern_destroy (pat);
}
}
@@ -527,16 +527,16 @@
default:
case 0:
{
- cairo_pattern_t *pattern;
+ cairo_pattern_t *pat;
- pattern = cairo_pattern_create_linear (0, 0, width, 0);
- murrine_pattern_add_color_stop_rgba (pattern, 0.0, fill, MENUBAR_OPACITY);
- murrine_pattern_add_color_stop_rgba (pattern, 0.5, fill, (MENUBAR_OPACITY-0.04));
- murrine_pattern_add_color_stop_rgba (pattern, 1.0, fill, MENUBAR_OPACITY);
- cairo_set_source (cr, pattern);
+ pat = cairo_pattern_create_linear (0, 0, width, 0);
+ murrine_pattern_add_color_stop_rgba (pat, 0.0, fill, MENUBAR_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pat, 0.5, fill, (MENUBAR_OPACITY-0.04));
+ murrine_pattern_add_color_stop_rgba (pat, 1.0, fill, MENUBAR_OPACITY);
+ cairo_set_source (cr, pat);
cairo_rectangle (cr, 0, 0, width, height);
cairo_fill (cr);
- cairo_pattern_destroy (pattern);
+ cairo_pattern_destroy (pat);
cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
break;
@@ -552,35 +552,35 @@
}
case 2:
{
- cairo_pattern_t *pattern;
+ cairo_pattern_t *pat;
MurrineRGB lower;
murrine_shade (fill, 0.95, &lower);
- pattern = cairo_pattern_create_linear (0, 0, 0, height);
- murrine_pattern_add_color_stop_rgba (pattern, 0.0, fill, MENUBAR_OPACITY);
- murrine_pattern_add_color_stop_rgba (pattern, 1.0, &lower, MENUBAR_OPACITY);
- cairo_set_source (cr, pattern);
+ pat = cairo_pattern_create_linear (0, 0, 0, height);
+ murrine_pattern_add_color_stop_rgba (pat, 0.0, fill, MENUBAR_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pat, 1.0, &lower, MENUBAR_OPACITY);
+ cairo_set_source (cr, pat);
cairo_fill (cr);
- cairo_pattern_destroy (pattern);
+ cairo_pattern_destroy (pat);
cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
break;
}
case 3:
{
- cairo_pattern_t *pattern;
+ cairo_pattern_t *pat;
MurrineRGB low, top;
murrine_shade (fill, 0.9, &top);
murrine_shade (fill, 1.1, &low);
- pattern = cairo_pattern_create_linear (0, 0, 0, height);
- murrine_pattern_add_color_stop_rgba (pattern, 0.0, &top, MENUBAR_STRIPED_OPACITY);
- murrine_pattern_add_color_stop_rgba (pattern, 1.0, &low, MENUBAR_STRIPED_OPACITY);
- cairo_set_source (cr, pattern);
+ pat = cairo_pattern_create_linear (0, 0, 0, height);
+ murrine_pattern_add_color_stop_rgba (pat, 0.0, &top, MENUBAR_STRIPED_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pat, 1.0, &low, MENUBAR_STRIPED_OPACITY);
+ cairo_set_source (cr, pat);
cairo_fill (cr);
cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
- cairo_pattern_destroy (pattern);
+ cairo_pattern_destroy (pat);
int counter = -height;
cairo_set_line_width (cr, 1.0);
murrine_shade (&low, 0.9, &low);
@@ -658,15 +658,15 @@
}
case 2:
{
- cairo_pattern_t *pattern;
+ cairo_pattern_t *pat;
MurrineRGB lower;
murrine_shade (fill, 0.95, &lower);
- pattern = cairo_pattern_create_linear (0, 0, 0, height);
- murrine_pattern_add_color_stop_rgba (pattern, 0.0, fill, TOOLBAR_OPACITY);
- murrine_pattern_add_color_stop_rgba (pattern, 1.0, &lower, TOOLBAR_OPACITY);
- cairo_set_source (cr, pattern);
+ pat = cairo_pattern_create_linear (0, 0, 0, height);
+ murrine_pattern_add_color_stop_rgba (pat, 0.0, fill, TOOLBAR_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pat, 1.0, &lower, TOOLBAR_OPACITY);
+ cairo_set_source (cr, pat);
cairo_fill (cr);
- cairo_pattern_destroy (pattern);
+ cairo_pattern_destroy (pat);
cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
break;
@@ -863,7 +863,7 @@
const MurrineRGB *stripe_border = &colors->spot[2];
const MurrineRGB *fill = &colors->bg[widget->state_type];
const MurrineRGB *border = &colors->shade[!widget->active ? 5 : 4];
- cairo_pattern_t* pattern;
+ cairo_pattern_t *pat;
/* Set clip */
cairo_rectangle (cr, x, y, width, height);
@@ -917,28 +917,28 @@
switch (tab->gap_side)
{
case MRN_GAP_TOP:
- pattern = cairo_pattern_create_linear (0, height-2, 0, 0);
+ pat = cairo_pattern_create_linear (0, height-2, 0, 0);
break;
case MRN_GAP_BOTTOM:
- pattern = cairo_pattern_create_linear (0, 1, 0, height);
+ pat = cairo_pattern_create_linear (0, 1, 0, height);
break;
case MRN_GAP_LEFT:
- pattern = cairo_pattern_create_linear (width-2, 0, 1, 0);
+ pat = cairo_pattern_create_linear (width-2, 0, 1, 0);
break;
case MRN_GAP_RIGHT:
- pattern = cairo_pattern_create_linear (1, 0, width-2, 0);
+ pat = cairo_pattern_create_linear (1, 0, width-2, 0);
break;
}
murrine_rounded_rectangle_closed (cr, 0, 0, width-1, height-1, widget->roundness, widget->corners);
- murrine_pattern_add_color_stop_rgba (pattern, 0.00, &shade1, NOTEBOOK_OPACITY);
- murrine_pattern_add_color_stop_rgba (pattern, 0.45, &shade2, NOTEBOOK_OPACITY);
- murrine_pattern_add_color_stop_rgba (pattern, 0.45, &shade3, NOTEBOOK_OPACITY);
- murrine_pattern_add_color_stop_rgba (pattern, 1.00, &shade4, NOTEBOOK_OPACITY);
- cairo_set_source (cr, pattern);
+ murrine_pattern_add_color_stop_rgba (pat, 0.00, &shade1, NOTEBOOK_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pat, 0.45, &shade2, NOTEBOOK_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pat, 0.45, &shade3, NOTEBOOK_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pat, 1.00, &shade4, NOTEBOOK_OPACITY);
+ cairo_set_source (cr, pat);
cairo_fill (cr);
- cairo_pattern_destroy (pattern);
+ cairo_pattern_destroy (pat);
/* Draw lightborder */
cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
@@ -952,28 +952,28 @@
switch (tab->gap_side)
{
case MRN_GAP_TOP:
- pattern = cairo_pattern_create_linear (0, height-2, 0, 0);
+ pat = cairo_pattern_create_linear (0, height-2, 0, 0);
break;
case MRN_GAP_BOTTOM:
- pattern = cairo_pattern_create_linear (0, 1, 0, height);
+ pat = cairo_pattern_create_linear (0, 1, 0, height);
break;
case MRN_GAP_LEFT:
- pattern = cairo_pattern_create_linear (width-2, 0, 1, 0);
+ pat = cairo_pattern_create_linear (width-2, 0, 1, 0);
break;
case MRN_GAP_RIGHT:
- pattern = cairo_pattern_create_linear (1, 0, width-2, 0);
+ pat = cairo_pattern_create_linear (1, 0, width-2, 0);
break;
}
murrine_rounded_rectangle_closed (cr, 1, 1, width-3, height-3, widget->roundness, widget->corners);
- murrine_pattern_add_color_stop_rgba (pattern, 0.00, &shade1, 0.5*NOTEBOOK_OPACITY);
- murrine_pattern_add_color_stop_rgba (pattern, 0.45, &shade2, 0.5*NOTEBOOK_OPACITY);
- murrine_pattern_add_color_stop_rgba (pattern, 0.45, &shade3, 0.5*NOTEBOOK_OPACITY);
- murrine_pattern_add_color_stop_rgba (pattern, 1.00, &shade4, 0.5*NOTEBOOK_OPACITY);
- cairo_set_source (cr, pattern);
+ murrine_pattern_add_color_stop_rgba (pat, 0.00, &shade1, 0.5*NOTEBOOK_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pat, 0.45, &shade2, 0.5*NOTEBOOK_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pat, 0.45, &shade3, 0.5*NOTEBOOK_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pat, 1.00, &shade4, 0.5*NOTEBOOK_OPACITY);
+ cairo_set_source (cr, pat);
cairo_stroke (cr);
- cairo_pattern_destroy (pattern);
+ cairo_pattern_destroy (pat);
}
else
{
@@ -990,28 +990,28 @@
switch (tab->gap_side)
{
case MRN_GAP_TOP:
- pattern = cairo_pattern_create_linear (0, height-2, 0, 0);
+ pat = cairo_pattern_create_linear (0, height-2, 0, 0);
break;
case MRN_GAP_BOTTOM:
- pattern = cairo_pattern_create_linear (0, 0, 0, height);
+ pat = cairo_pattern_create_linear (0, 0, 0, height);
break;
case MRN_GAP_LEFT:
- pattern = cairo_pattern_create_linear (width-2, 0, 0, 0);
+ pat = cairo_pattern_create_linear (width-2, 0, 0, 0);
break;
case MRN_GAP_RIGHT:
- pattern = cairo_pattern_create_linear (0, 0, width, 0);
+ pat = cairo_pattern_create_linear (0, 0, width, 0);
break;
}
murrine_rounded_rectangle_closed (cr, 0, 0, width-1, height-1, widget->roundness, widget->corners);
- murrine_pattern_add_color_stop_rgba (pattern, 0.00, &shade1, NOTEBOOK_OPACITY);
- murrine_pattern_add_color_stop_rgba (pattern, 0.45, &shade2, NOTEBOOK_OPACITY);
- murrine_pattern_add_color_stop_rgba (pattern, 0.45, &shade3, NOTEBOOK_OPACITY);
- murrine_pattern_add_color_stop_rgba (pattern, 1.00, &shade4, NOTEBOOK_OPACITY);
- cairo_set_source (cr, pattern);
+ murrine_pattern_add_color_stop_rgba (pat, 0.00, &shade1, NOTEBOOK_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pat, 0.45, &shade2, NOTEBOOK_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pat, 0.45, &shade3, NOTEBOOK_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pat, 1.00, &shade4, NOTEBOOK_OPACITY);
+ cairo_set_source (cr, pat);
cairo_fill (cr);
- cairo_pattern_destroy (pattern);
+ cairo_pattern_destroy (pat);
/* Draw lightborder */
cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
@@ -1025,28 +1025,28 @@
switch (tab->gap_side)
{
case MRN_GAP_TOP:
- pattern = cairo_pattern_create_linear (0, height-2, 0, 0);
+ pat = cairo_pattern_create_linear (0, height-2, 0, 0);
break;
case MRN_GAP_BOTTOM:
- pattern = cairo_pattern_create_linear (0, 0, 0, height);
+ pat = cairo_pattern_create_linear (0, 0, 0, height);
break;
case MRN_GAP_LEFT:
- pattern = cairo_pattern_create_linear (width-2, 0, 0, 0);
+ pat = cairo_pattern_create_linear (width-2, 0, 0, 0);
break;
case MRN_GAP_RIGHT:
- pattern = cairo_pattern_create_linear (0, 0, width, 0);
+ pat = cairo_pattern_create_linear (0, 0, width, 0);
break;
}
murrine_rounded_rectangle_closed (cr, 1, 1, width-3, height-3, widget->roundness, widget->corners);
- murrine_pattern_add_color_stop_rgba (pattern, 0.00, &shade1, 0.5*NOTEBOOK_OPACITY);
- murrine_pattern_add_color_stop_rgba (pattern, 0.45, &shade2, 0.5*NOTEBOOK_OPACITY);
- murrine_pattern_add_color_stop_rgba (pattern, 0.45, &shade3, 0.5*NOTEBOOK_OPACITY);
- murrine_pattern_add_color_stop_rgba (pattern, 1.00, &shade4, 0.5*NOTEBOOK_OPACITY);
- cairo_set_source (cr, pattern);
+ murrine_pattern_add_color_stop_rgba (pat, 0.00, &shade1, 0.5*NOTEBOOK_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pat, 0.45, &shade2, 0.5*NOTEBOOK_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pat, 0.45, &shade3, 0.5*NOTEBOOK_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pat, 1.00, &shade4, 0.5*NOTEBOOK_OPACITY);
+ cairo_set_source (cr, pat);
cairo_stroke (cr);
- cairo_pattern_destroy (pattern);
+ cairo_pattern_destroy (pat);
}
murrine_rounded_rectangle (cr, 0, 0, width-1, height-1, widget->roundness, widget->corners);
Modified: trunk/src/murrine_style.c
==============================================================================
--- trunk/src/murrine_style.c (original)
+++ trunk/src/murrine_style.c Tue Sep 30 00:40:30 2008
@@ -289,16 +289,16 @@
cairo_paint (cr);
cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
- cairo_pattern_t *pattern;
+ cairo_pattern_t *pat;
- pattern = cairo_pattern_create_linear (0, 0, width, 0);
- murrine_pattern_add_color_stop_rgba (pattern, 0.0, &colors->bg[0], WINDOW_OPACITY);
- murrine_pattern_add_color_stop_rgba (pattern, 0.5, &colors->bg[0], (WINDOW_OPACITY-0.04));
- murrine_pattern_add_color_stop_rgba (pattern, 1.0, &colors->bg[0], WINDOW_OPACITY);
- cairo_set_source (cr, pattern);
+ pat = cairo_pattern_create_linear (0, 0, width, 0);
+ murrine_pattern_add_color_stop_rgba (pat, 0.0, &colors->bg[0], WINDOW_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pat, 0.5, &colors->bg[0], (WINDOW_OPACITY-0.04));
+ murrine_pattern_add_color_stop_rgba (pat, 1.0, &colors->bg[0], WINDOW_OPACITY);
+ cairo_set_source (cr, pat);
cairo_rectangle (cr, 0, 0, width, height);
cairo_fill (cr);
- cairo_pattern_destroy (pattern);
+ cairo_pattern_destroy (pat);
}
cairo_destroy (cr);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
