murrine r17 - in trunk: . src
- From: acimitan svn gnome org
- To: svn-commits-list gnome org
- Subject: murrine r17 - in trunk: . src
- Date: Wed, 27 Feb 2008 11:03:18 +0000 (GMT)
Author: acimitan
Date: Wed Feb 27 11:03:17 2008
New Revision: 17
URL: http://svn.gnome.org/viewvc/murrine?rev=17&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_copy):
* src/murrine_style.h:
* src/murrine_types.h:
Renamed innerborder_ratio to lightborder_ratio
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 11:03:17 2008
@@ -453,7 +453,7 @@
}
void
-murrine_draw_innerborder (cairo_t *cr,
+murrine_draw_lightborder (cairo_t *cr,
const MurrineRGB *highlight_color,
const MurrineRGB *fill,
MurrineGradients mrn_gradient,
Modified: trunk/src/cairo-support.h
==============================================================================
--- trunk/src/cairo-support.h (original)
+++ trunk/src/cairo-support.h Wed Feb 27 11:03:17 2008
@@ -71,7 +71,7 @@
double x, double y, double w, double h,
uint8 corners);
-G_GNUC_INTERNAL void murrine_draw_innerborder (cairo_t *cr,
+G_GNUC_INTERNAL void murrine_draw_lightborder (cairo_t *cr,
const MurrineRGB *highlight_color, const MurrineRGB *fill,
MurrineGradients mrn_gradient,
double x, double y, int width, int height,
Modified: trunk/src/murrine_draw.c
==============================================================================
--- trunk/src/murrine_draw.c (original)
+++ trunk/src/murrine_draw.c Wed Feb 27 11:03:17 2008
@@ -251,10 +251,10 @@
/* Draw the white inner border */
if (widget->glazestyle != 4 && !widget->active)
{
- murrine_shade (&fill, widget->innerborder_ratio*custom_highlight_ratio, &highlight);
+ murrine_shade (&fill, widget->lightborder_ratio*custom_highlight_ratio, &highlight);
if (horizontal)
{
- murrine_draw_innerborder (cr, &highlight, &fill, mrn_gradient_custom,
+ murrine_draw_lightborder (cr, &highlight, &fill, mrn_gradient_custom,
xoffset + 1.5, yoffset + 1.5,
width-(xoffset*2)-3, height-(yoffset*2)-3,
widget->mrn_gradient.gradients, horizontal,
@@ -263,7 +263,7 @@
else
{
murrine_exchange_axis (cr, &x, &y, &width, &height);
- murrine_draw_innerborder (cr, &highlight, &fill, mrn_gradient_custom,
+ murrine_draw_lightborder (cr, &highlight, &fill, mrn_gradient_custom,
xoffset + 1.5, yoffset + 1.5,
width-(xoffset*2)-3, height-(yoffset*2)-3,
widget->mrn_gradient.gradients, horizontal,
@@ -623,8 +623,8 @@
cairo_fill (cr);
}
- murrine_shade (fill, widget->highlight_ratio*widget->innerborder_ratio, &highlight);
- murrine_draw_innerborder (cr, &highlight, fill, widget->mrn_gradient,
+ murrine_shade (fill, widget->highlight_ratio*widget->lightborder_ratio, &highlight);
+ murrine_draw_lightborder (cr, &highlight, fill, widget->mrn_gradient,
2.5, 1.5,
width-5, height-3,
widget->mrn_gradient.gradients, TRUE,
@@ -724,7 +724,7 @@
if (widget->glazestyle == 2)
{
- murrine_draw_innerborder (cr, &highlight, fill, widget->mrn_gradient,
+ murrine_draw_lightborder (cr, &highlight, fill, widget->mrn_gradient,
1.5, 1.5,
width-3, height-3,
widget->mrn_gradient.gradients, TRUE,
@@ -1273,7 +1273,7 @@
if (widget->glazestyle == 2)
{
- murrine_draw_innerborder (cr, &highlight, fill, widget->mrn_gradient,
+ murrine_draw_lightborder (cr, &highlight, fill, widget->mrn_gradient,
0.5, 0.5,
width-2, height-2,
widget->mrn_gradient.gradients, TRUE,
@@ -1500,7 +1500,7 @@
if (widget->glazestyle == 2)
{
- murrine_draw_innerborder (cr, &highlight, fill, widget->mrn_gradient,
+ murrine_draw_lightborder (cr, &highlight, fill, widget->mrn_gradient,
1.5, 1.5,
width-3, height-3,
widget->mrn_gradient.gradients, TRUE,
@@ -1620,8 +1620,8 @@
/* Draw the white inner border */
if (widget->glazestyle != 4)
{
- murrine_shade (fill, widget->innerborder_ratio*widget->highlight_ratio, &highlight);
- murrine_draw_innerborder (cr, &highlight, fill, widget->mrn_gradient,
+ murrine_shade (fill, widget->lightborder_ratio*widget->highlight_ratio, &highlight);
+ murrine_draw_lightborder (cr, &highlight, fill, widget->mrn_gradient,
1.5, 1.5,
width-3, height-3,
widget->mrn_gradient.gradients, TRUE,
@@ -1735,8 +1735,8 @@
if (widget->glazestyle != 4)
{
- murrine_shade (&fill, widget->innerborder_ratio*widget->highlight_ratio, &highlight);
- murrine_draw_innerborder (cr, &highlight, &fill, widget->mrn_gradient,
+ murrine_shade (&fill, widget->lightborder_ratio*widget->highlight_ratio, &highlight);
+ murrine_draw_lightborder (cr, &highlight, &fill, widget->mrn_gradient,
1.5, 1.5,
width-3, height-3,
widget->mrn_gradient.gradients, TRUE,
Modified: trunk/src/murrine_draw_rgba.c
==============================================================================
--- trunk/src/murrine_draw_rgba.c (original)
+++ trunk/src/murrine_draw_rgba.c Wed Feb 27 11:03:17 2008
@@ -253,10 +253,10 @@
/* Draw the white inner border */
if (widget->glazestyle != 4 && !widget->active)
{
- murrine_shade (&fill, widget->innerborder_ratio*custom_highlight_ratio, &highlight);
+ murrine_shade (&fill, widget->lightborder_ratio*custom_highlight_ratio, &highlight);
if (horizontal)
{
- murrine_draw_innerborder (cr, &highlight, &fill, mrn_gradient_custom,
+ murrine_draw_lightborder (cr, &highlight, &fill, mrn_gradient_custom,
xoffset + 1.5, yoffset + 1.5,
width-(xoffset*2)-3, height-(yoffset*2)-3,
widget->mrn_gradient.gradients, horizontal,
@@ -265,7 +265,7 @@
else
{
murrine_exchange_axis (cr, &x, &y, &width, &height);
- murrine_draw_innerborder (cr, &highlight, &fill, mrn_gradient_custom,
+ murrine_draw_lightborder (cr, &highlight, &fill, mrn_gradient_custom,
xoffset + 1.5, yoffset + 1.5,
width-(xoffset*2)-3, height-(yoffset*2)-3,
widget->mrn_gradient.gradients, horizontal,
@@ -592,8 +592,8 @@
cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
- murrine_shade (fill, widget->highlight_ratio*widget->innerborder_ratio, &highlight);
- murrine_draw_innerborder (cr, &highlight, fill, widget->mrn_gradient,
+ murrine_shade (fill, widget->highlight_ratio*widget->lightborder_ratio, &highlight);
+ murrine_draw_lightborder (cr, &highlight, fill, widget->mrn_gradient,
2.5, 1.5,
width-5, height-3,
widget->mrn_gradient.gradients, TRUE,
@@ -673,7 +673,7 @@
if (widget->glazestyle == 2)
{
- murrine_draw_innerborder (cr, &highlight, fill, widget->mrn_gradient,
+ murrine_draw_lightborder (cr, &highlight, fill, widget->mrn_gradient,
1.5, 1.5,
width-3, height-3,
widget->mrn_gradient.gradients, TRUE,
@@ -1354,8 +1354,8 @@
/* Draw the white inner border */
if (widget->glazestyle != 4)
{
- murrine_shade (fill, widget->innerborder_ratio*widget->highlight_ratio, &highlight);
- murrine_draw_innerborder (cr, &highlight, fill, widget->mrn_gradient,
+ murrine_shade (fill, widget->lightborder_ratio*widget->highlight_ratio, &highlight);
+ murrine_draw_lightborder (cr, &highlight, fill, widget->mrn_gradient,
1.5, 1.5,
width-3, height-3,
widget->mrn_gradient.gradients, TRUE,
@@ -1472,8 +1472,8 @@
if (widget->glazestyle != 4)
{
- murrine_shade (&fill, widget->innerborder_ratio*widget->highlight_ratio, &highlight);
- murrine_draw_innerborder (cr, &highlight, &fill, widget->mrn_gradient,
+ murrine_shade (&fill, widget->lightborder_ratio*widget->highlight_ratio, &highlight);
+ murrine_draw_lightborder (cr, &highlight, &fill, widget->mrn_gradient,
1.5, 1.5,
width-3, height-3,
widget->mrn_gradient.gradients, TRUE,
Modified: trunk/src/murrine_rc_style.c
==============================================================================
--- trunk/src/murrine_rc_style.c (original)
+++ trunk/src/murrine_rc_style.c Wed Feb 27 11:03:17 2008
@@ -51,7 +51,7 @@
TOKEN_GRADIENT_STOP_4,
TOKEN_GRADIENTS,
TOKEN_HIGHLIGHT_RATIO,
- TOKEN_INNERBORDER_RATIO,
+ TOKEN_LIGHTBORDER_RATIO,
TOKEN_LISTVIEWHEADERSTYLE,
TOKEN_LISTVIEWSTYLE,
TOKEN_MENUBARITEMSTYLE,
@@ -98,7 +98,7 @@
{ "gradient_stop_4", TOKEN_GRADIENT_STOP_4 },
{ "gradients", TOKEN_GRADIENTS },
{ "highlight_ratio", TOKEN_HIGHLIGHT_RATIO },
- { "innerborder_ratio", TOKEN_INNERBORDER_RATIO },
+ { "lightborder_ratio", TOKEN_LIGHTBORDER_RATIO },
{ "listviewheaderstyle", TOKEN_LISTVIEWHEADERSTYLE },
{ "listviewstyle", TOKEN_LISTVIEWSTYLE },
{ "menubaritemstyle", TOKEN_MENUBARITEMSTYLE },
@@ -168,7 +168,7 @@
murrine_rc->has_scrollbar_color = FALSE;
murrine_rc->has_gradient_stop = FALSE;
murrine_rc->highlight_ratio = 1.1;
- murrine_rc->innerborder_ratio = 1.1;
+ murrine_rc->lightborder_ratio = 1.1;
murrine_rc->listviewheaderstyle = 1;
murrine_rc->listviewstyle = 0;
murrine_rc->menubaritemstyle = 0;
@@ -455,9 +455,9 @@
token = theme_parse_ratio (settings, scanner, &murrine_style->highlight_ratio);
murrine_style->flags |= MRN_FLAG_HIGHLIGHT_RATIO;
break;
- case TOKEN_INNERBORDER_RATIO:
- token = theme_parse_ratio (settings, scanner, &murrine_style->innerborder_ratio);
- murrine_style->flags |= MRN_FLAG_INNERBORDER_RATIO;
+ case TOKEN_LIGHTBORDER_RATIO:
+ token = theme_parse_ratio (settings, scanner, &murrine_style->lightborder_ratio);
+ murrine_style->flags |= MRN_FLAG_LIGHTBORDER_RATIO;
break;
case TOKEN_LISTVIEWHEADERSTYLE:
token = theme_parse_int (settings, scanner, &murrine_style->listviewheaderstyle);
@@ -597,8 +597,8 @@
dest_w->gradients = src_w->gradients;
if (flags & MRN_FLAG_HIGHLIGHT_RATIO)
dest_w->highlight_ratio = src_w->highlight_ratio;
- if (flags & MRN_FLAG_INNERBORDER_RATIO)
- dest_w->innerborder_ratio = src_w->innerborder_ratio;
+ if (flags & MRN_FLAG_LIGHTBORDER_RATIO)
+ dest_w->lightborder_ratio = src_w->lightborder_ratio;
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 11:03:17 2008
@@ -44,7 +44,7 @@
MRN_FLAG_GRADIENT_STOP_4 = 1 << 7,
MRN_FLAG_GRADIENTS = 1 << 8,
MRN_FLAG_HIGHLIGHT_RATIO = 1 << 9,
- MRN_FLAG_INNERBORDER_RATIO = 1 << 10,
+ MRN_FLAG_LIGHTBORDER_RATIO = 1 << 10,
MRN_FLAG_LISTVIEWHEADERSTYLE = 1 << 11,
MRN_FLAG_LISTVIEWSTYLE = 1 << 12,
MRN_FLAG_MENUBARITEMSTYLE = 1 << 13,
@@ -73,7 +73,7 @@
double gradient_stop_3;
double gradient_stop_4;
double highlight_ratio;
- double innerborder_ratio;
+ double lightborder_ratio;
guint8 glazestyle;
guint8 listviewheaderstyle;
Modified: trunk/src/murrine_style.c
==============================================================================
--- trunk/src/murrine_style.c (original)
+++ trunk/src/murrine_style.c Wed Feb 27 11:03:17 2008
@@ -132,7 +132,7 @@
params->xthickness = style->xthickness;
params->ythickness = style->ythickness;
- params->innerborder_ratio = murrine_style->innerborder_ratio;
+ params->lightborder_ratio = murrine_style->lightborder_ratio;
params->glazestyle = murrine_style->glazestyle;
params->roundness = murrine_style->roundness;
params->highlight_ratio = murrine_style->highlight_ratio;
@@ -1611,7 +1611,7 @@
murrine_style->gradient_stop_4 = MURRINE_RC_STYLE (rc_style)->gradient_stop_4;
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->innerborder_ratio = MURRINE_RC_STYLE (rc_style)->innerborder_ratio;
+ murrine_style->lightborder_ratio = MURRINE_RC_STYLE (rc_style)->lightborder_ratio;
murrine_style->glazestyle = MURRINE_RC_STYLE (rc_style)->glazestyle;
if (murrine_style->has_gradient_stop &&
@@ -1672,7 +1672,7 @@
break;
case (MRN_STYLE_CANDIDO):
murrine_style->highlight_ratio = 1.0;
- murrine_style->innerborder_ratio = 1.06;
+ murrine_style->lightborder_ratio = 1.06;
murrine_style->gradients = TRUE;
murrine_style->gradient_stop_1 = 1.01;
murrine_style->gradient_stop_2 = 0.99;
@@ -1688,7 +1688,7 @@
murrine_style->gradients = TRUE;
murrine_style->highlight_ratio = 1.0;
murrine_style->toolbarstyle = 1;
- murrine_style->innerborder_ratio = 1.02;
+ murrine_style->lightborder_ratio = 1.02;
murrine_style->menustyle = 0;
murrine_style->sliderstyle = 1;
murrine_style->scrollbarstyle = 2;
@@ -1867,7 +1867,7 @@
mrn_style->has_gradient_stop = mrn_src->has_gradient_stop;
mrn_style->has_scrollbar_color = mrn_src->has_scrollbar_color;
mrn_style->highlight_ratio = mrn_src->highlight_ratio;
- mrn_style->innerborder_ratio = mrn_src->innerborder_ratio;
+ mrn_style->lightborder_ratio = mrn_src->lightborder_ratio;
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 11:03:17 2008
@@ -52,7 +52,7 @@
double gradient_stop_3;
double gradient_stop_4;
double highlight_ratio;
- double innerborder_ratio;
+ double lightborder_ratio;
guint8 glazestyle;
guint8 listviewheaderstyle;
Modified: trunk/src/murrine_types.h
==============================================================================
--- trunk/src/murrine_types.h (original)
+++ trunk/src/murrine_types.h Wed Feb 27 11:03:17 2008
@@ -203,7 +203,7 @@
int glazestyle;
int roundness;
double highlight_ratio;
- double innerborder_ratio;
+ double lightborder_ratio;
MurrineGradients mrn_gradient;
MurrineDrawStyles drawstyle;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
