[murrine] Draw an inset instead a shadow in insensitive radio and check
- From: Andrea Cimitan <acimitan src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [murrine] Draw an inset instead a shadow in insensitive radio and check
- Date: Wed, 9 Dec 2009 09:54:17 +0000 (UTC)
commit 4070e3ea9ff660b4073cd1ad8952d7a9ff19379a
Author: Andrea Cimitan <andrea cimitan gmail com>
Date: Wed Dec 9 10:53:46 2009 +0100
Draw an inset instead a shadow in insensitive radio and check
src/murrine_draw.c | 8 ++------
src/murrine_draw_rgba.c | 8 ++------
2 files changed, 4 insertions(+), 12 deletions(-)
---
diff --git a/src/murrine_draw.c b/src/murrine_draw.c
index fe30358..e7dd0a4 100644
--- a/src/murrine_draw.c
+++ b/src/murrine_draw.c
@@ -2243,8 +2243,6 @@ murrine_draw_radiobutton (cairo_t *cr,
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);
- mrn_gradient_new.shadow_shades[0] = murrine_get_decreased_shade (widget->mrn_gradient.shadow_shades[0], 2.0);
- mrn_gradient_new.shadow_shades[1] = murrine_get_decreased_shade (widget->mrn_gradient.shadow_shades[1], 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);
}
@@ -2263,7 +2261,7 @@ murrine_draw_radiobutton (cairo_t *cr,
if (widget->xthickness > 2 && widget->ythickness > 2)
{
- if (widget->reliefstyle > 1 && draw_bullet)
+ if (widget->reliefstyle > 1 && draw_bullet && widget->state_type != GTK_STATE_INSENSITIVE)
{
MurrineRGB shadow;
murrine_shade (border, 0.9, &shadow);
@@ -2371,8 +2369,6 @@ murrine_draw_checkbox (cairo_t *cr,
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);
- mrn_gradient_new.shadow_shades[0] = murrine_get_decreased_shade (widget->mrn_gradient.shadow_shades[0], 2.0);
- mrn_gradient_new.shadow_shades[1] = murrine_get_decreased_shade (widget->mrn_gradient.shadow_shades[1], 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);
}
@@ -2391,7 +2387,7 @@ murrine_draw_checkbox (cairo_t *cr,
if (widget->xthickness > 2 && widget->ythickness > 2)
{
- if (widget->reliefstyle > 1 && draw_bullet)
+ if (widget->reliefstyle > 1 && draw_bullet && widget->state_type != GTK_STATE_INSENSITIVE)
{
MurrineRGB shadow;
murrine_shade (border, 0.9, &shadow);
diff --git a/src/murrine_draw_rgba.c b/src/murrine_draw_rgba.c
index 7e1c02c..b79d168 100644
--- a/src/murrine_draw_rgba.c
+++ b/src/murrine_draw_rgba.c
@@ -1627,8 +1627,6 @@ murrine_rgba_draw_radiobutton (cairo_t *cr,
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);
- mrn_gradient_new.shadow_shades[0] = murrine_get_decreased_shade (widget->mrn_gradient.shadow_shades[0], 2.0);
- mrn_gradient_new.shadow_shades[1] = murrine_get_decreased_shade (widget->mrn_gradient.shadow_shades[1], 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);
}
@@ -1649,7 +1647,7 @@ murrine_rgba_draw_radiobutton (cairo_t *cr,
if (widget->xthickness > 2 && widget->ythickness > 2)
{
- if (widget->reliefstyle > 1 && draw_bullet)
+ if (widget->reliefstyle > 1 && draw_bullet && widget->state_type != GTK_STATE_INSENSITIVE)
{
MurrineRGB shadow;
murrine_shade (&border, 0.9, &shadow);
@@ -1757,8 +1755,6 @@ murrine_rgba_draw_checkbox (cairo_t *cr,
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);
- mrn_gradient_new.shadow_shades[0] = murrine_get_decreased_shade (widget->mrn_gradient.shadow_shades[0], 2.0);
- mrn_gradient_new.shadow_shades[1] = murrine_get_decreased_shade (widget->mrn_gradient.shadow_shades[1], 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);
}
@@ -1779,7 +1775,7 @@ murrine_rgba_draw_checkbox (cairo_t *cr,
if (widget->xthickness > 2 && widget->ythickness > 2)
{
- if (widget->reliefstyle > 1 && draw_bullet)
+ if (widget->reliefstyle > 1 && draw_bullet && widget->state_type != GTK_STATE_INSENSITIVE)
{
MurrineRGB shadow;
murrine_shade (&border, 0.9, &shadow);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]