murrine r159 - in trunk: . src
- From: acimitan svn gnome org
- To: svn-commits-list gnome org
- Subject: murrine r159 - in trunk: . src
- Date: Wed, 18 Mar 2009 00:38:42 +0000 (UTC)
Author: acimitan
Date: Wed Mar 18 00:38:42 2009
New Revision: 159
URL: http://svn.gnome.org/viewvc/murrine?rev=159&view=rev
Log:
2009-03-18 Andrea Cimitan <andrea cimitan gmail com>
* src/cairo-support.c (clearlooks_rounded_rectangle),
(murrine_draw_lightborder):
* src/murrine_draw.c (murrine_draw_inset),
(murrine_draw_highlight_and_shade):
* src/murrine_draw_rgba.c (murrine_draw_inset),
(murrine_draw_highlight_and_shade):
High roundness values are finally fixed!
Try roundness = 10000000 (:-D), it should work.
Modified:
trunk/ChangeLog
trunk/src/cairo-support.c
trunk/src/murrine_draw.c
trunk/src/murrine_draw_rgba.c
Modified: trunk/src/cairo-support.c
==============================================================================
--- trunk/src/cairo-support.c (original)
+++ trunk/src/cairo-support.c Wed Mar 18 00:38:42 2009
@@ -411,6 +411,8 @@
cairo_rectangle (cr, x, y, w, h);
return;
}
+
+ radius = MIN (radius, MIN (w/2.0, h/2.0));
if (corners & MRN_CORNER_TOPLEFT)
cairo_move_to (cr, x+radius, y);
@@ -620,6 +622,7 @@
cairo_pattern_t *pat;
MurrineRGB shade1, shade2, shade3, shade4;
double alpha_value = mrn_gradient.use_rgba ? mrn_gradient.rgba_opacity : 1.0;
+ radius = MIN (radius, MIN ((double)width/2.0, (double)height/2.0));
murrine_shade (highlight_color, mrn_gradient.gradient_shades[0], &shade1);
murrine_shade (highlight_color, mrn_gradient.gradient_shades[1], &shade2);
Modified: trunk/src/murrine_draw.c
==============================================================================
--- trunk/src/murrine_draw.c (original)
+++ trunk/src/murrine_draw.c Wed Mar 18 00:38:42 2009
@@ -32,10 +32,9 @@
double x, double y, double w, double h,
double radius, uint8 corners)
{
- MurrineRGB shadow;
- MurrineRGB highlight;
+ MurrineRGB shadow, highlight;
+ radius = MIN (radius, MIN (w/2.0, h/2.0));
- /* not really sure of shading ratios... we will think */
murrine_shade (bg_color, 0.74, &shadow);
murrine_shade (bg_color, 1.3, &highlight);
@@ -95,6 +94,7 @@
double y = 1.0;
width -= 3;
height -= 3;
+ radius = MIN (radius, MIN ((double)width/2.0, (double)height/2.0));
if (radius < 0)
radius = 0;
Modified: trunk/src/murrine_draw_rgba.c
==============================================================================
--- trunk/src/murrine_draw_rgba.c (original)
+++ trunk/src/murrine_draw_rgba.c Wed Mar 18 00:38:42 2009
@@ -33,6 +33,7 @@
double radius, uint8 corners)
{
MurrineRGB highlight, shadow;
+ radius = MIN (radius, MIN (w/2.0, h/2.0));
murrine_shade (bg_color, 1.15, &highlight);
murrine_shade (bg_color, 0.4, &shadow);
@@ -93,6 +94,7 @@
double y = 1.0;
width -= 3;
height -= 3;
+ radius = MIN (radius, MIN ((double)width/2.0, (double)height/2.0));
if (radius < 0)
radius = 0;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]