murrine r88 - in trunk: . src
- From: acimitan svn gnome org
- To: svn-commits-list gnome org
- Subject: murrine r88 - in trunk: . src
- Date: Tue, 30 Sep 2008 00:27:29 +0000 (UTC)
Author: acimitan
Date: Tue Sep 30 00:27:29 2008
New Revision: 88
URL: http://svn.gnome.org/viewvc/murrine?rev=88&view=rev
Log:
2008-09-30 Andrea Cimitan <andrea cimitan gmail com>
* src/cairo-support.c (murrine_pattern_add_color_stop_rgb),
(murrine_pattern_add_color_stop_rgba), (murrine_draw_lightborder),
(murrine_set_gradient):
* src/cairo-support.h:
* src/murrine_draw.c (murrine_draw_button),
(murrine_draw_spinbutton_down), (murrine_draw_progressbar_trough),
(murrine_draw_menubar), (murrine_draw_toolbar), (murrine_draw_tab),
(murrine_draw_list_view_header):
* src/murrine_draw_rgba.c (murrine_rgba_draw_button),
(murrine_rgba_draw_progressbar_trough),
(murrine_rgba_draw_menubar), (murrine_rgba_draw_toolbar),
(murrine_rgba_draw_tab):
* src/murrine_style.c (murrine_style_draw_flat_box),
(murrine_style_draw_box):
Bypass cairo_pattern_add_color_stop_rgb/rgba with
murrine_pattern_add_color_stop_rgb/rgba
Modified:
trunk/ChangeLog
trunk/src/cairo-support.c
trunk/src/cairo-support.h
trunk/src/murrine_draw.c
trunk/src/murrine_draw_rgba.c
trunk/src/murrine_style.c
Modified: trunk/src/cairo-support.c
==============================================================================
--- trunk/src/cairo-support.c (original)
+++ trunk/src/cairo-support.c Tue Sep 30 00:27:29 2008
@@ -298,6 +298,24 @@
}
void
+murrine_pattern_add_color_stop_rgb (cairo_pattern_t *pattern, double pos,
+ const MurrineRGB *color)
+{
+ g_return_if_fail (pattern && color);
+
+ cairo_pattern_add_color_stop_rgb (pattern, pos, color->r, color->g, color->b);
+}
+
+void
+murrine_pattern_add_color_stop_rgba (cairo_pattern_t *pattern, double pos,
+ const MurrineRGB *color, double alpha)
+{
+ g_return_if_fail (pattern && color);
+
+ cairo_pattern_add_color_stop_rgba (pattern, pos, color->r, color->g, color->b, alpha);
+}
+
+void
murrine_rounded_corner (cairo_t *cr,
double x,
double y,
@@ -586,13 +604,13 @@
clearlooks_rounded_rectangle (cr, x, y, width, height, radius-1, corners);
pattern = cairo_pattern_create_linear (x, y, !horizontal ? width+x : x, !horizontal ? y : height+y);
- cairo_pattern_add_color_stop_rgba (pattern, 0.00, shade1.r, shade1.g, shade1.b, 0.5*alpha_value);
- cairo_pattern_add_color_stop_rgba (pattern, 0.49, shade2.r, shade2.g, shade2.b, 0.5*alpha_value);
- cairo_pattern_add_color_stop_rgba (pattern, 0.49, 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,
+ murrine_pattern_add_color_stop_rgba (pattern, 0.00, &shade1, 0.5*alpha_value);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.49, &shade2, 0.5*alpha_value);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.49, &shade3, 0.5*alpha_value);
+ murrine_pattern_add_color_stop_rgba (pattern, fill_pos, &shade4, 0.5*alpha_value);
+ murrine_pattern_add_color_stop_rgba (pattern, fill_pos, &shade4,
lightborderstyle > 0 ? 0.5*alpha_value : 0.0);
- cairo_pattern_add_color_stop_rgba (pattern, 1.00, shade4.r, shade4.g, shade4.b,
+ murrine_pattern_add_color_stop_rgba (pattern, 1.00, &shade4,
lightborderstyle > 0 ? 0.5*alpha_value : 0.0);
cairo_set_source (cr, pattern);
cairo_pattern_destroy (pattern);
@@ -640,10 +658,10 @@
pattern = cairo_pattern_create_linear (x, y, width+x, height+y);
- cairo_pattern_add_color_stop_rgba (pattern, 0.00, shade1.r, shade1.g, shade1.b, alpha_value);
- cairo_pattern_add_color_stop_rgba (pattern, 0.49, shade2.r, shade2.g, shade2.b, alpha_value);
- cairo_pattern_add_color_stop_rgba (pattern, 0.49, shade3.r, shade3.g, shade3.b, alpha_value);
- cairo_pattern_add_color_stop_rgba (pattern, 1.00, shade4.r, shade4.g, shade4.b, alpha_value);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.00, &shade1, alpha_value);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.49, &shade2, alpha_value);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.49, &shade3, alpha_value);
+ murrine_pattern_add_color_stop_rgba (pattern, 1.00, &shade4, alpha_value);
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 Tue Sep 30 00:27:29 2008
@@ -41,6 +41,12 @@
const MurrineRGB *color,
double alpha);
+G_GNUC_INTERNAL void murrine_pattern_add_color_stop_rgb (cairo_pattern_t *pattern, double pos,
+ const MurrineRGB *color);
+
+G_GNUC_INTERNAL void murrine_pattern_add_color_stop_rgba (cairo_pattern_t *pattern, double pos,
+ const MurrineRGB *color, double alpha);
+
G_GNUC_INTERNAL void rotate_mirror_translate (cairo_t *cr,
double radius, double x, double y,
boolean mirror_horizontally, boolean mirror_vertically);
Modified: trunk/src/murrine_draw.c
==============================================================================
--- trunk/src/murrine_draw.c (original)
+++ trunk/src/murrine_draw.c Tue Sep 30 00:27:29 2008
@@ -220,16 +220,16 @@
cairo_rectangle (cr, xos+1, yos+1, width-(xos*2)-2, 3);
pattern = cairo_pattern_create_linear (xos+1, yos+1, xos+1, yos+4);
- cairo_pattern_add_color_stop_rgba (pattern, 0.0, shadow.r, shadow.g, shadow.b, 0.58);
- cairo_pattern_add_color_stop_rgba (pattern, 1.0, shadow.r, shadow.g, shadow.b, 0.0);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.0, &shadow, 0.58);
+ murrine_pattern_add_color_stop_rgba (pattern, 1.0, &shadow, 0.0);
cairo_set_source (cr, pattern);
cairo_fill (cr);
cairo_pattern_destroy (pattern);
cairo_rectangle (cr, xos+1, yos+1, 3, height-(yos*2)-2);
pattern = cairo_pattern_create_linear (xos+1, yos+1, xos+4, yos+1);
- cairo_pattern_add_color_stop_rgba (pattern, 0.0, shadow.r, shadow.g, shadow.b, 0.58);
- cairo_pattern_add_color_stop_rgba (pattern, 1.0, shadow.r, shadow.g, shadow.b, 0.0);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.0, &shadow, 0.58);
+ murrine_pattern_add_color_stop_rgba (pattern, 1.0, &shadow, 0.0);
cairo_set_source (cr, pattern);
cairo_fill (cr);
cairo_pattern_destroy (pattern);
@@ -306,8 +306,8 @@
cairo_rectangle (cr, 1, 1, width-4, height-4);
pattern = cairo_pattern_create_linear (0, 0, 0, height);
- cairo_pattern_add_color_stop_rgb (pattern, 0.0, shadow.r, shadow.g, shadow.b);
- cairo_pattern_add_color_stop_rgba (pattern, 1.0, shadow.r, shadow.g, shadow.b, 0.0);
+ murrine_pattern_add_color_stop_rgb (pattern, 0.0, &shadow);
+ murrine_pattern_add_color_stop_rgba (pattern, 1.0, &shadow, 0.0);
cairo_set_source (cr, pattern);
cairo_fill (cr);
@@ -465,8 +465,8 @@
/* Top shadow */
cairo_rectangle (cr, x+1, y+1, width-2, 4);
pattern = cairo_pattern_create_linear (x, y, x, y+4);
- cairo_pattern_add_color_stop_rgba (pattern, 0.0, shadow.r, shadow.g, shadow.b, 0.24);
- cairo_pattern_add_color_stop_rgba (pattern, 1.0, shadow.r, shadow.g, shadow.b, 0.);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.0, &shadow, 0.24);
+ murrine_pattern_add_color_stop_rgba (pattern, 1.0, &shadow, 0.);
cairo_set_source (cr, pattern);
cairo_fill (cr);
cairo_pattern_destroy (pattern);
@@ -474,8 +474,8 @@
/* Left shadow */
cairo_rectangle (cr, x+1, y+1, 4, height-2);
pattern = cairo_pattern_create_linear (x, y, x+4, y);
- cairo_pattern_add_color_stop_rgba (pattern, 0.0, shadow.r, shadow.g, shadow.b, 0.24);
- cairo_pattern_add_color_stop_rgba (pattern, 1.0, shadow.r, shadow.g, shadow.b, 0.);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.0, &shadow, 0.24);
+ murrine_pattern_add_color_stop_rgba (pattern, 1.0, &shadow, 0.);
cairo_set_source (cr, pattern);
cairo_fill (cr);
cairo_pattern_destroy (pattern);
@@ -616,8 +616,8 @@
murrine_shade (fill, 0.95, &lower);
pattern = cairo_pattern_create_linear (0, 0, 0, height);
- cairo_pattern_add_color_stop_rgba (pattern, 0.0, fill->r, fill->g, fill->b, alpha);
- cairo_pattern_add_color_stop_rgba (pattern, 1.0, lower.r, lower.g, lower.b, alpha);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.0, fill, alpha);
+ murrine_pattern_add_color_stop_rgba (pattern, 1.0, &lower, alpha);
cairo_set_source (cr, pattern);
cairo_fill (cr);
cairo_pattern_destroy (pattern);
@@ -632,8 +632,8 @@
murrine_shade (fill, 1.1, &low);
pattern = cairo_pattern_create_linear (0, 0, 0, height);
- cairo_pattern_add_color_stop_rgb (pattern, 0.0, top.r, top.g, top.b);
- cairo_pattern_add_color_stop_rgb (pattern, 1.0, low.r, low.g, low.b);
+ murrine_pattern_add_color_stop_rgb (pattern, 0.0, &top);
+ murrine_pattern_add_color_stop_rgb (pattern, 1.0, &low);
cairo_set_source (cr, pattern);
cairo_fill (cr);
cairo_pattern_destroy (pattern);
@@ -713,8 +713,8 @@
MurrineRGB lower;
murrine_shade (fill, 0.95, &lower);
pattern = cairo_pattern_create_linear (0, 0, 0, height);
- cairo_pattern_add_color_stop_rgb (pattern, 0.0, fill->r, fill->g, fill->b);
- cairo_pattern_add_color_stop_rgb (pattern, 1.0, lower.r, lower.g, lower.b);
+ murrine_pattern_add_color_stop_rgb (pattern, 0.0, fill);
+ murrine_pattern_add_color_stop_rgb (pattern, 1.0, &lower);
cairo_set_source (cr, pattern);
cairo_fill (cr);
cairo_pattern_destroy (pattern);
@@ -932,10 +932,10 @@
murrine_rounded_rectangle_closed (cr, 0, 0, width-1, height-1, widget->roundness, widget->corners);
- cairo_pattern_add_color_stop_rgb (pattern, 0.00, shade1.r, shade1.g, shade1.b);
- cairo_pattern_add_color_stop_rgb (pattern, 0.45, shade2.r, shade2.g, shade2.b);
- cairo_pattern_add_color_stop_rgb (pattern, 0.45, shade3.r, shade3.g, shade3.b);
- cairo_pattern_add_color_stop_rgb (pattern, 1.00, shade4.r, shade4.g, shade4.b);
+ murrine_pattern_add_color_stop_rgb (pattern, 0.00, &shade1);
+ murrine_pattern_add_color_stop_rgb (pattern, 0.45, &shade2);
+ murrine_pattern_add_color_stop_rgb (pattern, 0.45, &shade3);
+ murrine_pattern_add_color_stop_rgb (pattern, 1.00, &shade4);
cairo_set_source (cr, pattern);
cairo_fill (cr);
cairo_pattern_destroy (pattern);
@@ -965,10 +965,10 @@
murrine_rounded_rectangle_closed (cr, 1, 1, width-3, height-3, widget->roundness, widget->corners);
- cairo_pattern_add_color_stop_rgba (pattern, 0.00, shade1.r, shade1.g, shade1.b, 0.5);
- cairo_pattern_add_color_stop_rgba (pattern, 0.45, shade2.r, shade2.g, shade2.b, 0.5);
- cairo_pattern_add_color_stop_rgba (pattern, 0.45, shade3.r, shade3.g, shade3.b, 0.5);
- cairo_pattern_add_color_stop_rgba (pattern, 1.00, shade4.r, shade4.g, shade4.b, 0.5);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.00, &shade1, 0.5);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.45, &shade2, 0.5);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.45, &shade3, 0.5);
+ murrine_pattern_add_color_stop_rgba (pattern, 1.00, &shade4, 0.5);
cairo_set_source (cr, pattern);
cairo_stroke (cr);
cairo_pattern_destroy (pattern);
@@ -1003,10 +1003,10 @@
murrine_rounded_rectangle_closed (cr, 0, 0, width-1, height-1, widget->roundness, widget->corners);
- cairo_pattern_add_color_stop_rgb (pattern, 0.00, shade1.r, shade1.g, shade1.b);
- cairo_pattern_add_color_stop_rgb (pattern, 0.45, shade2.r, shade2.g, shade2.b);
- cairo_pattern_add_color_stop_rgb (pattern, 0.45, shade3.r, shade3.g, shade3.b);
- cairo_pattern_add_color_stop_rgb (pattern, 1.00, shade4.r, shade4.g, shade4.b);
+ murrine_pattern_add_color_stop_rgb (pattern, 0.00, &shade1);
+ murrine_pattern_add_color_stop_rgb (pattern, 0.45, &shade2);
+ murrine_pattern_add_color_stop_rgb (pattern, 0.45, &shade3);
+ murrine_pattern_add_color_stop_rgb (pattern, 1.00, &shade4);
cairo_set_source (cr, pattern);
cairo_fill (cr);
cairo_pattern_destroy (pattern);
@@ -1036,10 +1036,10 @@
murrine_rounded_rectangle_closed (cr, 1, 1, width-3, height-3, widget->roundness, widget->corners);
- cairo_pattern_add_color_stop_rgba (pattern, 0.00, shade1.r, shade1.g, shade1.b, 0.5);
- cairo_pattern_add_color_stop_rgba (pattern, 0.45, shade2.r, shade2.g, shade2.b, 0.5);
- cairo_pattern_add_color_stop_rgba (pattern, 0.45, shade3.r, shade3.g, shade3.b, 0.5);
- cairo_pattern_add_color_stop_rgb (pattern, 1.00, shade4.r, shade4.g, shade4.b);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.00, &shade1, 0.5);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.45, &shade2, 0.5);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.45, &shade3, 0.5);
+ murrine_pattern_add_color_stop_rgb (pattern, 1.00, &shade4);
cairo_set_source (cr, pattern);
cairo_stroke (cr);
cairo_pattern_destroy (pattern);
@@ -1160,8 +1160,8 @@
{
cairo_pattern_t *pattern;
pattern = cairo_pattern_create_linear (0.0, height-4.0, 0.0, height-1.0);
- cairo_pattern_add_color_stop_rgba (pattern, 0.0, shadow_header.r, shadow_header.g, shadow_header.b, 0.0);
- cairo_pattern_add_color_stop_rgb (pattern, 1.0, shadow_header.r, shadow_header.g, shadow_header.b);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.0, &shadow_header, 0.0);
+ murrine_pattern_add_color_stop_rgb (pattern, 1.0, &shadow_header);
cairo_set_source (cr, pattern);
cairo_pattern_destroy (pattern);
cairo_rectangle (cr, 0.0, height-4.0, width, 3.0);
Modified: trunk/src/murrine_draw_rgba.c
==============================================================================
--- trunk/src/murrine_draw_rgba.c (original)
+++ trunk/src/murrine_draw_rgba.c Tue Sep 30 00:27:29 2008
@@ -221,16 +221,16 @@
cairo_rectangle (cr, xos+1, yos+1, width-(xos*2)-2, 3);
pattern = cairo_pattern_create_linear (xos+1, yos+1, xos+1, yos+4);
- cairo_pattern_add_color_stop_rgba (pattern, 0.0, shadow.r, shadow.g, shadow.b, 0.58);
- cairo_pattern_add_color_stop_rgba (pattern, 1.0, shadow.r, shadow.g, shadow.b, 0.0);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.0, &shadow, 0.58);
+ murrine_pattern_add_color_stop_rgba (pattern, 1.0, &shadow, 0.0);
cairo_set_source (cr, pattern);
cairo_fill (cr);
cairo_pattern_destroy (pattern);
cairo_rectangle (cr, xos+1, yos+1, 3, height-(yos*2)-2);
pattern = cairo_pattern_create_linear (xos+1, yos+1, xos+4, yos+1);
- cairo_pattern_add_color_stop_rgba (pattern, 0.0, shadow.r, shadow.g, shadow.b, 0.58);
- cairo_pattern_add_color_stop_rgba (pattern, 1.0, shadow.r, shadow.g, shadow.b, 0.0);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.0, &shadow, 0.58);
+ murrine_pattern_add_color_stop_rgba (pattern, 1.0, &shadow, 0.0);
cairo_set_source (cr, pattern);
cairo_fill (cr);
cairo_pattern_destroy (pattern);
@@ -415,8 +415,8 @@
/* Top shadow */
cairo_rectangle (cr, x+1, y+1, width-2, 4);
pattern = cairo_pattern_create_linear (x, y, x, y+4);
- cairo_pattern_add_color_stop_rgba (pattern, 0.0, shadow.r, shadow.g, shadow.b, 0.26);
- cairo_pattern_add_color_stop_rgba (pattern, 1.0, shadow.r, shadow.g, shadow.b, 0.);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.0, &shadow, 0.26);
+ murrine_pattern_add_color_stop_rgba (pattern, 1.0, &shadow, 0.0);
cairo_set_source (cr, pattern);
cairo_fill (cr);
cairo_pattern_destroy (pattern);
@@ -424,8 +424,8 @@
/* Left shadow */
cairo_rectangle (cr, x+1, y+1, 4, height-2);
pattern = cairo_pattern_create_linear (x, y, x+4, y);
- cairo_pattern_add_color_stop_rgba (pattern, 0.0, shadow.r, shadow.g, shadow.b, 0.26);
- cairo_pattern_add_color_stop_rgba (pattern, 1.0, shadow.r, shadow.g, shadow.b, 0.);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.0, &shadow, 0.26);
+ murrine_pattern_add_color_stop_rgba (pattern, 1.0, &shadow, 0.0);
cairo_set_source (cr, pattern);
cairo_fill (cr);
cairo_pattern_destroy (pattern);
@@ -530,15 +530,9 @@
cairo_pattern_t *pattern;
pattern = cairo_pattern_create_linear (0, 0, width, 0);
- cairo_pattern_add_color_stop_rgba (pattern, 0.0, fill->r,
- fill->g,
- fill->b, MENUBAR_OPACITY);
- cairo_pattern_add_color_stop_rgba (pattern, 0.5, fill->r,
- fill->g,
- fill->b, (MENUBAR_OPACITY-0.04));
- cairo_pattern_add_color_stop_rgba (pattern, 1.0, fill->r,
- fill->g,
- fill->b, MENUBAR_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.0, fill, MENUBAR_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.5, fill, (MENUBAR_OPACITY-0.04));
+ murrine_pattern_add_color_stop_rgba (pattern, 1.0, fill, MENUBAR_OPACITY);
cairo_set_source (cr, pattern);
cairo_rectangle (cr, 0, 0, width, height);
cairo_fill (cr);
@@ -563,8 +557,8 @@
murrine_shade (fill, 0.95, &lower);
pattern = cairo_pattern_create_linear (0, 0, 0, height);
- cairo_pattern_add_color_stop_rgba (pattern, 0.0, fill->r, fill->g, fill->b, MENUBAR_OPACITY);
- cairo_pattern_add_color_stop_rgba (pattern, 1.0, lower.r, lower.g, lower.b, MENUBAR_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.0, fill, MENUBAR_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pattern, 1.0, &lower, MENUBAR_OPACITY);
cairo_set_source (cr, pattern);
cairo_fill (cr);
cairo_pattern_destroy (pattern);
@@ -579,8 +573,8 @@
murrine_shade (fill, 0.9, &top);
murrine_shade (fill, 1.1, &low);
pattern = cairo_pattern_create_linear (0, 0, 0, height);
- cairo_pattern_add_color_stop_rgba (pattern, 0.0, top.r, top.g, top.b, MENUBAR_STRIPED_OPACITY);
- cairo_pattern_add_color_stop_rgba (pattern, 1.0, low.r, low.g, low.b, MENUBAR_STRIPED_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.0, &top, MENUBAR_STRIPED_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pattern, 1.0, &low, MENUBAR_STRIPED_OPACITY);
cairo_set_source (cr, pattern);
cairo_fill (cr);
@@ -668,8 +662,8 @@
MurrineRGB lower;
murrine_shade (fill, 0.95, &lower);
pattern = cairo_pattern_create_linear (0, 0, 0, height);
- cairo_pattern_add_color_stop_rgba (pattern, 0.0, fill->r, fill->g, fill->b, TOOLBAR_OPACITY);
- cairo_pattern_add_color_stop_rgba (pattern, 1.0, lower.r, lower.g, lower.b, TOOLBAR_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.0, fill, TOOLBAR_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pattern, 1.0, &lower, TOOLBAR_OPACITY);
cairo_set_source (cr, pattern);
cairo_fill (cr);
cairo_pattern_destroy (pattern);
@@ -938,10 +932,10 @@
murrine_rounded_rectangle_closed (cr, 0, 0, width-1, height-1, widget->roundness, widget->corners);
- cairo_pattern_add_color_stop_rgba (pattern, 0.00, shade1.r, shade1.g, shade1.b, NOTEBOOK_OPACITY);
- cairo_pattern_add_color_stop_rgba (pattern, 0.45, shade2.r, shade2.g, shade2.b, NOTEBOOK_OPACITY);
- cairo_pattern_add_color_stop_rgba (pattern, 0.45, shade3.r, shade3.g, shade3.b, NOTEBOOK_OPACITY);
- cairo_pattern_add_color_stop_rgba (pattern, 1.00, shade4.r, shade4.g, shade4.b, NOTEBOOK_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.00, &shade1, NOTEBOOK_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.45, &shade2, NOTEBOOK_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.45, &shade3, NOTEBOOK_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pattern, 1.00, &shade4, NOTEBOOK_OPACITY);
cairo_set_source (cr, pattern);
cairo_fill (cr);
cairo_pattern_destroy (pattern);
@@ -973,10 +967,10 @@
murrine_rounded_rectangle_closed (cr, 1, 1, width-3, height-3, widget->roundness, widget->corners);
- cairo_pattern_add_color_stop_rgba (pattern, 0.00, shade1.r, shade1.g, shade1.b, 0.5*NOTEBOOK_OPACITY);
- cairo_pattern_add_color_stop_rgba (pattern, 0.45, shade2.r, shade2.g, shade2.b, 0.5*NOTEBOOK_OPACITY);
- cairo_pattern_add_color_stop_rgba (pattern, 0.45, shade3.r, shade3.g, shade3.b, 0.5*NOTEBOOK_OPACITY);
- cairo_pattern_add_color_stop_rgba (pattern, 1.00, shade4.r, shade4.g, shade4.b, 0.5*NOTEBOOK_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.00, &shade1, 0.5*NOTEBOOK_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.45, &shade2, 0.5*NOTEBOOK_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.45, &shade3, 0.5*NOTEBOOK_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pattern, 1.00, &shade4, 0.5*NOTEBOOK_OPACITY);
cairo_set_source (cr, pattern);
cairo_stroke (cr);
cairo_pattern_destroy (pattern);
@@ -1011,10 +1005,10 @@
murrine_rounded_rectangle_closed (cr, 0, 0, width-1, height-1, widget->roundness, widget->corners);
- cairo_pattern_add_color_stop_rgba (pattern, 0.00, shade1.r, shade1.g, shade1.b, NOTEBOOK_OPACITY);
- cairo_pattern_add_color_stop_rgba (pattern, 0.45, shade2.r, shade2.g, shade2.b, NOTEBOOK_OPACITY);
- cairo_pattern_add_color_stop_rgba (pattern, 0.45, shade3.r, shade3.g, shade3.b, NOTEBOOK_OPACITY);
- cairo_pattern_add_color_stop_rgba (pattern, 1.00, shade4.r, shade4.g, shade4.b, NOTEBOOK_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.00, &shade1, NOTEBOOK_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.45, &shade2, NOTEBOOK_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.45, &shade3, NOTEBOOK_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pattern, 1.00, &shade4, NOTEBOOK_OPACITY);
cairo_set_source (cr, pattern);
cairo_fill (cr);
cairo_pattern_destroy (pattern);
@@ -1046,10 +1040,10 @@
murrine_rounded_rectangle_closed (cr, 1, 1, width-3, height-3, widget->roundness, widget->corners);
- cairo_pattern_add_color_stop_rgba (pattern, 0.00, shade1.r, shade1.g, shade1.b, 0.5*NOTEBOOK_OPACITY);
- cairo_pattern_add_color_stop_rgba (pattern, 0.45, shade2.r, shade2.g, shade2.b, 0.5*NOTEBOOK_OPACITY);
- cairo_pattern_add_color_stop_rgba (pattern, 0.45, shade3.r, shade3.g, shade3.b, 0.5*NOTEBOOK_OPACITY);
- cairo_pattern_add_color_stop_rgba (pattern, 1.00, shade4.r, shade4.g, shade4.b, 0.5*NOTEBOOK_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.00, &shade1, 0.5*NOTEBOOK_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.45, &shade2, 0.5*NOTEBOOK_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.45, &shade3, 0.5*NOTEBOOK_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pattern, 1.00, &shade4, 0.5*NOTEBOOK_OPACITY);
cairo_set_source (cr, pattern);
cairo_stroke (cr);
cairo_pattern_destroy (pattern);
Modified: trunk/src/murrine_style.c
==============================================================================
--- trunk/src/murrine_style.c (original)
+++ trunk/src/murrine_style.c Tue Sep 30 00:27:29 2008
@@ -292,15 +292,9 @@
cairo_pattern_t *pattern;
pattern = cairo_pattern_create_linear (0, 0, width, 0);
- cairo_pattern_add_color_stop_rgba (pattern, 0.0, colors->bg[0].r,
- colors->bg[0].g,
- colors->bg[0].b, WINDOW_OPACITY);
- cairo_pattern_add_color_stop_rgba (pattern, 0.5, colors->bg[0].r,
- colors->bg[0].g,
- colors->bg[0].b, (WINDOW_OPACITY-0.04));
- cairo_pattern_add_color_stop_rgba (pattern, 1.0, colors->bg[0].r,
- colors->bg[0].g,
- colors->bg[0].b, WINDOW_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.0, &colors->bg[0], WINDOW_OPACITY);
+ murrine_pattern_add_color_stop_rgba (pattern, 0.5, &colors->bg[0], (WINDOW_OPACITY-0.04));
+ murrine_pattern_add_color_stop_rgba (pattern, 1.0, &colors->bg[0], WINDOW_OPACITY);
cairo_set_source (cr, pattern);
cairo_rectangle (cr, 0, 0, width, height);
cairo_fill (cr);
@@ -695,13 +689,6 @@
cr = murrine_begin_paint (window, area);
- if ((width == -1) && (height == -1))
- gdk_window_get_size (window, &width, &height);
- else if (width == -1)
- gdk_window_get_size (window, &width, NULL);
- else if (height == -1)
- gdk_window_get_size (window, NULL, &height);
-
if (DETAIL ("menubar") &&
!(widget && (murrine_is_panel_widget (widget->parent))))
{
@@ -802,14 +789,6 @@
else
params.corners = MRN_CORNER_NONE;
- /* Seriously, why can't non-gtk-apps at least try to be decent citizens?
- Take this fucking OpenOffice.org 1.9 for example. The morons responsible
- for this utter piece of crap gave the clip size wrong values! :'( */
-/* cairo_reset_clip (cr);
- cairo_rectangle (cr, x+ 0.5, y+ 0.5, 10, 10);
- cairo_clip (cr);
- cairo_new_path (cr);
-*/
if (params.xthickness > 1)
{
if (params.ltr)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
