murrine r18 - in trunk: . src
- From: acimitan svn gnome org
- To: svn-commits-list gnome org
- Subject: murrine r18 - in trunk: . src
- Date: Wed, 27 Feb 2008 12:21:49 +0000 (GMT)
Author: acimitan
Date: Wed Feb 27 12:21:49 2008
New Revision: 18
URL: http://svn.gnome.org/viewvc/murrine?rev=18&view=rev
Log:
2008-02-27 Andrea Cimitan <andrea cimitan gmail com>
* src/cairo-support.c: (murrine_draw_lightborder):
* src/cairo-support.h:
* src/murrine_draw.c: (murrine_draw_button),
(murrine_draw_progressbar_fill), (murrine_draw_menubar),
(murrine_draw_list_view_header), (murrine_draw_menuitem),
(murrine_draw_scrollbar_stepper), (murrine_draw_scrollbar_slider):
* src/murrine_draw_rgba.c: (murrine_rgba_draw_button),
(murrine_rgba_draw_progressbar_fill), (murrine_rgba_draw_menubar),
(murrine_rgba_draw_scrollbar_stepper),
(murrine_rgba_draw_scrollbar_slider):
* src/murrine_rc_style.c: (murrine_rc_style_init),
(murrine_rc_style_parse), (murrine_rc_style_merge):
* src/murrine_rc_style.h:
* src/murrine_style.c: (murrine_set_widget_parameters),
(murrine_style_init_from_rc), (murrine_style_realize),
(murrine_style_copy):
* src/murrine_style.h:
* src/murrine_types.h:
Added lightborderstyle, to draw the lightborder on all edges
(lightborderstyle = 1, 0 is default)
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_rc_style.c
trunk/src/murrine_rc_style.h
trunk/src/murrine_style.c
trunk/src/murrine_style.h
trunk/src/murrine_types.h
Modified: trunk/src/cairo-support.c
==============================================================================
--- trunk/src/cairo-support.c (original)
+++ trunk/src/cairo-support.c Wed Feb 27 12:21:49 2008
@@ -459,7 +459,8 @@
MurrineGradients mrn_gradient,
double x, double y, int width, int height,
boolean gradients, boolean horizontal,
- int glazestyle, int radius, uint8 corners)
+ int glazestyle, int lightborderstyle,
+ int radius, uint8 corners)
{
cairo_pattern_t *pattern;
MurrineRGB shade1, shade2, shade3, shade4;
@@ -496,8 +497,10 @@
cairo_pattern_add_color_stop_rgba (pattern, 0.5, shade2.r, shade2.g, shade2.b, 0.5*alpha_value);
cairo_pattern_add_color_stop_rgba (pattern, 0.5, shade3.r, shade3.g, shade3.b, 0.5*alpha_value);
cairo_pattern_add_color_stop_rgba (pattern, fill_pos, shade4.r, shade4.g, shade4.b, 0.5*alpha_value);
- cairo_pattern_add_color_stop_rgba (pattern, fill_pos, shade4.r, shade4.g, shade4.b, 0.0);
- cairo_pattern_add_color_stop_rgba (pattern, 1.0, shade4.r, shade4.g, shade4.b, 0.0);
+ cairo_pattern_add_color_stop_rgba (pattern, fill_pos, shade4.r, shade4.g, shade4.b,
+ lightborderstyle > 0 ? 0.5*alpha_value : 0.0);
+ cairo_pattern_add_color_stop_rgba (pattern, 1.0, shade4.r, shade4.g, shade4.b,
+ lightborderstyle > 0 ? 0.5*alpha_value : 0.0);
cairo_set_source (cr, pattern);
cairo_pattern_destroy (pattern);
Modified: trunk/src/cairo-support.h
==============================================================================
--- trunk/src/cairo-support.h (original)
+++ trunk/src/cairo-support.h Wed Feb 27 12:21:49 2008
@@ -76,7 +76,8 @@
MurrineGradients mrn_gradient,
double x, double y, int width, int height,
boolean gradients, boolean horizontal,
- int glazestyle, int radius, uint8 corners);
+ int glazestyle, int lightborderstyle,
+ int radius, uint8 corners);
G_GNUC_INTERNAL void murrine_set_gradient (cairo_t *cr,
const MurrineRGB *color,
Modified: trunk/src/murrine_draw.c
==============================================================================
--- trunk/src/murrine_draw.c (original)
+++ trunk/src/murrine_draw.c Wed Feb 27 12:21:49 2008
@@ -258,7 +258,8 @@
xoffset + 1.5, yoffset + 1.5,
width-(xoffset*2)-3, height-(yoffset*2)-3,
widget->mrn_gradient.gradients, horizontal,
- widget->glazestyle, widget->roundness, widget->corners);
+ widget->glazestyle, widget->lightborderstyle,
+ widget->roundness, widget->corners);
}
else
{
@@ -267,7 +268,8 @@
xoffset + 1.5, yoffset + 1.5,
width-(xoffset*2)-3, height-(yoffset*2)-3,
widget->mrn_gradient.gradients, horizontal,
- widget->glazestyle, widget->roundness, widget->corners);
+ widget->glazestyle, widget->lightborderstyle,
+ widget->roundness, widget->corners);
murrine_exchange_axis (cr, &x, &y, &width, &height);
}
}
@@ -628,7 +630,7 @@
2.5, 1.5,
width-5, height-3,
widget->mrn_gradient.gradients, TRUE,
- widget->glazestyle, 0, MRN_CORNER_NONE);
+ widget->glazestyle, widget->lightborderstyle, 0, MRN_CORNER_NONE);
/* Draw strokes */
while (tile_pos <= width+x_step-2)
@@ -728,7 +730,8 @@
1.5, 1.5,
width-3, height-3,
widget->mrn_gradient.gradients, TRUE,
- widget->glazestyle, widget->roundness, widget->corners);
+ widget->glazestyle, widget->lightborderstyle,
+ widget->roundness, widget->corners);
}
}
else if (menubarstyle == 2) /* Gradient menubar */
@@ -1277,7 +1280,8 @@
0.5, 0.5,
width-2, height-2,
widget->mrn_gradient.gradients, TRUE,
- widget->glazestyle, widget->roundness, widget->corners);
+ widget->glazestyle, widget->lightborderstyle,
+ widget->roundness, widget->corners);
}
}
/* Raised */
@@ -1504,7 +1508,8 @@
1.5, 1.5,
width-3, height-3,
widget->mrn_gradient.gradients, TRUE,
- widget->glazestyle, widget->roundness, widget->corners);
+ widget->glazestyle, widget->lightborderstyle,
+ widget->roundness, widget->corners);
}
}
else
@@ -1625,7 +1630,8 @@
1.5, 1.5,
width-3, height-3,
widget->mrn_gradient.gradients, TRUE,
- widget->glazestyle, widget->roundness, widget->corners);
+ widget->glazestyle, widget->lightborderstyle,
+ widget->roundness, widget->corners);
}
cairo_reset_clip (cr);
@@ -1740,7 +1746,8 @@
1.5, 1.5,
width-3, height-3,
widget->mrn_gradient.gradients, TRUE,
- widget->glazestyle, 0, MRN_CORNER_NONE);
+ widget->glazestyle, widget->lightborderstyle,
+ 0, MRN_CORNER_NONE);
}
/* Draw the options */
Modified: trunk/src/murrine_draw_rgba.c
==============================================================================
--- trunk/src/murrine_draw_rgba.c (original)
+++ trunk/src/murrine_draw_rgba.c Wed Feb 27 12:21:49 2008
@@ -260,7 +260,8 @@
xoffset + 1.5, yoffset + 1.5,
width-(xoffset*2)-3, height-(yoffset*2)-3,
widget->mrn_gradient.gradients, horizontal,
- widget->glazestyle, widget->roundness, widget->corners);
+ widget->glazestyle, widget->lightborderstyle,
+ widget->roundness, widget->corners);
}
else
{
@@ -269,7 +270,8 @@
xoffset + 1.5, yoffset + 1.5,
width-(xoffset*2)-3, height-(yoffset*2)-3,
widget->mrn_gradient.gradients, horizontal,
- widget->glazestyle, widget->roundness, widget->corners);
+ widget->glazestyle, widget->lightborderstyle,
+ widget->roundness, widget->corners);
murrine_exchange_axis (cr, &x, &y, &width, &height);
}
}
@@ -597,7 +599,8 @@
2.5, 1.5,
width-5, height-3,
widget->mrn_gradient.gradients, TRUE,
- widget->glazestyle, 0, MRN_CORNER_NONE);
+ widget->glazestyle, widget->lightborderstyle,
+ 0, MRN_CORNER_NONE);
/* Draw strokes */
while (tile_pos <= width+x_step-2)
@@ -677,7 +680,8 @@
1.5, 1.5,
width-3, height-3,
widget->mrn_gradient.gradients, TRUE,
- widget->glazestyle, widget->roundness, widget->corners);
+ widget->glazestyle, widget->lightborderstyle,
+ widget->roundness, widget->corners);
}
}
else if (menubarstyle == 2) /* Gradient menubar */
@@ -1359,7 +1363,8 @@
1.5, 1.5,
width-3, height-3,
widget->mrn_gradient.gradients, TRUE,
- widget->glazestyle, widget->roundness, widget->corners);
+ widget->glazestyle, widget->lightborderstyle,
+ widget->roundness, widget->corners);
}
cairo_reset_clip (cr);
@@ -1477,7 +1482,8 @@
1.5, 1.5,
width-3, height-3,
widget->mrn_gradient.gradients, TRUE,
- widget->glazestyle, 0, MRN_CORNER_NONE);
+ widget->glazestyle, widget->lightborderstyle,
+ 0, MRN_CORNER_NONE);
}
/* Draw the options */
Modified: trunk/src/murrine_rc_style.c
==============================================================================
--- trunk/src/murrine_rc_style.c (original)
+++ trunk/src/murrine_rc_style.c Wed Feb 27 12:21:49 2008
@@ -52,6 +52,7 @@
TOKEN_GRADIENTS,
TOKEN_HIGHLIGHT_RATIO,
TOKEN_LIGHTBORDER_RATIO,
+ TOKEN_LIGHTBORDERSTYLE,
TOKEN_LISTVIEWHEADERSTYLE,
TOKEN_LISTVIEWSTYLE,
TOKEN_MENUBARITEMSTYLE,
@@ -99,6 +100,7 @@
{ "gradients", TOKEN_GRADIENTS },
{ "highlight_ratio", TOKEN_HIGHLIGHT_RATIO },
{ "lightborder_ratio", TOKEN_LIGHTBORDER_RATIO },
+ { "lightborderstyle", TOKEN_LIGHTBORDERSTYLE },
{ "listviewheaderstyle", TOKEN_LISTVIEWHEADERSTYLE },
{ "listviewstyle", TOKEN_LISTVIEWSTYLE },
{ "menubaritemstyle", TOKEN_MENUBARITEMSTYLE },
@@ -169,6 +171,7 @@
murrine_rc->has_gradient_stop = FALSE;
murrine_rc->highlight_ratio = 1.1;
murrine_rc->lightborder_ratio = 1.1;
+ murrine_rc->lightborderstyle = 0;
murrine_rc->listviewheaderstyle = 1;
murrine_rc->listviewstyle = 0;
murrine_rc->menubaritemstyle = 0;
@@ -459,6 +462,10 @@
token = theme_parse_ratio (settings, scanner, &murrine_style->lightborder_ratio);
murrine_style->flags |= MRN_FLAG_LIGHTBORDER_RATIO;
break;
+ case TOKEN_LIGHTBORDERSTYLE:
+ token = theme_parse_int (settings, scanner, &murrine_style->lightborderstyle);
+ murrine_style->flags |= MRN_FLAG_LIGHTBORDERSTYLE;
+ break;
case TOKEN_LISTVIEWHEADERSTYLE:
token = theme_parse_int (settings, scanner, &murrine_style->listviewheaderstyle);
murrine_style->flags |= MRN_FLAG_LISTVIEWHEADERSTYLE;
@@ -599,6 +606,8 @@
dest_w->highlight_ratio = src_w->highlight_ratio;
if (flags & MRN_FLAG_LIGHTBORDER_RATIO)
dest_w->lightborder_ratio = src_w->lightborder_ratio;
+ if (flags & MRN_FLAG_LIGHTBORDERSTYLE)
+ dest_w->lightborderstyle = src_w->lightborderstyle;
if (flags & MRN_FLAG_LISTVIEWHEADERSTYLE)
dest_w->listviewheaderstyle = src_w->listviewheaderstyle;
if (flags & MRN_FLAG_LISTVIEWSTYLE)
Modified: trunk/src/murrine_rc_style.h
==============================================================================
--- trunk/src/murrine_rc_style.h (original)
+++ trunk/src/murrine_rc_style.h Wed Feb 27 12:21:49 2008
@@ -45,20 +45,21 @@
MRN_FLAG_GRADIENTS = 1 << 8,
MRN_FLAG_HIGHLIGHT_RATIO = 1 << 9,
MRN_FLAG_LIGHTBORDER_RATIO = 1 << 10,
- MRN_FLAG_LISTVIEWHEADERSTYLE = 1 << 11,
- MRN_FLAG_LISTVIEWSTYLE = 1 << 12,
- MRN_FLAG_MENUBARITEMSTYLE = 1 << 13,
- MRN_FLAG_MENUBARSTYLE = 1 << 14,
- MRN_FLAG_MENUITEMSTYLE = 1 << 15,
- MRN_FLAG_MENUSTYLE = 1 << 16,
- MRN_FLAG_RGBA = 1 << 17,
- MRN_FLAG_ROUNDNESS = 1 << 18,
- MRN_FLAG_SCROLLBAR_COLOR = 1 << 19,
- MRN_FLAG_SCROLLBARSTYLE = 1 << 20,
- MRN_FLAG_SLIDERSTYLE = 1 << 21,
- MRN_FLAG_STEPPERSTYLE = 1 << 22,
- MRN_FLAG_STYLE = 1 << 23,
- MRN_FLAG_TOOLBARSTYLE = 1 << 24
+ MRN_FLAG_LIGHTBORDERSTYLE= 1 << 11,
+ MRN_FLAG_LISTVIEWHEADERSTYLE = 1 << 12,
+ MRN_FLAG_LISTVIEWSTYLE = 1 << 13,
+ MRN_FLAG_MENUBARITEMSTYLE = 1 << 14,
+ MRN_FLAG_MENUBARSTYLE = 1 << 15,
+ MRN_FLAG_MENUITEMSTYLE = 1 << 16,
+ MRN_FLAG_MENUSTYLE = 1 << 17,
+ MRN_FLAG_RGBA = 1 << 18,
+ MRN_FLAG_ROUNDNESS = 1 << 19,
+ MRN_FLAG_SCROLLBAR_COLOR = 1 << 20,
+ MRN_FLAG_SCROLLBARSTYLE = 1 << 21,
+ MRN_FLAG_SLIDERSTYLE = 1 << 22,
+ MRN_FLAG_STEPPERSTYLE = 1 << 23,
+ MRN_FLAG_STYLE = 1 << 24,
+ MRN_FLAG_TOOLBARSTYLE = 1 << 25
} MurrineRcFlags;
struct _MurrineRcStyle
@@ -76,6 +77,7 @@
double lightborder_ratio;
guint8 glazestyle;
+ guint8 lightborderstyle;
guint8 listviewheaderstyle;
guint8 listviewstyle;
guint8 menubaritemstyle;
Modified: trunk/src/murrine_style.c
==============================================================================
--- trunk/src/murrine_style.c (original)
+++ trunk/src/murrine_style.c Wed Feb 27 12:21:49 2008
@@ -133,6 +133,7 @@
params->ythickness = style->ythickness;
params->lightborder_ratio = murrine_style->lightborder_ratio;
+ params->lightborderstyle = murrine_style->lightborderstyle;
params->glazestyle = murrine_style->glazestyle;
params->roundness = murrine_style->roundness;
params->highlight_ratio = murrine_style->highlight_ratio;
@@ -1605,6 +1606,7 @@
murrine_parent_class->init_from_rc (style, rc_style);
+ murrine_style->contrast = MURRINE_RC_STYLE (rc_style)->contrast;
murrine_style->gradient_stop_1 = MURRINE_RC_STYLE (rc_style)->gradient_stop_1;
murrine_style->gradient_stop_2 = MURRINE_RC_STYLE (rc_style)->gradient_stop_2;
murrine_style->gradient_stop_3 = MURRINE_RC_STYLE (rc_style)->gradient_stop_3;
@@ -1612,8 +1614,8 @@
murrine_style->has_gradient_stop = MURRINE_RC_STYLE (rc_style)->has_gradient_stop;
murrine_style->highlight_ratio = MURRINE_RC_STYLE (rc_style)->highlight_ratio;
murrine_style->lightborder_ratio = MURRINE_RC_STYLE (rc_style)->lightborder_ratio;
- murrine_style->glazestyle = MURRINE_RC_STYLE (rc_style)->glazestyle;
+ murrine_style->glazestyle = MURRINE_RC_STYLE (rc_style)->glazestyle;
if (murrine_style->has_gradient_stop &&
murrine_style->glazestyle != 0)
{
@@ -1636,6 +1638,7 @@
murrine_style->menubaritemstyle = MURRINE_RC_STYLE (rc_style)->menubaritemstyle;
murrine_style->menustyle = MURRINE_RC_STYLE (rc_style)->menustyle;
murrine_style->menuitemstyle = MURRINE_RC_STYLE (rc_style)->menuitemstyle;
+ murrine_style->lightborderstyle = MURRINE_RC_STYLE (rc_style)->lightborderstyle;
murrine_style->listviewheaderstyle = MURRINE_RC_STYLE (rc_style)->listviewheaderstyle;
murrine_style->listviewstyle = MURRINE_RC_STYLE (rc_style)->listviewstyle;
murrine_style->sliderstyle = MURRINE_RC_STYLE (rc_style)->sliderstyle;
@@ -1657,7 +1660,7 @@
switch (murrine_style->style)
{
case (MRN_STYLE_NODOKA):
- murrine_style->highlight_ratio = 1.0;
+ murrine_style->highlight_ratio = 1.1;
murrine_style->gradients = TRUE;
murrine_style->sliderstyle = 1;
murrine_style->scrollbarstyle = 2;
@@ -1668,18 +1671,23 @@
break;
case (MRN_STYLE_MIST):
murrine_style->highlight_ratio = 1.0;
+ murrine_style->glazestyle = 0;
murrine_style->gradients = FALSE;
+ murrine_style->has_gradient_stop = FALSE;
break;
case (MRN_STYLE_CANDIDO):
murrine_style->highlight_ratio = 1.0;
murrine_style->lightborder_ratio = 1.06;
+ murrine_style->glazestyle = 0;
murrine_style->gradients = TRUE;
murrine_style->gradient_stop_1 = 1.01;
murrine_style->gradient_stop_2 = 0.99;
murrine_style->gradient_stop_3 = 0.99;
murrine_style->gradient_stop_4 = 0.97;
+ murrine_style->has_gradient_stop = TRUE;
break;
case (MRN_STYLE_CLEARLOOKS):
+ murrine_style->glazestyle = 0;
murrine_style->gradient_stop_1 = 1.08;
murrine_style->gradient_stop_2 = 1.02;
murrine_style->gradient_stop_3 = 1.00;
@@ -1708,7 +1716,7 @@
murrine_parent_class->realize (style);
- contrast = MURRINE_RC_STYLE (style->rc_style)->contrast;
+ contrast = murrine_style->contrast;
bg_normal.r = style->bg[0].red / 65535.0;
bg_normal.g = style->bg[0].green / 65535.0;
@@ -1868,6 +1876,7 @@
mrn_style->has_scrollbar_color = mrn_src->has_scrollbar_color;
mrn_style->highlight_ratio = mrn_src->highlight_ratio;
mrn_style->lightborder_ratio = mrn_src->lightborder_ratio;
+ mrn_style->lightborderstyle = mrn_src->lightborderstyle;
mrn_style->listviewheaderstyle = mrn_src->listviewheaderstyle;
mrn_style->listviewstyle = mrn_src->listviewstyle;
mrn_style->menubaritemstyle = mrn_src->menubaritemstyle;
Modified: trunk/src/murrine_style.h
==============================================================================
--- trunk/src/murrine_style.h (original)
+++ trunk/src/murrine_style.h Wed Feb 27 12:21:49 2008
@@ -55,6 +55,7 @@
double lightborder_ratio;
guint8 glazestyle;
+ guint8 lightborderstyle;
guint8 listviewheaderstyle;
guint8 listviewstyle;
guint8 menubaritemstyle;
Modified: trunk/src/murrine_types.h
==============================================================================
--- trunk/src/murrine_types.h (original)
+++ trunk/src/murrine_types.h Wed Feb 27 12:21:49 2008
@@ -201,6 +201,7 @@
/* Style */
int glazestyle;
+ int lightborderstyle;
int roundness;
double highlight_ratio;
double lightborder_ratio;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
