murrine r107 - in trunk: . schema src
- From: acimitan svn gnome org
- To: svn-commits-list gnome org
- Subject: murrine r107 - in trunk: . schema src
- Date: Mon, 29 Dec 2008 23:17:32 +0000 (UTC)
Author: acimitan
Date: Mon Dec 29 23:17:32 2008
New Revision: 107
URL: http://svn.gnome.org/viewvc/murrine?rev=107&view=rev
Log:
2008-12-30 Andrea Cimitan <andrea cimitan gmail com>
* schema/murrine.xml.in.in:
* src/cairo-support.c (murrine_draw_glaze), (get_decreased_shade),
(get_increased_shade), (get_decreased_gradient_shades):
* src/cairo-support.h:
* src/murrine_draw.c (murrine_draw_button),
(murrine_draw_progressbar_fill), (murrine_draw_menubar),
(murrine_draw_toolbar), (murrine_draw_tab),
(murrine_draw_list_view_header), (murrine_draw_menuitem),
(murrine_draw_scrollbar_stepper), (murrine_draw_scrollbar_slider),
(murrine_draw_radiobutton), (murrine_draw_checkbox):
* src/murrine_draw_rgba.c (murrine_rgba_draw_button),
(murrine_rgba_draw_progressbar_fill), (murrine_rgba_draw_menubar),
(murrine_rgba_draw_toolbar), (murrine_rgba_draw_tab),
(murrine_rgba_draw_scrollbar_stepper),
(murrine_rgba_draw_scrollbar_slider),
(murrine_rgba_draw_radiobutton), (murrine_rgba_draw_checkbox):
* src/murrine_rc_style.c (murrine_rc_style_init),
(theme_parse_shade), (murrine_rc_style_parse),
(murrine_rc_style_merge):
* src/murrine_rc_style.h:
* src/murrine_style.c (murrine_set_widget_parameters),
(murrine_style_draw_layout), (murrine_style_init_from_rc),
(murrine_style_copy):
* src/murrine_style.h:
* src/murrine_types.h:
Don't kill me, it is correct:
highlight_ratio renamed to highlight_shade,
lightborder_ratio renamed to lightborder_shade,
glow_ratio renamed to glow_shade.
Modified:
trunk/ChangeLog
trunk/schema/murrine.xml.in.in
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/schema/murrine.xml.in.in
==============================================================================
--- trunk/schema/murrine.xml.in.in (original)
+++ trunk/schema/murrine.xml.in.in Mon Dec 29 23:17:32 2008
@@ -51,9 +51,9 @@
</enumeration>
</option>
- <option type="real" name="glow_ratio" default="1.0">
- <_long_name>Glow Ratio</_long_name>
- <_description>Enable and set the Glow Ratio</_description>
+ <option type="real" name="glow_shade" default="1.0">
+ <_long_name>Glow Shade</_long_name>
+ <_description>Enable and set the Glow Shade</_description>
<section>General</section>
<minimum>0</minimum>
<maximum>2</maximum>
@@ -119,18 +119,18 @@
<section>Gradients</section>
</option>
- <option type="real" name="highlight_ratio" default="1.1">
- <_long_name>Highlight Ratio</_long_name>
- <_description>Increse/Decrease the highlight ratio</_description>
+ <option type="real" name="highlight_shade" default="1.1">
+ <_long_name>Highlight Shade</_long_name>
+ <_description>Increse/Decrease the highlight shade</_description>
<section>General</section>
<minimum>0</minimum>
<maximum>2</maximum>
<precision>0.01</precision>
</option>
- <option type="real" name="lightborder_ratio" default="1.1">
- <_long_name>Lightborder Ratio</_long_name>
- <_description>Increse/Decrease the lightborder ratio</_description>
+ <option type="real" name="lightborder_shade" default="1.1">
+ <_long_name>Lightborder Shade</_long_name>
+ <_description>Increse/Decrease the lightborder shade</_description>
<section>General</section>
<minimum>0</minimum>
<maximum>2</maximum>
Modified: trunk/src/cairo-support.c
==============================================================================
--- trunk/src/cairo-support.c (original)
+++ trunk/src/cairo-support.c Mon Dec 29 23:17:32 2008
@@ -668,16 +668,16 @@
void
murrine_draw_glaze (cairo_t *cr,
const MurrineRGB *fill,
- double glow_ratio,
- double highlight_ratio,
- double lightborder_ratio,
+ double glow_shade,
+ double highlight_shade,
+ double lightborder_shade,
MurrineGradients mrn_gradient,
const WidgetParameters *widget,
int x, int y, int width, int height,
int radius, uint8 corners, boolean horizontal)
{
MurrineRGB highlight;
- murrine_shade (fill, highlight_ratio, &highlight);
+ murrine_shade (fill, highlight_shade, &highlight);
murrine_set_gradient (cr, fill, mrn_gradient, x, y, 0, height, mrn_gradient.gradients, FALSE);
cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
@@ -711,17 +711,17 @@
if (widget->glazestyle == 4)
{
MurrineRGB shadow;
- murrine_shade (fill, 1.0/highlight_ratio, &shadow);
+ murrine_shade (fill, 1.0/highlight_shade, &shadow);
murrine_draw_curved_highlight_bottom (cr, x, y, width, height);
murrine_set_gradient (cr, &shadow, mrn_gradient, x, y, 0, height, mrn_gradient.gradients, TRUE);
cairo_fill (cr);
}
- if (glow_ratio != 1.0)
+ if (glow_shade != 1.0)
{
MurrineRGB glow;
- murrine_shade (fill, glow_ratio, &glow);
+ murrine_shade (fill, glow_shade, &glow);
if (mrn_gradient.use_rgba)
cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
@@ -748,9 +748,9 @@
}
}
- if (widget->glazestyle != 4 && lightborder_ratio != 1.0)
+ if (widget->glazestyle != 4 && lightborder_shade != 1.0)
{
- murrine_shade (fill, lightborder_ratio*highlight_ratio, &highlight);
+ murrine_shade (fill, lightborder_shade*highlight_shade, &highlight);
if (mrn_gradient.use_rgba)
cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
@@ -853,7 +853,7 @@
}
double
-get_decreased_ratio (double old, double factor)
+get_decreased_shade (double old, double factor)
{
if (old > 1.0)
return ((old-1.0)/factor+1.0);
@@ -864,7 +864,7 @@
}
double
-get_increased_ratio (double old, double factor)
+get_increased_shade (double old, double factor)
{
if (old > 1.0)
return ((old-1.0)*factor+1.0);
@@ -901,10 +901,10 @@
{
MurrineGradients mrn_gradient_custom = mrn_gradient;
- mrn_gradient_custom.gradient_shades[0] = get_decreased_ratio (mrn_gradient.gradient_shades[0], factor);
- mrn_gradient_custom.gradient_shades[1] = get_decreased_ratio (mrn_gradient.gradient_shades[1], factor);
- mrn_gradient_custom.gradient_shades[2] = get_decreased_ratio (mrn_gradient.gradient_shades[2], factor);
- mrn_gradient_custom.gradient_shades[3] = get_decreased_ratio (mrn_gradient.gradient_shades[3], factor);
+ mrn_gradient_custom.gradient_shades[0] = get_decreased_shade (mrn_gradient.gradient_shades[0], factor);
+ mrn_gradient_custom.gradient_shades[1] = get_decreased_shade (mrn_gradient.gradient_shades[1], factor);
+ mrn_gradient_custom.gradient_shades[2] = get_decreased_shade (mrn_gradient.gradient_shades[2], factor);
+ mrn_gradient_custom.gradient_shades[3] = get_decreased_shade (mrn_gradient.gradient_shades[3], factor);
return mrn_gradient_custom;
}
Modified: trunk/src/cairo-support.h
==============================================================================
--- trunk/src/cairo-support.h (original)
+++ trunk/src/cairo-support.h Mon Dec 29 23:17:32 2008
@@ -51,9 +51,9 @@
double radius, double x, double y,
boolean mirror_horizontally, boolean mirror_vertically);
-G_GNUC_INTERNAL double get_decreased_ratio (double old, double factor);
+G_GNUC_INTERNAL double get_decreased_shade (double old, double factor);
-G_GNUC_INTERNAL double get_increased_ratio (double old, double factor);
+G_GNUC_INTERNAL double get_increased_shade (double old, double factor);
G_GNUC_INTERNAL double get_contrast (double old, double factor);
@@ -93,9 +93,9 @@
G_GNUC_INTERNAL void murrine_draw_glaze (cairo_t *cr,
const MurrineRGB *fill,
- double glow_ratio,
- double highlight_ratio,
- double lightborder_ratio,
+ double glow_shade,
+ double highlight_shade,
+ double lightborder_shade,
MurrineGradients mrn_gradient,
const WidgetParameters *widget,
int x, int y, int width, int height,
Modified: trunk/src/murrine_draw.c
==============================================================================
--- trunk/src/murrine_draw.c (original)
+++ trunk/src/murrine_draw.c Mon Dec 29 23:17:32 2008
@@ -149,7 +149,7 @@
{
double xos = widget->xthickness > 2 ? 1 : 0;
double yos = widget->ythickness > 2 ? 1 : 0;
- double highlight_ratio_custom = widget->highlight_ratio;
+ double highlight_shade_custom = widget->highlight_shade;
MurrineRGB fill = colors->bg[widget->state_type];
MurrineRGB border = colors->shade[!widget->disabled ? 6 : 5];
MurrineGradients mrn_gradient_custom = widget->mrn_gradient;
@@ -157,7 +157,7 @@
if (widget->disabled)
{
mrn_gradient_custom = get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
- highlight_ratio_custom = get_decreased_ratio (widget->highlight_ratio, 2.0);
+ highlight_shade_custom = get_decreased_shade (widget->highlight_shade, 2.0);
}
else
murrine_shade (&colors->shade[6], 0.95, &border);
@@ -195,7 +195,7 @@
cairo_clip_preserve (cr);
murrine_draw_glaze (cr, &fill,
- widget->glow_ratio, highlight_ratio_custom, !widget->active ? widget->lightborder_ratio : 1.0,
+ widget->glow_shade, highlight_shade_custom, !widget->active ? widget->lightborder_shade : 1.0,
mrn_gradient_custom, widget,
xos+1, yos+1, width-(xos*2)-2, height-(yos*2)-2,
widget->roundness, widget->corners, horizontal);
@@ -520,7 +520,7 @@
cairo_rectangle (cr, 2, 1, width-4, height-2);
murrine_draw_glaze (cr, fill,
- widget->glow_ratio, widget->highlight_ratio, widget->lightborder_ratio,
+ widget->glow_shade, widget->highlight_shade, widget->lightborder_shade,
widget->mrn_gradient, widget, 2, 1, width-4, height-2,
widget->roundness, widget->corners, TRUE);
@@ -607,7 +607,7 @@
{
int os = (widget->glazestyle == 2) ? 1 : 0;
murrine_draw_glaze (cr, fill,
- widget->glow_ratio, widget->highlight_ratio, widget->glazestyle == 2 ? widget->lightborder_ratio : 1.0,
+ widget->glow_shade, widget->highlight_shade, widget->glazestyle == 2 ? widget->lightborder_shade : 1.0,
widget->mrn_gradient, widget, os, os, width-os*2, height-os*2,
widget->roundness, widget->corners, TRUE);
break;
@@ -704,7 +704,7 @@
{
int os = (widget->glazestyle == 2) ? 1 : 0;
murrine_draw_glaze (cr, fill,
- widget->glow_ratio, widget->highlight_ratio, widget->glazestyle == 2 ? widget->lightborder_ratio : 1.0,
+ widget->glow_shade, widget->highlight_shade, widget->glazestyle == 2 ? widget->lightborder_shade : 1.0,
widget->mrn_gradient, widget, os, os, width-os*2, height-os*2,
widget->roundness, widget->corners, TRUE);
break;
@@ -915,10 +915,10 @@
{
MurrineRGB shade1, shade2, shade3, shade4, highlight;
MurrineGradients mrn_gradient_custom = get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
- double highlight_ratio_custom = get_decreased_ratio (widget->highlight_ratio, 2.0);
+ double highlight_shade_custom = get_decreased_shade (widget->highlight_shade, 2.0);
- murrine_shade (fill, mrn_gradient_custom.gradient_shades[0]*highlight_ratio_custom, &shade1);
- murrine_shade (fill, mrn_gradient_custom.gradient_shades[1]*highlight_ratio_custom, &shade2);
+ murrine_shade (fill, mrn_gradient_custom.gradient_shades[0]*highlight_shade_custom, &shade1);
+ murrine_shade (fill, mrn_gradient_custom.gradient_shades[1]*highlight_shade_custom, &shade2);
murrine_shade (fill, mrn_gradient_custom.gradient_shades[2], &shade3);
murrine_shade (fill, mrn_gradient_custom.gradient_shades[3], &shade4);
@@ -949,9 +949,9 @@
cairo_pattern_destroy (pat);
/* Draw lightborder */
- murrine_shade (fill, widget->lightborder_ratio*highlight_ratio_custom, &highlight);
- murrine_shade (&highlight, mrn_gradient_custom.gradient_shades[0]*highlight_ratio_custom, &shade1);
- murrine_shade (&highlight, mrn_gradient_custom.gradient_shades[1]*highlight_ratio_custom, &shade2);
+ murrine_shade (fill, widget->lightborder_shade*highlight_shade_custom, &highlight);
+ murrine_shade (&highlight, mrn_gradient_custom.gradient_shades[0]*highlight_shade_custom, &shade1);
+ murrine_shade (&highlight, mrn_gradient_custom.gradient_shades[1]*highlight_shade_custom, &shade2);
murrine_shade (&highlight, mrn_gradient_custom.gradient_shades[2], &shade3);
murrine_shade (&highlight, mrn_gradient_custom.gradient_shades[3], &shade4);
@@ -985,10 +985,10 @@
{
MurrineRGB shade1, shade2, shade3, shade4, highlight;
MurrineGradients mrn_gradient_custom = get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
- double highlight_ratio_custom = get_decreased_ratio (widget->highlight_ratio, 2.0);
+ double highlight_shade_custom = get_decreased_shade (widget->highlight_shade, 2.0);
- murrine_shade (fill, mrn_gradient_custom.gradient_shades[0]*highlight_ratio_custom, &shade1);
- murrine_shade (fill, mrn_gradient_custom.gradient_shades[1]*highlight_ratio_custom, &shade2);
+ murrine_shade (fill, mrn_gradient_custom.gradient_shades[0]*highlight_shade_custom, &shade1);
+ murrine_shade (fill, mrn_gradient_custom.gradient_shades[1]*highlight_shade_custom, &shade2);
murrine_shade (fill, mrn_gradient_custom.gradient_shades[2], &shade3);
murrine_shade (fill, 1.0, &shade4);
@@ -1020,9 +1020,9 @@
cairo_pattern_destroy (pat);
/* Draw lightborder */
- murrine_shade (fill, widget->lightborder_ratio*highlight_ratio_custom, &highlight);
- murrine_shade (&highlight, mrn_gradient_custom.gradient_shades[0]*highlight_ratio_custom, &shade1);
- murrine_shade (&highlight, mrn_gradient_custom.gradient_shades[1]*highlight_ratio_custom, &shade2);
+ murrine_shade (fill, widget->lightborder_shade*highlight_shade_custom, &highlight);
+ murrine_shade (&highlight, mrn_gradient_custom.gradient_shades[0]*highlight_shade_custom, &shade1);
+ murrine_shade (&highlight, mrn_gradient_custom.gradient_shades[1]*highlight_shade_custom, &shade2);
murrine_shade (&highlight, mrn_gradient_custom.gradient_shades[2], &shade3);
murrine_shade (fill, 1.04, &shade4); /* this value should change as draw_frame */
@@ -1147,7 +1147,7 @@
cairo_rectangle (cr, 0, 0, width, height);
murrine_draw_glaze (cr, fill,
- widget->glow_ratio, widget->highlight_ratio, widget->glazestyle == 2 ? widget->lightborder_ratio : 1.0,
+ widget->glow_shade, widget->highlight_shade, widget->glazestyle == 2 ? widget->lightborder_shade : 1.0,
widget->mrn_gradient, widget, 0, 0, width, height-1,
widget->roundness, widget->corners, TRUE);
break;
@@ -1224,7 +1224,7 @@
cairo_clip_preserve (cr);
murrine_draw_glaze (cr, &colors->spot[1],
- widget->glow_ratio, widget->highlight_ratio, widget->lightborder_ratio,
+ widget->glow_shade, widget->highlight_shade, widget->lightborder_shade,
widget->mrn_gradient, widget, 1, 1, width-2, height-2,
widget->roundness, widget->corners, TRUE);
break;
@@ -1334,7 +1334,7 @@
cairo_clip_preserve(cr);
murrine_draw_glaze (cr, fill,
- widget->glow_ratio, widget->highlight_ratio, widget->lightborder_ratio,
+ widget->glow_shade, widget->highlight_shade, widget->lightborder_shade,
widget->mrn_gradient, widget, 1, 1, width-2, height-2,
widget->roundness, widget->corners, TRUE);
@@ -1401,7 +1401,7 @@
murrine_rounded_rectangle_closed (cr, 1, 1, width-2, height-2, widget->roundness, widget->corners);
murrine_draw_glaze (cr, &fill,
- widget->glow_ratio, widget->highlight_ratio, widget->lightborder_ratio,
+ widget->glow_shade, widget->highlight_shade, widget->lightborder_shade,
widget->mrn_gradient, widget, 1, 1, width-2, height-2,
widget->roundness, widget->corners, TRUE);
@@ -1816,7 +1816,7 @@
if (widget->glazestyle != 2)
{
MurrineRGB highlight;
- murrine_shade (bg, widget->highlight_ratio, &highlight);
+ murrine_shade (bg, widget->highlight_shade, &highlight);
murrine_set_gradient (cr, &highlight, widget->mrn_gradient, 0, 0, 0, 14, widget->mrn_gradient.gradients, FALSE);
}
else
@@ -1840,7 +1840,7 @@
if (widget->glazestyle == 2)
{
MurrineRGB highlight;
- murrine_shade (bg, widget->highlight_ratio, &highlight);
+ murrine_shade (bg, widget->highlight_shade, &highlight);
murrine_set_gradient (cr, &highlight, widget->mrn_gradient, 0, 0, 0, 14, widget->mrn_gradient.gradients, FALSE);
}
else
@@ -1864,7 +1864,6 @@
}
else
{
-
murrine_set_color_rgba (cr, dot, trans);
cairo_arc (cr, 7, 7, 3, 0, G_PI*2);
cairo_fill (cr);
@@ -1936,7 +1935,7 @@
if (widget->glazestyle == 2)
{
MurrineRGB highlight;
- murrine_shade (bg, widget->highlight_ratio, &highlight);
+ murrine_shade (bg, widget->highlight_shade, &highlight);
murrine_set_gradient (cr, &highlight, widget->mrn_gradient, 0, 0, 0, 14, widget->mrn_gradient.gradients, FALSE);
}
else
@@ -1954,7 +1953,7 @@
bg = &colors->spot[1];
MurrineRGB highlight;
- murrine_shade (bg, widget->highlight_ratio, &highlight);
+ murrine_shade (bg, widget->highlight_shade, &highlight);
if (widget->xthickness > 2 && widget->ythickness > 2)
cairo_rectangle (cr, 2, 2, width-4, (height-4)/2);
else
@@ -1963,7 +1962,7 @@
if (widget->glazestyle != 2)
{
MurrineRGB highlight;
- murrine_shade (bg, widget->highlight_ratio, &highlight);
+ murrine_shade (bg, widget->highlight_shade, &highlight);
murrine_set_gradient (cr, &highlight, widget->mrn_gradient, 0, 0, 0, 14, widget->mrn_gradient.gradients, FALSE);
}
else
Modified: trunk/src/murrine_draw_rgba.c
==============================================================================
--- trunk/src/murrine_draw_rgba.c (original)
+++ trunk/src/murrine_draw_rgba.c Mon Dec 29 23:17:32 2008
@@ -147,7 +147,7 @@
{
double xos = widget->xthickness > 2 ? 1 : 0;
double yos = widget->ythickness > 2 ? 1 : 0;
- double highlight_ratio_custom = widget->highlight_ratio;
+ double highlight_shade_custom = widget->highlight_shade;
MurrineRGB fill = colors->bg[widget->state_type];
MurrineRGB border = colors->shade[!widget->disabled ? 8 : 6];
MurrineGradients mrn_gradient_custom = widget->mrn_gradient;
@@ -155,7 +155,7 @@
if (widget->disabled)
{
mrn_gradient_custom = get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
- highlight_ratio_custom = get_decreased_ratio (widget->highlight_ratio, 2.0);
+ highlight_shade_custom = get_decreased_shade (widget->highlight_shade, 2.0);
}
else
murrine_shade (&colors->shade[8], 0.95, &border);
@@ -196,7 +196,7 @@
cairo_clip_preserve (cr);
murrine_draw_glaze (cr, &fill,
- widget->glow_ratio, highlight_ratio_custom, !widget->active ? widget->lightborder_ratio : 1.0,
+ widget->glow_shade, highlight_shade_custom, !widget->active ? widget->lightborder_shade : 1.0,
mrn_gradient_custom, widget, xos+1, yos+1, width-(xos*2)-2, height-(yos*2)-2,
widget->roundness, widget->corners, horizontal);
@@ -476,7 +476,7 @@
cairo_rectangle (cr, 2, 1, width-4, height-2);
murrine_draw_glaze (cr, fill,
- widget->glow_ratio, widget->highlight_ratio, widget->lightborder_ratio,
+ widget->glow_shade, widget->highlight_shade, widget->lightborder_shade,
widget->mrn_gradient, widget, 2, 1, width-4, height-2,
widget->roundness, widget->corners, TRUE);
@@ -553,7 +553,7 @@
/* XXX: should use another gradient rgba_opacity */
int os = (widget->glazestyle == 2) ? 1 : 0;
murrine_draw_glaze (cr, fill,
- widget->glow_ratio, widget->highlight_ratio, widget->glazestyle == 2 ? widget->lightborder_ratio : 1.0,
+ widget->glow_shade, widget->highlight_shade, widget->glazestyle == 2 ? widget->lightborder_shade : 1.0,
widget->mrn_gradient, widget, os, os, width-os*2, height-os*2,
widget->roundness, widget->corners, TRUE);
break;
@@ -655,7 +655,7 @@
{
int os = (widget->glazestyle == 2) ? 1 : 0;
murrine_draw_glaze (cr, fill,
- widget->glow_ratio, widget->highlight_ratio, widget->glazestyle == 2 ? widget->lightborder_ratio : 1.0,
+ widget->glow_shade, widget->highlight_shade, widget->glazestyle == 2 ? widget->lightborder_shade : 1.0,
widget->mrn_gradient, widget, os, os, width-os*2, height-os*2,
widget->roundness, widget->corners, TRUE);
@@ -916,10 +916,10 @@
{
MurrineRGB shade1, shade2, shade3, shade4, highlight;
MurrineGradients mrn_gradient_custom = mrn_gradient_custom = get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
- double highlight_ratio_custom = get_decreased_ratio (widget->highlight_ratio, 2.0);
+ double highlight_shade_custom = get_decreased_shade (widget->highlight_shade, 2.0);
- murrine_shade (fill, mrn_gradient_custom.gradient_shades[0]*highlight_ratio_custom, &shade1);
- murrine_shade (fill, mrn_gradient_custom.gradient_shades[1]*highlight_ratio_custom, &shade2);
+ murrine_shade (fill, mrn_gradient_custom.gradient_shades[0]*highlight_shade_custom, &shade1);
+ murrine_shade (fill, mrn_gradient_custom.gradient_shades[1]*highlight_shade_custom, &shade2);
murrine_shade (fill, mrn_gradient_custom.gradient_shades[2], &shade3);
murrine_shade (fill, mrn_gradient_custom.gradient_shades[3], &shade4);
@@ -952,9 +952,9 @@
/* Draw lightborder */
cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
- murrine_shade (fill, widget->lightborder_ratio*highlight_ratio_custom, &highlight);
- murrine_shade (&highlight, mrn_gradient_custom.gradient_shades[0]*highlight_ratio_custom, &shade1);
- murrine_shade (&highlight, mrn_gradient_custom.gradient_shades[1]*highlight_ratio_custom, &shade2);
+ murrine_shade (fill, widget->lightborder_shade*highlight_shade_custom, &highlight);
+ murrine_shade (&highlight, mrn_gradient_custom.gradient_shades[0]*highlight_shade_custom, &shade1);
+ murrine_shade (&highlight, mrn_gradient_custom.gradient_shades[1]*highlight_shade_custom, &shade2);
murrine_shade (&highlight, mrn_gradient_custom.gradient_shades[2], &shade3);
murrine_shade (&highlight, mrn_gradient_custom.gradient_shades[3], &shade4);
@@ -988,10 +988,10 @@
{
MurrineRGB shade1, shade2, shade3, shade4, highlight;
MurrineGradients mrn_gradient_custom = mrn_gradient_custom = get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
- double highlight_ratio_custom = get_decreased_ratio (widget->highlight_ratio, 2.0);
+ double highlight_shade_custom = get_decreased_shade (widget->highlight_shade, 2.0);
- murrine_shade (fill, mrn_gradient_custom.gradient_shades[0]*highlight_ratio_custom, &shade1);
- murrine_shade (fill, mrn_gradient_custom.gradient_shades[1]*highlight_ratio_custom, &shade2);
+ murrine_shade (fill, mrn_gradient_custom.gradient_shades[0]*highlight_shade_custom, &shade1);
+ murrine_shade (fill, mrn_gradient_custom.gradient_shades[1]*highlight_shade_custom, &shade2);
murrine_shade (fill, mrn_gradient_custom.gradient_shades[2], &shade3);
murrine_shade (fill, 1.0, &shade4); /* this value should change as draw_frame */
@@ -1025,9 +1025,9 @@
/* Draw lightborder */
cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
- murrine_shade (fill, widget->lightborder_ratio*highlight_ratio_custom, &highlight);
- murrine_shade (&highlight, mrn_gradient_custom.gradient_shades[0]*highlight_ratio_custom, &shade1);
- murrine_shade (&highlight, mrn_gradient_custom.gradient_shades[1]*highlight_ratio_custom, &shade2);
+ murrine_shade (fill, widget->lightborder_shade*highlight_shade_custom, &highlight);
+ murrine_shade (&highlight, mrn_gradient_custom.gradient_shades[0]*highlight_shade_custom, &shade1);
+ murrine_shade (&highlight, mrn_gradient_custom.gradient_shades[1]*highlight_shade_custom, &shade2);
murrine_shade (&highlight, mrn_gradient_custom.gradient_shades[2], &shade3);
murrine_shade (fill, 1.15, &shade4); /* this value should change as draw_frame */
@@ -1128,7 +1128,7 @@
cairo_clip_preserve(cr);
murrine_draw_glaze (cr, fill,
- widget->glow_ratio, widget->highlight_ratio, widget->lightborder_ratio,
+ widget->glow_shade, widget->highlight_shade, widget->lightborder_shade,
widget->mrn_gradient, widget, 1, 1, width-2, height-2,
widget->roundness, widget->corners, TRUE);
@@ -1197,7 +1197,7 @@
murrine_rounded_rectangle_closed (cr, 1, 1, width-2, height-2, widget->roundness, widget->corners);
murrine_draw_glaze (cr, &fill,
- widget->glow_ratio, widget->highlight_ratio, widget->lightborder_ratio,
+ widget->glow_shade, widget->highlight_shade, widget->lightborder_shade,
widget->mrn_gradient, widget, 1, 1, width-2, height-2,
widget->roundness, widget->corners, TRUE);
@@ -1420,7 +1420,7 @@
if (widget->glazestyle != 2)
{
MurrineRGB highlight;
- murrine_shade (bg, widget->highlight_ratio, &highlight);
+ murrine_shade (bg, widget->highlight_shade, &highlight);
murrine_set_gradient (cr, &highlight, widget->mrn_gradient, 0, 0, 0, 14, widget->mrn_gradient.gradients, FALSE);
}
else
@@ -1444,7 +1444,7 @@
if (widget->glazestyle == 2)
{
MurrineRGB highlight;
- murrine_shade (bg, widget->highlight_ratio, &highlight);
+ murrine_shade (bg, widget->highlight_shade, &highlight);
murrine_set_gradient (cr, &highlight, widget->mrn_gradient, 0, 0, 0, 14, widget->mrn_gradient.gradients, FALSE);
}
else
@@ -1538,7 +1538,7 @@
if (widget->glazestyle == 2)
{
MurrineRGB highlight;
- murrine_shade (bg, widget->highlight_ratio, &highlight);
+ murrine_shade (bg, widget->highlight_shade, &highlight);
murrine_set_gradient (cr, &highlight, widget->mrn_gradient, 0, 0, 0, 14, widget->mrn_gradient.gradients, FALSE);
}
else
@@ -1556,7 +1556,7 @@
bg = &colors->spot[1];
MurrineRGB highlight;
- murrine_shade (bg, widget->highlight_ratio, &highlight);
+ murrine_shade (bg, widget->highlight_shade, &highlight);
if (widget->xthickness > 2 && widget->ythickness > 2)
cairo_rectangle (cr, 2, 2, width-4, (height-4)/2);
else
@@ -1565,7 +1565,7 @@
if (widget->glazestyle != 2)
{
MurrineRGB highlight;
- murrine_shade (bg, widget->highlight_ratio, &highlight);
+ murrine_shade (bg, widget->highlight_shade, &highlight);
murrine_set_gradient (cr, &highlight, widget->mrn_gradient, 0, 0, 0, 14, widget->mrn_gradient.gradients, FALSE);
}
else
Modified: trunk/src/murrine_rc_style.c
==============================================================================
--- trunk/src/murrine_rc_style.c (original)
+++ trunk/src/murrine_rc_style.c Mon Dec 29 23:17:32 2008
@@ -39,12 +39,12 @@
TOKEN_COLORIZE_SCROLLBAR,
TOKEN_CONTRAST,
TOKEN_GLAZESTYLE,
- TOKEN_GLOW_RATIO,
+ TOKEN_GLOW_SHADE,
TOKEN_GLOWSTYLE,
TOKEN_GRADIENT_SHADES,
TOKEN_GRADIENTS,
- TOKEN_HIGHLIGHT_RATIO,
- TOKEN_LIGHTBORDER_RATIO,
+ TOKEN_HIGHLIGHT_SHADE,
+ TOKEN_LIGHTBORDER_SHADE,
TOKEN_LIGHTBORDERSTYLE,
TOKEN_LISTVIEWHEADERSTYLE,
TOKEN_LISTVIEWSTYLE,
@@ -74,7 +74,10 @@
/* stuff to ignore */
TOKEN_HILIGHT_RATIO,
- TOKEN_SQUAREDSTYLE
+ TOKEN_HIGHLIGHT_RATIO,
+ TOKEN_LIGHTBORDER_RATIO,
+ TOKEN_SQUAREDSTYLE,
+ TOKEN_STYLE
};
static struct
@@ -88,12 +91,12 @@
{ "colorize_scrollbar", TOKEN_COLORIZE_SCROLLBAR },
{ "contrast", TOKEN_CONTRAST },
{ "glazestyle", TOKEN_GLAZESTYLE },
- { "glow_ratio", TOKEN_GLOW_RATIO },
+ { "glow_shade", TOKEN_GLOW_SHADE },
{ "glowstyle", TOKEN_GLOWSTYLE },
{ "gradient_shades", TOKEN_GRADIENT_SHADES },
{ "gradients", TOKEN_GRADIENTS },
- { "highlight_ratio", TOKEN_HIGHLIGHT_RATIO },
- { "lightborder_ratio", TOKEN_LIGHTBORDER_RATIO },
+ { "highlight_shade", TOKEN_HIGHLIGHT_SHADE },
+ { "lightborder_shade", TOKEN_LIGHTBORDER_SHADE },
{ "lightborderstyle", TOKEN_LIGHTBORDERSTYLE },
{ "listviewheaderstyle", TOKEN_LISTVIEWHEADERSTYLE },
{ "listviewstyle", TOKEN_LISTVIEWSTYLE },
@@ -123,7 +126,10 @@
/* stuff to ignore */
{ "hilight_ratio", TOKEN_HILIGHT_RATIO },
- { "squaredstyle", TOKEN_SQUAREDSTYLE }
+ { "highlight_ratio", TOKEN_HIGHLIGHT_RATIO },
+ { "lightborder_ratio", TOKEN_LIGHTBORDER_RATIO },
+ { "squaredstyle", TOKEN_SQUAREDSTYLE },
+ { "style", TOKEN_STYLE }
};
G_DEFINE_DYNAMIC_TYPE (MurrineRcStyle, murrine_rc_style, GTK_TYPE_RC_STYLE)
@@ -143,7 +149,7 @@
murrine_rc->colorize_scrollbar = TRUE;
murrine_rc->contrast = 1.0;
murrine_rc->glazestyle = 1;
- murrine_rc->glow_ratio = 1.0;
+ murrine_rc->glow_shade = 1.0;
murrine_rc->glowstyle = 0;
murrine_rc->gradient_shades[0] = 1.1;
murrine_rc->gradient_shades[1] = 1.0;
@@ -151,8 +157,8 @@
murrine_rc->gradient_shades[3] = 1.1;
murrine_rc->gradients = TRUE;
murrine_rc->has_scrollbar_color = FALSE;
- murrine_rc->highlight_ratio = 1.1;
- murrine_rc->lightborder_ratio = 1.1;
+ murrine_rc->highlight_shade = 1.1;
+ murrine_rc->lightborder_shade = 1.1;
murrine_rc->lightborderstyle = 0;
murrine_rc->listviewheaderstyle = 1;
murrine_rc->listviewstyle = 0;
@@ -249,7 +255,7 @@
}
static guint
-theme_parse_ratio (GtkSettings *settings,
+theme_parse_shade (GtkSettings *settings,
GScanner *scanner,
double *ratio)
{
@@ -466,16 +472,16 @@
murrine_style->flags |= MRN_FLAG_COLORIZE_SCROLLBAR;
break;
case TOKEN_CONTRAST:
- token = theme_parse_ratio (settings, scanner, &murrine_style->contrast);
+ token = theme_parse_shade (settings, scanner, &murrine_style->contrast);
murrine_style->flags |= MRN_FLAG_CONTRAST;
break;
case TOKEN_GLAZESTYLE:
token = theme_parse_int (settings, scanner, &murrine_style->glazestyle);
murrine_style->flags |= MRN_FLAG_GLAZESTYLE;
break;
- case TOKEN_GLOW_RATIO:
- token = theme_parse_ratio (settings, scanner, &murrine_style->glow_ratio);
- murrine_style->flags |= MRN_FLAG_GLOW_RATIO;
+ case TOKEN_GLOW_SHADE:
+ token = theme_parse_shade (settings, scanner, &murrine_style->glow_shade);
+ murrine_style->flags |= MRN_FLAG_GLOW_SHADE;
break;
case TOKEN_GLOWSTYLE:
token = theme_parse_int (settings, scanner, &murrine_style->glowstyle);
@@ -489,13 +495,13 @@
token = theme_parse_boolean (settings, scanner, &murrine_style->gradients);
murrine_style->flags |= MRN_FLAG_GRADIENTS;
break;
- case TOKEN_HIGHLIGHT_RATIO:
- token = theme_parse_ratio (settings, scanner, &murrine_style->highlight_ratio);
- murrine_style->flags |= MRN_FLAG_HIGHLIGHT_RATIO;
- break;
- case TOKEN_LIGHTBORDER_RATIO:
- token = theme_parse_ratio (settings, scanner, &murrine_style->lightborder_ratio);
- murrine_style->flags |= MRN_FLAG_LIGHTBORDER_RATIO;
+ case TOKEN_HIGHLIGHT_SHADE:
+ token = theme_parse_shade (settings, scanner, &murrine_style->highlight_shade);
+ murrine_style->flags |= MRN_FLAG_HIGHLIGHT_SHADE;
+ break;
+ case TOKEN_LIGHTBORDER_SHADE:
+ token = theme_parse_shade (settings, scanner, &murrine_style->lightborder_shade);
+ murrine_style->flags |= MRN_FLAG_LIGHTBORDER_SHADE;
break;
case TOKEN_LIGHTBORDERSTYLE:
token = theme_parse_int (settings, scanner, &murrine_style->lightborderstyle);
@@ -571,13 +577,26 @@
case TOKEN_HILIGHT_RATIO:
g_scanner_warn (scanner, "Murrine configuration option \"hilight_ratio\" will be deprecated in future releases. Please update this theme to get rid of this warning.", "hilight_ratio");
double hilight_ratio;
- token = theme_parse_ratio (settings, scanner, &hilight_ratio);
- murrine_style->highlight_ratio = hilight_ratio/0.909090;
- murrine_style->flags |= MRN_FLAG_HIGHLIGHT_RATIO;
+ token = theme_parse_shade (settings, scanner, &hilight_ratio);
+ murrine_style->highlight_shade = hilight_ratio/0.909090;
+ murrine_style->flags |= MRN_FLAG_HIGHLIGHT_SHADE;
+ break;
+ case TOKEN_HIGHLIGHT_RATIO:
+ g_scanner_warn (scanner, "Murrine configuration option \"highlight_ratio\" will be deprecated in future releases. Please update this theme to get rid of this warning.", "highlight_ratio");
+ token = theme_parse_shade (settings, scanner, &murrine_style->highlight_shade);
+ murrine_style->flags |= MRN_FLAG_HIGHLIGHT_SHADE;
+ break;
+ case TOKEN_LIGHTBORDER_RATIO:
+ g_scanner_warn (scanner, "Murrine configuration option \"lightborder_ratio\" will be deprecated in future releases. Please update this theme to get rid of this warning.", "lightborder_ratio");
+ token = theme_parse_shade (settings, scanner, &murrine_style->lightborder_shade);
+ murrine_style->flags |= MRN_FLAG_LIGHTBORDER_SHADE;
break;
case TOKEN_SQUAREDSTYLE:
token = murrine_gtk2_rc_parse_dummy (settings, scanner, "squaredstyle");
break;
+ case TOKEN_STYLE:
+ token = murrine_gtk2_rc_parse_dummy (settings, scanner, "style");
+ break;
default:
g_scanner_get_next_token(scanner);
@@ -623,8 +642,8 @@
dest_w->contrast = src_w->contrast;
if (flags & MRN_FLAG_GLAZESTYLE)
dest_w->glazestyle = src_w->glazestyle;
- if (flags & MRN_FLAG_GLOW_RATIO)
- dest_w->glow_ratio = src_w->glow_ratio;
+ if (flags & MRN_FLAG_GLOW_SHADE)
+ dest_w->glow_shade = src_w->glow_shade;
if (flags & MRN_FLAG_GLOWSTYLE)
dest_w->glowstyle = src_w->glowstyle;
if (flags & MRN_FLAG_GRADIENT_SHADES)
@@ -636,10 +655,10 @@
}
if (flags & MRN_FLAG_GRADIENTS)
dest_w->gradients = src_w->gradients;
- if (flags & MRN_FLAG_HIGHLIGHT_RATIO)
- 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_HIGHLIGHT_SHADE)
+ dest_w->highlight_shade = src_w->highlight_shade;
+ if (flags & MRN_FLAG_LIGHTBORDER_SHADE)
+ dest_w->lightborder_shade = src_w->lightborder_shade;
if (flags & MRN_FLAG_LIGHTBORDERSTYLE)
dest_w->lightborderstyle = src_w->lightborderstyle;
if (flags & MRN_FLAG_LISTVIEWHEADERSTYLE)
Modified: trunk/src/murrine_rc_style.h
==============================================================================
--- trunk/src/murrine_rc_style.h (original)
+++ trunk/src/murrine_rc_style.h Mon Dec 29 23:17:32 2008
@@ -39,12 +39,12 @@
MRN_FLAG_COLORIZE_SCROLLBAR = 1 << 1,
MRN_FLAG_CONTRAST = 1 << 2,
MRN_FLAG_GLAZESTYLE = 1 << 3,
- MRN_FLAG_GLOW_RATIO = 1 << 4,
+ MRN_FLAG_GLOW_SHADE = 1 << 4,
MRN_FLAG_GLOWSTYLE = 1 << 5,
MRN_FLAG_GRADIENT_SHADES = 1 << 6,
MRN_FLAG_GRADIENTS = 1 << 7,
- MRN_FLAG_HIGHLIGHT_RATIO = 1 << 8,
- MRN_FLAG_LIGHTBORDER_RATIO = 1 << 9,
+ MRN_FLAG_HIGHLIGHT_SHADE = 1 << 8,
+ MRN_FLAG_LIGHTBORDER_SHADE = 1 << 9,
MRN_FLAG_LIGHTBORDERSTYLE= 1 << 10,
MRN_FLAG_LISTVIEWHEADERSTYLE = 1 << 11,
MRN_FLAG_LISTVIEWSTYLE = 1 << 12,
@@ -71,10 +71,10 @@
MurrineRcFlags flags;
double contrast;
- double glow_ratio;
+ double glow_shade;
double gradient_shades[4];
- double highlight_ratio;
- double lightborder_ratio;
+ double highlight_shade;
+ double lightborder_shade;
guint8 glazestyle;
guint8 glowstyle;
Modified: trunk/src/murrine_style.c
==============================================================================
--- trunk/src/murrine_style.c (original)
+++ trunk/src/murrine_style.c Mon Dec 29 23:17:32 2008
@@ -137,10 +137,10 @@
params->ythickness = style->ythickness;
params->glazestyle = murrine_style->glazestyle;
- params->glow_ratio = murrine_style->glow_ratio;
+ params->glow_shade = murrine_style->glow_shade;
params->glowstyle = murrine_style->glowstyle;
- params->highlight_ratio = murrine_style->highlight_ratio;
- params->lightborder_ratio = murrine_style->lightborder_ratio;
+ params->highlight_shade = murrine_style->highlight_shade;
+ params->lightborder_shade = murrine_style->lightborder_shade;
params->lightborderstyle = murrine_style->lightborderstyle;
params->reliefstyle = murrine_style->reliefstyle;
params->roundness = murrine_style->roundness;
@@ -1650,9 +1650,9 @@
MurrineRGB temp;
if (GTK_WIDGET_NO_WINDOW (widget))
- murrine_shade (¶ms.parentbg, 1.2, &temp);
+ murrine_shade (¶ms.parentbg, 1.12, &temp);
else
- murrine_shade (&colors->bg[widget->state], 1.2, &temp);
+ murrine_shade (&colors->bg[widget->state], 1.12, &temp);
etched.red = (int) (temp.r*65535);
etched.green = (int) (temp.g*65535);
@@ -1679,8 +1679,8 @@
GTK_STYLE_CLASS (murrine_style_parent_class)->init_from_rc (style, rc_style);
/* Shades/Colors/Ratio */
- murrine_style->glow_ratio = MURRINE_RC_STYLE (rc_style)->glow_ratio;
- murrine_style->highlight_ratio = MURRINE_RC_STYLE (rc_style)->highlight_ratio;
+ murrine_style->glow_shade = MURRINE_RC_STYLE (rc_style)->glow_shade;
+ murrine_style->highlight_shade = MURRINE_RC_STYLE (rc_style)->highlight_shade;
murrine_style->gradient_shades[0] = MURRINE_RC_STYLE (rc_style)->gradient_shades[0];
murrine_style->gradient_shades[1] = MURRINE_RC_STYLE (rc_style)->gradient_shades[1];
murrine_style->gradient_shades[2] = MURRINE_RC_STYLE (rc_style)->gradient_shades[2];
@@ -1693,8 +1693,8 @@
murrine_style->gradient_shades[1] = gradient_stop_mid;
murrine_style->gradient_shades[2] = gradient_stop_mid;
}
- /* Adjust lightborder_ratio reading contrast */
- murrine_style->lightborder_ratio = get_contrast(MURRINE_RC_STYLE (rc_style)->lightborder_ratio,
+ /* Adjust lightborder_shade reading contrast */
+ murrine_style->lightborder_shade = get_contrast(MURRINE_RC_STYLE (rc_style)->lightborder_shade,
MURRINE_RC_STYLE (rc_style)->contrast);
/* Widget styles */
@@ -1738,7 +1738,7 @@
switch (murrine_style->profile)
{
case (MRN_PROFILE_NODOKA):
- murrine_style->highlight_ratio = 1.0;
+ murrine_style->highlight_shade = 1.0;
murrine_style->gradients = TRUE;
murrine_style->gradient_shades[0] = 1.1;
murrine_style->gradient_shades[1] = 1.0;
@@ -1751,14 +1751,14 @@
murrine_style->has_scrollbar_color = FALSE;
break;
case (MRN_PROFILE_MIST):
- murrine_style->highlight_ratio = 1.0;
+ murrine_style->highlight_shade = 1.0;
murrine_style->glazestyle = 0;
murrine_style->gradients = FALSE;
murrine_style->gradient_shades[0] = 1.0;
murrine_style->gradient_shades[1] = 1.0;
murrine_style->gradient_shades[2] = 1.0;
murrine_style->gradient_shades[3] = 1.0;
- murrine_style->lightborder_ratio = 1.00;
+ murrine_style->lightborder_shade = 1.00;
murrine_style->sliderstyle = 1;
murrine_style->scrollbarstyle = 0;
murrine_style->stepperstyle = 0;
@@ -1768,8 +1768,8 @@
murrine_style->roundness = 0;
break;
case (MRN_PROFILE_CANDIDO):
- murrine_style->highlight_ratio = 1.0;
- murrine_style->lightborder_ratio = 1.06;
+ murrine_style->highlight_shade = 1.0;
+ murrine_style->lightborder_shade = 1.06;
murrine_style->glazestyle = 0;
murrine_style->gradients = TRUE;
murrine_style->gradient_shades[0] = 1.01;
@@ -1785,9 +1785,9 @@
murrine_style->gradient_shades[2] = 1.00;
murrine_style->gradient_shades[3] = 0.94;
murrine_style->gradients = TRUE;
- murrine_style->highlight_ratio = 1.0;
+ murrine_style->highlight_shade = 1.0;
murrine_style->toolbarstyle = 1;
- murrine_style->lightborder_ratio = 1.02;
+ murrine_style->lightborder_shade = 1.02;
murrine_style->listviewheaderstyle = 1;
murrine_style->menustyle = 0;
murrine_style->sliderstyle = 1;
@@ -1961,7 +1961,7 @@
mrn_style->colorize_scrollbar = mrn_src->colorize_scrollbar;
mrn_style->colors = mrn_src->colors;
mrn_style->glazestyle = mrn_src->glazestyle;
- mrn_style->glow_ratio = mrn_src->glow_ratio;
+ mrn_style->glow_shade = mrn_src->glow_shade;
mrn_style->glowstyle = mrn_src->glowstyle;
mrn_style->gradient_shades[0] = mrn_src->gradient_shades[0];
mrn_style->gradient_shades[1] = mrn_src->gradient_shades[1];
@@ -1969,8 +1969,8 @@
mrn_style->gradient_shades[3] = mrn_src->gradient_shades[3];
mrn_style->gradients = mrn_src->gradients;
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->highlight_shade = mrn_src->highlight_shade;
+ mrn_style->lightborder_shade = mrn_src->lightborder_shade;
mrn_style->lightborderstyle = mrn_src->lightborderstyle;
mrn_style->listviewheaderstyle = mrn_src->listviewheaderstyle;
mrn_style->listviewstyle = mrn_src->listviewstyle;
Modified: trunk/src/murrine_style.h
==============================================================================
--- trunk/src/murrine_style.h (original)
+++ trunk/src/murrine_style.h Mon Dec 29 23:17:32 2008
@@ -45,10 +45,10 @@
MurrineProfiles profile;
double contrast;
- double glow_ratio;
+ double glow_shade;
double gradient_shades[4];
- double highlight_ratio;
- double lightborder_ratio;
+ double highlight_shade;
+ double lightborder_shade;
guint8 glazestyle;
guint8 glowstyle;
Modified: trunk/src/murrine_types.h
==============================================================================
--- trunk/src/murrine_types.h (original)
+++ trunk/src/murrine_types.h Mon Dec 29 23:17:32 2008
@@ -201,9 +201,9 @@
int lightborderstyle;
int reliefstyle;
int roundness;
- double glow_ratio;
- double highlight_ratio;
- double lightborder_ratio;
+ double glow_shade;
+ double highlight_shade;
+ double lightborder_shade;
MurrineGradients mrn_gradient;
MurrineStyles style;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
