[murrine/dec09-new-features] prefixed few functions with murrine_, just to avoid issues with symbols
- From: Andrea Cimitan <acimitan src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [murrine/dec09-new-features] prefixed few functions with murrine_, just to avoid issues with symbols
- Date: Tue, 8 Dec 2009 01:38:29 +0000 (UTC)
commit c5486deba35a57daa2c4ab863ed2a9795e01a326
Author: Andrea Cimitan <andrea cimitan gmail com>
Date: Tue Dec 8 02:37:46 2009 +0100
prefixed few functions with murrine_, just to avoid issues with symbols
src/cairo-support.c | 22 ++++++------
src/cairo-support.h | 12 +++---
src/murrine_draw.c | 78 +++++++++++++++++++++++-----------------------
src/murrine_draw_rgba.c | 72 +++++++++++++++++++++---------------------
src/murrine_style.c | 6 ++--
5 files changed, 95 insertions(+), 95 deletions(-)
---
diff --git a/src/cairo-support.c b/src/cairo-support.c
index 48c4854..96460d4 100644
--- a/src/cairo-support.c
+++ b/src/cairo-support.c
@@ -1018,7 +1018,7 @@ murrine_exchange_axis (cairo_t *cr,
}
void
-get_fill_color (MurrineRGB *color,
+murrine_get_fill_color (MurrineRGB *color,
const MurrineGradients *mrn_gradient)
{
if (mrn_gradient->has_gradient_colors)
@@ -1030,7 +1030,7 @@ get_fill_color (MurrineRGB *color,
}
double
-get_decreased_shade (double old, double factor)
+murrine_get_decreased_shade (double old, double factor)
{
if (old > 1.0)
return ((old-1.0)/factor+1.0);
@@ -1041,7 +1041,7 @@ get_decreased_shade (double old, double factor)
}
double
-get_increased_shade (double old, double factor)
+murrine_get_increased_shade (double old, double factor)
{
if (old > 1.0)
return ((old-1.0)*factor+1.0);
@@ -1052,7 +1052,7 @@ get_increased_shade (double old, double factor)
}
double
-get_contrast (double old, double factor)
+murrine_get_contrast (double old, double factor)
{
if (factor == 1.0)
return old;
@@ -1074,7 +1074,7 @@ get_contrast (double old, double factor)
}
double
-get_inverted_shade (double old)
+murrine_get_inverted_shade (double old)
{
if (old == 1.0)
return old;
@@ -1083,7 +1083,7 @@ get_inverted_shade (double old)
}
MurrineGradients
-get_inverted_border_shades (MurrineGradients mrn_gradient)
+murrine_get_inverted_border_shades (MurrineGradients mrn_gradient)
{
MurrineGradients mrn_gradient_new = mrn_gradient;
@@ -1094,14 +1094,14 @@ get_inverted_border_shades (MurrineGradients mrn_gradient)
}
MurrineGradients
-get_decreased_gradient_shades (MurrineGradients mrn_gradient, double factor)
+murrine_get_decreased_gradient_shades (MurrineGradients mrn_gradient, double factor)
{
MurrineGradients mrn_gradient_new = mrn_gradient;
- mrn_gradient_new.gradient_shades[0] = get_decreased_shade (mrn_gradient.gradient_shades[0], factor);
- mrn_gradient_new.gradient_shades[1] = get_decreased_shade (mrn_gradient.gradient_shades[1], factor);
- mrn_gradient_new.gradient_shades[2] = get_decreased_shade (mrn_gradient.gradient_shades[2], factor);
- mrn_gradient_new.gradient_shades[3] = get_decreased_shade (mrn_gradient.gradient_shades[3], factor);
+ mrn_gradient_new.gradient_shades[0] = murrine_get_decreased_shade (mrn_gradient.gradient_shades[0], factor);
+ mrn_gradient_new.gradient_shades[1] = murrine_get_decreased_shade (mrn_gradient.gradient_shades[1], factor);
+ mrn_gradient_new.gradient_shades[2] = murrine_get_decreased_shade (mrn_gradient.gradient_shades[2], factor);
+ mrn_gradient_new.gradient_shades[3] = murrine_get_decreased_shade (mrn_gradient.gradient_shades[3], factor);
return mrn_gradient_new;
}
diff --git a/src/cairo-support.h b/src/cairo-support.h
index 39a7207..bbd8f9d 100644
--- a/src/cairo-support.h
+++ b/src/cairo-support.h
@@ -54,17 +54,17 @@ G_GNUC_INTERNAL void rotate_mirror_translate (cairo_t *cr,
G_GNUC_INTERNAL void murrine_get_fill_color (MurrineRGB *color,
const MurrineGradients *mrn_gradient);
-G_GNUC_INTERNAL double get_decreased_shade (double old, double factor);
+G_GNUC_INTERNAL double murrine_get_decreased_shade (double old, double factor);
-G_GNUC_INTERNAL double get_increased_shade (double old, double factor);
+G_GNUC_INTERNAL double murrine_get_increased_shade (double old, double factor);
-G_GNUC_INTERNAL double get_contrast (double old, double factor);
+G_GNUC_INTERNAL double murrine_get_contrast (double old, double factor);
-G_GNUC_INTERNAL double get_inverted_shade (double old);
+G_GNUC_INTERNAL double murrine_get_inverted_shade (double old);
-G_GNUC_INTERNAL MurrineGradients get_inverted_border_shades (MurrineGradients mrn_gradient);
+G_GNUC_INTERNAL MurrineGradients murrine_get_inverted_border_shades (MurrineGradients mrn_gradient);
-G_GNUC_INTERNAL MurrineGradients get_decreased_gradient_shades (MurrineGradients mrn_gradient, double factor);
+G_GNUC_INTERNAL MurrineGradients murrine_get_decreased_gradient_shades (MurrineGradients mrn_gradient, double factor);
G_GNUC_INTERNAL void murrine_exchange_axis (cairo_t *cr,
gint *x,
diff --git a/src/murrine_draw.c b/src/murrine_draw.c
index 538dc55..af4de48 100644
--- a/src/murrine_draw.c
+++ b/src/murrine_draw.c
@@ -159,12 +159,12 @@ murrine_draw_button (cairo_t *cr,
if (widget->disabled)
{
- mrn_gradient_new = get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
- mrn_gradient_new.border_shades[0] = get_decreased_shade (widget->mrn_gradient.border_shades[0], 2.0);
- mrn_gradient_new.border_shades[1] = get_decreased_shade (widget->mrn_gradient.border_shades[1], 2.0);
- glow_shade_new = get_decreased_shade (widget->glow_shade, 2.0);
- highlight_shade_new = get_decreased_shade (widget->highlight_shade, 2.0);
- lightborder_shade_new = get_decreased_shade (widget->lightborder_shade, 2.0);
+ mrn_gradient_new = murrine_get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
+ mrn_gradient_new.border_shades[0] = murrine_get_decreased_shade (widget->mrn_gradient.border_shades[0], 2.0);
+ mrn_gradient_new.border_shades[1] = murrine_get_decreased_shade (widget->mrn_gradient.border_shades[1], 2.0);
+ glow_shade_new = murrine_get_decreased_shade (widget->glow_shade, 2.0);
+ highlight_shade_new = murrine_get_decreased_shade (widget->highlight_shade, 2.0);
+ lightborder_shade_new = murrine_get_decreased_shade (widget->lightborder_shade, 2.0);
}
else
murrine_shade (&colors->shade[6], 0.95, &border);
@@ -197,7 +197,7 @@ murrine_draw_button (cairo_t *cr,
}
else if (widget->reliefstyle != 0 && os > 0)
{
- mrn_gradient_new = get_inverted_border_shades (mrn_gradient_new);
+ mrn_gradient_new = murrine_get_inverted_border_shades (mrn_gradient_new);
murrine_draw_inset (cr, &widget->parentbg, os-0.5, os-0.5,
width-(os*2)+1, height-(os*2)+1,
widget->roundness+1, widget->corners);
@@ -305,7 +305,7 @@ murrine_draw_entry (cairo_t *cr,
cairo_stroke (cr);
}
- mrn_gradient_new = get_inverted_border_shades (mrn_gradient_new);
+ mrn_gradient_new = murrine_get_inverted_border_shades (mrn_gradient_new);
/* Draw border */
murrine_draw_border (cr, &border,
@@ -411,10 +411,10 @@ murrine_draw_spinbutton (cairo_t *cr,
if (widget->disabled)
{
- mrn_gradient_new = get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
- lightborder_shade_new = get_decreased_shade (widget->lightborder_shade, 2.0);
- mrn_gradient_new.border_shades[0] = get_decreased_shade (widget->mrn_gradient.border_shades[0], 2.0);
- mrn_gradient_new.border_shades[1] = get_decreased_shade (widget->mrn_gradient.border_shades[1], 2.0);
+ mrn_gradient_new = murrine_get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
+ lightborder_shade_new = murrine_get_decreased_shade (widget->lightborder_shade, 2.0);
+ mrn_gradient_new.border_shades[0] = murrine_get_decreased_shade (widget->mrn_gradient.border_shades[0], 2.0);
+ mrn_gradient_new.border_shades[1] = murrine_get_decreased_shade (widget->mrn_gradient.border_shades[1], 2.0);
}
else
murrine_shade (&colors->shade[6], 0.95, &line);
@@ -551,7 +551,7 @@ murrine_draw_scale_trough (cairo_t *cr,
{
MurrineRGB fill, border;
murrine_shade (&colors->bg[widget->state_type], 1.0, &fill);
- murrine_shade (&colors->bg[!widget->disabled ? GTK_STATE_ACTIVE : GTK_STATE_INSENSITIVE], get_contrast(0.82, widget->contrast), &border);
+ murrine_shade (&colors->bg[!widget->disabled ? GTK_STATE_ACTIVE : GTK_STATE_INSENSITIVE], murrine_get_contrast(0.82, widget->contrast), &border);
murrine_scale_draw_gradient (cr, &fill, &border,
1.0,
@@ -619,7 +619,7 @@ murrine_draw_progressbar_trough (cairo_t *cr,
boolean horizontal = progressbar->orientation < 2;
murrine_shade (&colors->bg[GTK_STATE_ACTIVE], 1.0, &fill);
- murrine_shade (&colors->bg[GTK_STATE_ACTIVE], get_contrast(0.82, widget->contrast), &border);
+ murrine_shade (&colors->bg[GTK_STATE_ACTIVE], murrine_get_contrast(0.82, widget->contrast), &border);
/* Create trough box */
murrine_draw_trough (cr, &fill, x+1, y+1, width-2, height-2, roundness-1, widget->corners, widget->mrn_gradient, 1.0, horizontal);
@@ -677,7 +677,7 @@ murrine_draw_progressbar_fill (cairo_t *cr,
MurrineRGB fill = colors->spot[1];
get_fill_color (&fill, &widget->mrn_gradient);
- murrine_shade (&fill, get_contrast(0.65, widget->contrast), &effect);
+ murrine_shade (&fill, murrine_get_contrast(0.65, widget->contrast), &effect);
/* progressbar->orientation < 2 == boolean is_horizontal */
if (progressbar->orientation < 2)
@@ -1214,9 +1214,9 @@ murrine_draw_tab (cairo_t *cr,
if (widget->active)
{
MurrineRGB shade1, shade2, shade3, shade4, highlight;
- MurrineGradients mrn_gradient_new = get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
- double highlight_shade_new = get_decreased_shade (widget->highlight_shade, 2.0);
- double lightborder_shade_new = get_decreased_shade (widget->lightborder_shade, 2.0);
+ MurrineGradients mrn_gradient_new = murrine_get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
+ double highlight_shade_new = murrine_get_decreased_shade (widget->highlight_shade, 2.0);
+ double lightborder_shade_new = murrine_get_decreased_shade (widget->lightborder_shade, 2.0);
murrine_shade (fill, mrn_gradient_new.gradient_shades[0]*highlight_shade_new, &shade1);
murrine_shade (fill, mrn_gradient_new.gradient_shades[1]*highlight_shade_new, &shade2);
@@ -1285,8 +1285,8 @@ murrine_draw_tab (cairo_t *cr,
else
{
MurrineRGB shade1, shade2, shade3, shade4, highlight;
- MurrineGradients mrn_gradient_new = get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
- double highlight_shade_new = get_decreased_shade (widget->highlight_shade, 2.0);
+ MurrineGradients mrn_gradient_new = murrine_get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
+ double highlight_shade_new = murrine_get_decreased_shade (widget->highlight_shade, 2.0);
murrine_shade (fill, mrn_gradient_new.gradient_shades[0]*highlight_shade_new, &shade1);
murrine_shade (fill, mrn_gradient_new.gradient_shades[1]*highlight_shade_new, &shade2);
@@ -1567,7 +1567,7 @@ murrine_draw_menuitem (cairo_t *cr,
stroke_width = height*2;
x_step = (((float)stroke_width/10));
- murrine_shade (&fill, get_contrast(0.65, widget->contrast), &effect);
+ murrine_shade (&fill, murrine_get_contrast(0.65, widget->contrast), &effect);
cairo_save (cr);
/* Draw strokes */
@@ -1605,12 +1605,12 @@ murrine_draw_scrollbar_trough (cairo_t *cr,
MurrineRGB fill;
murrine_shade (&widget->parentbg,
- get_contrast (scrollbar->stepperstyle < 1 ? 0.86 : 0.8, widget->contrast),
+ murrine_get_contrast (scrollbar->stepperstyle < 1 ? 0.86 : 0.8, widget->contrast),
&border);
murrine_shade (&widget->parentbg, scrollbar->stepperstyle < 1 ? 0.97 : 1.026, &fill);
/*
murrine_shade (&colors->bg[widget->state_type],
- get_contrast (scrollbar->stepperstyle < 1 ? 0.86 : 0.8, widget->contrast),
+ murrine_get_contrast (scrollbar->stepperstyle < 1 ? 0.86 : 0.8, widget->contrast),
&border_bg);
murrine_shade (&colors->bg[widget->state_type], scrollbar->stepperstyle < 1 ? 0.97 : 1.026, &fill_bg);
murrine_mix_color (&border_bg, &border, 0.5, &border);
@@ -1956,11 +1956,11 @@ murrine_draw_tooltip (cairo_t *cr,
{
MurrineRGB border;
MurrineRGB fill = colors->bg[widget->state_type];
- MurrineGradients mrn_gradient_new = get_decreased_gradient_shades (widget->mrn_gradient, 2.0);
- double glow_shade_new = get_decreased_shade (widget->glow_shade, 2.0);
- double highlight_shade_new = get_decreased_shade (widget->highlight_shade, 2.0);
+ MurrineGradients mrn_gradient_new = murrine_get_decreased_gradient_shades (widget->mrn_gradient, 2.0);
+ double glow_shade_new = murrine_get_decreased_shade (widget->glow_shade, 2.0);
+ double highlight_shade_new = murrine_get_decreased_shade (widget->highlight_shade, 2.0);
- murrine_shade (&fill, get_contrast(0.6, widget->contrast), &border);
+ murrine_shade (&fill, murrine_get_contrast(0.6, widget->contrast), &border);
get_fill_color (&fill, &mrn_gradient_new);
cairo_save (cr);
@@ -2229,11 +2229,11 @@ murrine_draw_radiobutton (cairo_t *cr,
dot = &colors->shade[3];
bg = &colors->bg[0];
- mrn_gradient_new = get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
- mrn_gradient_new.border_shades[0] = get_decreased_shade (widget->mrn_gradient.border_shades[0], 3.0);
- mrn_gradient_new.border_shades[1] = get_decreased_shade (widget->mrn_gradient.border_shades[1], 3.0);
- highlight_shade_new = get_decreased_shade (widget->highlight_shade, 2.0);
- lightborder_shade_new = get_decreased_shade (widget->lightborder_shade, 2.0);
+ mrn_gradient_new = murrine_get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
+ mrn_gradient_new.border_shades[0] = murrine_get_decreased_shade (widget->mrn_gradient.border_shades[0], 3.0);
+ mrn_gradient_new.border_shades[1] = murrine_get_decreased_shade (widget->mrn_gradient.border_shades[1], 3.0);
+ highlight_shade_new = murrine_get_decreased_shade (widget->highlight_shade, 2.0);
+ lightborder_shade_new = murrine_get_decreased_shade (widget->lightborder_shade, 2.0);
}
else
{
@@ -2294,7 +2294,7 @@ murrine_draw_radiobutton (cairo_t *cr,
}
else if (!draw_bullet)
{
- mrn_gradient_new = get_inverted_border_shades (mrn_gradient_new);
+ mrn_gradient_new = murrine_get_inverted_border_shades (mrn_gradient_new);
mrn_gradient_new.has_border_colors = FALSE;
}
@@ -2355,11 +2355,11 @@ murrine_draw_checkbox (cairo_t *cr,
dot = &colors->shade[3];
bg = &colors->bg[0];
- mrn_gradient_new = get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
- mrn_gradient_new.border_shades[0] = get_decreased_shade (widget->mrn_gradient.border_shades[0], 3.0);
- mrn_gradient_new.border_shades[1] = get_decreased_shade (widget->mrn_gradient.border_shades[1], 3.0);
- highlight_shade_new = get_decreased_shade (widget->highlight_shade, 2.0);
- lightborder_shade_new = get_decreased_shade (widget->lightborder_shade, 2.0);
+ mrn_gradient_new = murrine_get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
+ mrn_gradient_new.border_shades[0] = murrine_get_decreased_shade (widget->mrn_gradient.border_shades[0], 3.0);
+ mrn_gradient_new.border_shades[1] = murrine_get_decreased_shade (widget->mrn_gradient.border_shades[1], 3.0);
+ highlight_shade_new = murrine_get_decreased_shade (widget->highlight_shade, 2.0);
+ lightborder_shade_new = murrine_get_decreased_shade (widget->lightborder_shade, 2.0);
}
else
{
@@ -2420,7 +2420,7 @@ murrine_draw_checkbox (cairo_t *cr,
}
else if (!draw_bullet)
{
- mrn_gradient_new = get_inverted_border_shades (mrn_gradient_new);
+ mrn_gradient_new = murrine_get_inverted_border_shades (mrn_gradient_new);
mrn_gradient_new.has_border_colors = FALSE;
}
diff --git a/src/murrine_draw_rgba.c b/src/murrine_draw_rgba.c
index d50298a..9ee165b 100644
--- a/src/murrine_draw_rgba.c
+++ b/src/murrine_draw_rgba.c
@@ -159,12 +159,12 @@ murrine_rgba_draw_button (cairo_t *cr,
if (widget->disabled)
{
- mrn_gradient_new = get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
- mrn_gradient_new.border_shades[0] = get_decreased_shade (widget->mrn_gradient.border_shades[0], 2.0);
- mrn_gradient_new.border_shades[1] = get_decreased_shade (widget->mrn_gradient.border_shades[1], 2.0);
- glow_shade_new = get_decreased_shade (widget->glow_shade, 2.0);
- highlight_shade_new = get_decreased_shade (widget->highlight_shade, 2.0);
- lightborder_shade_new = get_decreased_shade (widget->lightborder_shade, 2.0);
+ mrn_gradient_new = murrine_get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
+ mrn_gradient_new.border_shades[0] = murrine_get_decreased_shade (widget->mrn_gradient.border_shades[0], 2.0);
+ mrn_gradient_new.border_shades[1] = murrine_get_decreased_shade (widget->mrn_gradient.border_shades[1], 2.0);
+ glow_shade_new = murrine_get_decreased_shade (widget->glow_shade, 2.0);
+ highlight_shade_new = murrine_get_decreased_shade (widget->highlight_shade, 2.0);
+ lightborder_shade_new = murrine_get_decreased_shade (widget->lightborder_shade, 2.0);
}
else
murrine_shade (&colors->shade[8], 0.95, &border);
@@ -197,7 +197,7 @@ murrine_rgba_draw_button (cairo_t *cr,
}
else if (widget->reliefstyle != 0 && os > 0.5)
{
- mrn_gradient_new = get_inverted_border_shades (mrn_gradient_new);
+ mrn_gradient_new = murrine_get_inverted_border_shades (mrn_gradient_new);
murrine_draw_inset (cr, &widget->parentbg, os-0.5, os-0.5,
width-(os*2)+1, height-(os*2)+1,
widget->roundness+1, widget->corners);
@@ -314,7 +314,7 @@ murrine_rgba_draw_entry (cairo_t *cr,
cairo_stroke (cr);
}
- mrn_gradient_new = get_inverted_border_shades (mrn_gradient_new);
+ mrn_gradient_new = murrine_get_inverted_border_shades (mrn_gradient_new);
/* Draw border */
murrine_draw_border (cr, &border,
@@ -406,7 +406,7 @@ murrine_rgba_draw_scale_trough (cairo_t *cr,
{
MurrineRGB fill, border;
murrine_shade (&colors->bg[widget->state_type], 1.0, &fill);
- murrine_shade (&colors->bg[!widget->disabled ? GTK_STATE_ACTIVE : GTK_STATE_INSENSITIVE], get_contrast(0.82, widget->contrast), &border);
+ murrine_shade (&colors->bg[!widget->disabled ? GTK_STATE_ACTIVE : GTK_STATE_INSENSITIVE], murrine_get_contrast(0.82, widget->contrast), &border);
murrine_scale_draw_gradient (cr, &fill, &border,
1.0,
@@ -452,9 +452,9 @@ murrine_rgba_draw_spinbutton (cairo_t *cr,
if (widget->disabled)
{
- lightborder_shade_new = get_decreased_shade (widget->lightborder_shade, 2.0);
- mrn_gradient_new.border_shades[0] = get_decreased_shade (widget->mrn_gradient.border_shades[0], 2.0);
- mrn_gradient_new.border_shades[1] = get_decreased_shade (widget->mrn_gradient.border_shades[1], 2.0);
+ lightborder_shade_new = murrine_get_decreased_shade (widget->lightborder_shade, 2.0);
+ mrn_gradient_new.border_shades[0] = murrine_get_decreased_shade (widget->mrn_gradient.border_shades[0], 2.0);
+ mrn_gradient_new.border_shades[1] = murrine_get_decreased_shade (widget->mrn_gradient.border_shades[1], 2.0);
}
else
murrine_shade (&colors->shade[8], 0.95, &line);
@@ -503,7 +503,7 @@ murrine_rgba_draw_progressbar_trough (cairo_t *cr,
boolean horizontal = progressbar->orientation < 2;
murrine_shade (&colors->bg[GTK_STATE_ACTIVE], 1.0, &fill);
- murrine_shade (&colors->bg[GTK_STATE_ACTIVE], get_contrast(0.82, widget->contrast), &border);
+ murrine_shade (&colors->bg[GTK_STATE_ACTIVE], murrine_get_contrast(0.82, widget->contrast), &border);
/* Create trough box */
murrine_draw_trough (cr, &fill, x+1, y+1, width-2, height-2, roundness-1, widget->corners, widget->mrn_gradient, 0.8, horizontal);
@@ -561,7 +561,7 @@ murrine_rgba_draw_progressbar_fill (cairo_t *cr,
MurrineRGB fill = colors->spot[1];
get_fill_color (&fill, &widget->mrn_gradient);
- murrine_shade (&fill, get_contrast(0.65, widget->contrast), &effect);
+ murrine_shade (&fill, murrine_get_contrast(0.65, widget->contrast), &effect);
/* progressbar->orientation < 2 == boolean is_horizontal */
if (progressbar->orientation < 2)
@@ -1083,9 +1083,9 @@ murrine_rgba_draw_tab (cairo_t *cr,
if (widget->active)
{
MurrineRGB shade1, shade2, shade3, shade4, highlight;
- MurrineGradients mrn_gradient_new = mrn_gradient_new = get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
- double highlight_shade_new = get_decreased_shade (widget->highlight_shade, 2.0);
- double lightborder_shade_new = get_decreased_shade (widget->lightborder_shade, 2.0);
+ MurrineGradients mrn_gradient_new = mrn_gradient_new = murrine_get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
+ double highlight_shade_new = murrine_get_decreased_shade (widget->highlight_shade, 2.0);
+ double lightborder_shade_new = murrine_get_decreased_shade (widget->lightborder_shade, 2.0);
murrine_shade (fill, mrn_gradient_new.gradient_shades[0]*highlight_shade_new, &shade1);
murrine_shade (fill, mrn_gradient_new.gradient_shades[1]*highlight_shade_new, &shade2);
@@ -1156,8 +1156,8 @@ murrine_rgba_draw_tab (cairo_t *cr,
else
{
MurrineRGB shade1, shade2, shade3, shade4, highlight;
- MurrineGradients mrn_gradient_new = mrn_gradient_new = get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
- double highlight_shade_new = get_decreased_shade (widget->highlight_shade, 2.0);
+ MurrineGradients mrn_gradient_new = mrn_gradient_new = murrine_get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
+ double highlight_shade_new = murrine_get_decreased_shade (widget->highlight_shade, 2.0);
murrine_shade (fill, mrn_gradient_new.gradient_shades[0]*highlight_shade_new, &shade1);
murrine_shade (fill, mrn_gradient_new.gradient_shades[1]*highlight_shade_new, &shade2);
@@ -1243,7 +1243,7 @@ murrine_rgba_draw_scrollbar_trough (cairo_t *cr,
MurrineRGB fill;
murrine_shade (&widget->parentbg,
- get_contrast (scrollbar->stepperstyle < 1 ? 0.82 : 0.75, widget->contrast),
+ murrine_get_contrast (scrollbar->stepperstyle < 1 ? 0.82 : 0.75, widget->contrast),
&border);
murrine_shade (&widget->parentbg, scrollbar->stepperstyle < 1 ? 0.95 : 1.065, &fill);
@@ -1511,11 +1511,11 @@ murrine_rgba_draw_tooltip (cairo_t *cr,
{
MurrineRGB border;
MurrineRGB fill = colors->bg[widget->state_type];
- MurrineGradients mrn_gradient_new = get_decreased_gradient_shades (widget->mrn_gradient, 2.0);
- double glow_shade_new = get_decreased_shade (widget->glow_shade, 2.0);
- double highlight_shade_new = get_decreased_shade (widget->highlight_shade, 2.0);
+ MurrineGradients mrn_gradient_new = murrine_get_decreased_gradient_shades (widget->mrn_gradient, 2.0);
+ double glow_shade_new = murrine_get_decreased_shade (widget->glow_shade, 2.0);
+ double highlight_shade_new = murrine_get_decreased_shade (widget->highlight_shade, 2.0);
- murrine_shade (&fill, get_contrast(0.6, widget->contrast), &border);
+ murrine_shade (&fill, murrine_get_contrast(0.6, widget->contrast), &border);
get_fill_color (&fill, &mrn_gradient_new);
cairo_save (cr);
@@ -1620,11 +1620,11 @@ murrine_rgba_draw_radiobutton (cairo_t *cr,
dot = &colors->shade[4];
bg = &colors->bg[0];
- mrn_gradient_new = get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
- mrn_gradient_new.border_shades[0] = get_decreased_shade (widget->mrn_gradient.border_shades[0], 3.0);
- mrn_gradient_new.border_shades[1] = get_decreased_shade (widget->mrn_gradient.border_shades[1], 3.0);
- highlight_shade_new = get_decreased_shade (widget->highlight_shade, 2.0);
- lightborder_shade_new = get_decreased_shade (widget->lightborder_shade, 2.0);
+ mrn_gradient_new = murrine_get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
+ mrn_gradient_new.border_shades[0] = murrine_get_decreased_shade (widget->mrn_gradient.border_shades[0], 3.0);
+ mrn_gradient_new.border_shades[1] = murrine_get_decreased_shade (widget->mrn_gradient.border_shades[1], 3.0);
+ highlight_shade_new = murrine_get_decreased_shade (widget->highlight_shade, 2.0);
+ lightborder_shade_new = murrine_get_decreased_shade (widget->lightborder_shade, 2.0);
}
else
{
@@ -1687,7 +1687,7 @@ murrine_rgba_draw_radiobutton (cairo_t *cr,
}
else if (!draw_bullet)
{
- mrn_gradient_new = get_inverted_border_shades (mrn_gradient_new);
+ mrn_gradient_new = murrine_get_inverted_border_shades (mrn_gradient_new);
mrn_gradient_new.has_border_colors = FALSE;
}
@@ -1748,11 +1748,11 @@ murrine_rgba_draw_checkbox (cairo_t *cr,
dot = &colors->shade[4];
bg = &colors->bg[0];
- mrn_gradient_new = get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
- mrn_gradient_new.border_shades[0] = get_decreased_shade (widget->mrn_gradient.border_shades[0], 3.0);
- mrn_gradient_new.border_shades[1] = get_decreased_shade (widget->mrn_gradient.border_shades[1], 3.0);
- highlight_shade_new = get_decreased_shade (widget->highlight_shade, 2.0);
- lightborder_shade_new = get_decreased_shade (widget->lightborder_shade, 2.0);
+ mrn_gradient_new = murrine_get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
+ mrn_gradient_new.border_shades[0] = murrine_get_decreased_shade (widget->mrn_gradient.border_shades[0], 3.0);
+ mrn_gradient_new.border_shades[1] = murrine_get_decreased_shade (widget->mrn_gradient.border_shades[1], 3.0);
+ highlight_shade_new = murrine_get_decreased_shade (widget->highlight_shade, 2.0);
+ lightborder_shade_new = murrine_get_decreased_shade (widget->lightborder_shade, 2.0);
}
else
{
@@ -1815,7 +1815,7 @@ murrine_rgba_draw_checkbox (cairo_t *cr,
}
else if (!draw_bullet)
{
- mrn_gradient_new = get_inverted_border_shades (mrn_gradient_new);
+ mrn_gradient_new = murrine_get_inverted_border_shades (mrn_gradient_new);
mrn_gradient_new.has_border_colors = FALSE;
}
diff --git a/src/murrine_style.c b/src/murrine_style.c
index 773549c..52a9c72 100644
--- a/src/murrine_style.c
+++ b/src/murrine_style.c
@@ -2225,7 +2225,7 @@ murrine_style_init_from_rc (GtkStyle *style,
murrine_style->gradient_shades[2] = gradient_stop_mid;
}
/* Adjust lightborder_shade reading contrast */
- murrine_style->lightborder_shade = get_contrast(MURRINE_RC_STYLE (rc_style)->lightborder_shade,
+ murrine_style->lightborder_shade = murrine_get_contrast(MURRINE_RC_STYLE (rc_style)->lightborder_shade,
MURRINE_RC_STYLE (rc_style)->contrast);
murrine_style->trough_shades[0] = MURRINE_RC_STYLE (rc_style)->trough_shades[0];
murrine_style->trough_shades[1] = MURRINE_RC_STYLE (rc_style)->trough_shades[1];
@@ -2306,10 +2306,10 @@ murrine_style_realize (GtkStyle *style)
for (i = 0; i < 9; i++)
{
murrine_shade (&bg_normal,
- get_contrast(shades[i], contrast),
+ murrine_get_contrast(shades[i], contrast),
&murrine_style->colors.shade[i]);
}
- spots[2] = get_contrast(spots[2], contrast);
+ spots[2] = murrine_get_contrast(spots[2], contrast);
spot_color.r = style->bg[GTK_STATE_SELECTED].red/65535.0;
spot_color.g = style->bg[GTK_STATE_SELECTED].green/65535.0;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
