Commit d62ed5cd authored by claes's avatar claes

No gradient on red error color

parent 630d3064
/* /*
* Proview $Id: glow_growarc.cpp,v 1.8 2008-11-20 10:30:44 claes Exp $ * Proview $Id: glow_growarc.cpp,v 1.9 2008-12-01 16:31:29 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -701,7 +701,7 @@ void GrowArc::draw( GlowWind *w, GlowTransform *t, int highlight, int hot, void ...@@ -701,7 +701,7 @@ void GrowArc::draw( GlowWind *w, GlowTransform *t, int highlight, int hot, void
grad = ((GrowNode *)node)->gradient; grad = ((GrowNode *)node)->gradient;
if ( !display_shadow || shadow_width == 0 || angle2 != 360) { if ( !display_shadow || shadow_width == 0 || angle2 != 360) {
if ( grad == glow_eGradient_No) if ( grad == glow_eGradient_No || fillcolor == glow_eDrawType_ColorRed)
ctx->gdraw->fill_arc( w, ll_x, ll_y, ur_x - ll_x, ur_y - ll_y, ctx->gdraw->fill_arc( w, ll_x, ll_y, ur_x - ll_x, ur_y - ll_y,
angle1 - rot, angle2, fillcolor, 0); angle1 - rot, angle2, fillcolor, 0);
else { else {
...@@ -724,7 +724,7 @@ void GrowArc::draw( GlowWind *w, GlowTransform *t, int highlight, int hot, void ...@@ -724,7 +724,7 @@ void GrowArc::draw( GlowWind *w, GlowTransform *t, int highlight, int hot, void
if ( relief == glow_eRelief_Down) if ( relief == glow_eRelief_Down)
drawtype_incr = -shadow_contrast; drawtype_incr = -shadow_contrast;
if ( grad == glow_eGradient_No) { if ( grad == glow_eGradient_No || fillcolor == glow_eDrawType_ColorRed) {
// Draw light shadow // Draw light shadow
drawtype = ctx->shift_drawtype( fillcolor, -drawtype_incr, (GrowNode *)colornode); drawtype = ctx->shift_drawtype( fillcolor, -drawtype_incr, (GrowNode *)colornode);
......
/* /*
* Proview $Id: glow_growpolyline.cpp,v 1.10 2008-11-20 10:30:44 claes Exp $ * Proview $Id: glow_growpolyline.cpp,v 1.11 2008-12-01 16:31:29 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -382,7 +382,7 @@ void GrowPolyLine::draw( GlowWind *w, GlowTransform *t, int highlight, int hot, ...@@ -382,7 +382,7 @@ void GrowPolyLine::draw( GlowWind *w, GlowTransform *t, int highlight, int hot,
else if ( fill_eq_shadow && node && ((GrowNode *)node)->shadow) else if ( fill_eq_shadow && node && ((GrowNode *)node)->shadow)
drawtype = ctx->shift_drawtype( drawtype, shadow_contrast, drawtype = ctx->shift_drawtype( drawtype, shadow_contrast,
(GrowNode *)colornode); (GrowNode *)colornode);
if ( grad == glow_eGradient_No) if ( grad == glow_eGradient_No || drawtype == glow_eDrawType_ColorRed)
ctx->gdraw->fill_polyline( w, points, a_points.a_size, drawtype, 0); ctx->gdraw->fill_polyline( w, points, a_points.a_size, drawtype, 0);
else { else {
glow_eDrawType f1, f2; glow_eDrawType f1, f2;
......
/* /*
* Proview $Id: glow_growrect.cpp,v 1.14 2008-11-20 10:30:44 claes Exp $ * Proview $Id: glow_growrect.cpp,v 1.15 2008-12-01 16:31:29 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -782,7 +782,7 @@ void GrowRect::draw( GlowWind *w, GlowTransform *t, int highlight, int hot, void ...@@ -782,7 +782,7 @@ void GrowRect::draw( GlowWind *w, GlowTransform *t, int highlight, int hot, void
} }
if ( fill) { if ( fill) {
if ( display_shadow && ish != 0) { if ( display_shadow && ish != 0) {
if ( grad == glow_eGradient_No) if ( grad == glow_eGradient_No || fillcolor == glow_eDrawType_ColorRed)
ctx->gdraw->fill_rect( w, ll_x + ish, ll_y + ish, ur_x - ll_x - 2 * ish, ur_y - ll_y - 2 * ish, ctx->gdraw->fill_rect( w, ll_x + ish, ll_y + ish, ur_x - ll_x - 2 * ish, ur_y - ll_y - 2 * ish,
fillcolor); fillcolor);
else { else {
...@@ -806,7 +806,7 @@ void GrowRect::draw( GlowWind *w, GlowTransform *t, int highlight, int hot, void ...@@ -806,7 +806,7 @@ void GrowRect::draw( GlowWind *w, GlowTransform *t, int highlight, int hot, void
} }
} }
else { else {
if ( grad == glow_eGradient_No) if ( grad == glow_eGradient_No || fillcolor == glow_eDrawType_ColorRed)
ctx->gdraw->fill_rect( w, ll_x, ll_y, ur_x - ll_x, ur_y - ll_y, fillcolor); ctx->gdraw->fill_rect( w, ll_x, ll_y, ur_x - ll_x, ur_y - ll_y, fillcolor);
else { else {
glow_eDrawType f1, f2; glow_eDrawType f1, f2;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment