Skip to content

P
proview
Commit d5de7cd1 authored by Claes Sjofors's avatar Claes Sjofors
Browse files
Options

Ge fix in rectangle bg gradient

parent 19d9b0af
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 12 deletions
java/jpwr/jopg/src/GrowRect.java
View file @ d5de7cd1
...@@ -423,7 +423,7 @@ public class GrowRect extends GlowArrayElem { ...@@ -423,7 +423,7 @@ public class GrowRect extends GlowArrayElem {
drawtype); drawtype);
} }
else { else {
int f1, f2; int f0, f1, f2;
double rotation; double rotation;
if ( t != null) if ( t != null)
rotation = trf.rot( t); rotation = trf.rot( t);
...@@ -431,21 +431,23 @@ public class GrowRect extends GlowArrayElem { ...@@ -431,21 +431,23 @@ public class GrowRect extends GlowArrayElem {
rotation = trf.rot(); rotation = trf.rot();
if ( bgcolor_gradient != 0 && background_drawtype != Glow.eDrawType_No) { if ( bgcolor_gradient != 0 && background_drawtype != Glow.eDrawType_No) {
f2 = GlowColor.shift_drawtype( fillcolor, -gradient_contrast/2 + chot, null); f2 = fillcolor;
f1 = GlowColor.get_drawtype( background_drawtype, Glow.eDrawType_FillHighlight, f1 = GlowColor.get_drawtype( background_drawtype, Glow.eDrawType_FillHighlight,
highlight, colornode, 1, 0); highlight, colornode, 1, 0);
f1 = GlowColor.shift_drawtype( f1, (int)((float)(gradient_contrast)/2+0.6) + chot, null); f0 = f1;
} }
else if ( gradient_contrast >= 0) { else if ( gradient_contrast >= 0) {
f2 = GlowColor.shift_drawtype( fillcolor, -gradient_contrast/2 + chot, null); f2 = GlowColor.shift_drawtype( fillcolor, -gradient_contrast/2 + chot, null);
f1 = GlowColor.shift_drawtype( fillcolor, (int)((float)(gradient_contrast)/2+0.6) + chot, null); f1 = GlowColor.shift_drawtype( fillcolor, (int)((float)(gradient_contrast)/2+0.6) + chot, null);
f0 = fillcolor;
} }
else { else {
f2 = GlowColor.shift_drawtype( fillcolor, -(int)((float)(gradient_contrast)/2-0.6) + chot, null); f2 = GlowColor.shift_drawtype( fillcolor, -(int)((float)(gradient_contrast)/2-0.6) + chot, null);
f1 = GlowColor.shift_drawtype( fillcolor, gradient_contrast/2 + chot, null); f1 = GlowColor.shift_drawtype( fillcolor, gradient_contrast/2 + chot, null);
f0 = fillcolor;
} }
cmn.gdraw.gradient_fill_rect( ll_x + ish, ll_y + ish, ur_x - ll_x - 2 * ish, ur_y - ll_y - 2 * ish, cmn.gdraw.gradient_fill_rect( ll_x + ish, ll_y + ish, ur_x - ll_x - 2 * ish, ur_y - ll_y - 2 * ish,
fillcolor, f1, f2, cmn.gdraw.gradient_rotate( rotation, grad)); f0, f1, f2, cmn.gdraw.gradient_rotate( rotation, grad));
} }
} }
else { else {
...@@ -457,7 +459,7 @@ public class GrowRect extends GlowArrayElem { ...@@ -457,7 +459,7 @@ public class GrowRect extends GlowArrayElem {
cmn.gdraw.fill_rect( ll_x, ll_y, ur_x - ll_x, ur_y - ll_y, drawtype); cmn.gdraw.fill_rect( ll_x, ll_y, ur_x - ll_x, ur_y - ll_y, drawtype);
} }
else { else {
int f1, f2; int f0, f1, f2;
double rotation; double rotation;
if ( t!= null) if ( t!= null)
rotation = trf.rot( t); rotation = trf.rot( t);
...@@ -467,16 +469,19 @@ public class GrowRect extends GlowArrayElem { ...@@ -467,16 +469,19 @@ public class GrowRect extends GlowArrayElem {
f2 = fillcolor; f2 = fillcolor;
f1 = GlowColor.get_drawtype( background_drawtype, Glow.eDrawType_FillHighlight, f1 = GlowColor.get_drawtype( background_drawtype, Glow.eDrawType_FillHighlight,
highlight, colornode, 1, 0); highlight, colornode, 1, 0);
f0 = f1;
} }
else if ( gradient_contrast >= 0) { else if ( gradient_contrast >= 0) {
f2 = GlowColor.shift_drawtype( fillcolor, -gradient_contrast/2 + chot, null); f2 = GlowColor.shift_drawtype( fillcolor, -gradient_contrast/2 + chot, null);
f1 = GlowColor.shift_drawtype( fillcolor, (int)((float)(gradient_contrast)/2+0.6) + chot, null); f1 = GlowColor.shift_drawtype( fillcolor, (int)((float)(gradient_contrast)/2+0.6) + chot, null);
f0 = fillcolor;
} }
else { else {
f2 = GlowColor.shift_drawtype( fillcolor, -(int)((float)(gradient_contrast)/2-0.6) + chot, null); f2 = GlowColor.shift_drawtype( fillcolor, -(int)((float)(gradient_contrast)/2-0.6) + chot, null);
f1 = GlowColor.shift_drawtype( fillcolor, gradient_contrast/2, null); f1 = GlowColor.shift_drawtype( fillcolor, gradient_contrast/2, null);
f0 = fillcolor;
} }
cmn.gdraw.gradient_fill_rect( ll_x, ll_y, ur_x - ll_x, ur_y - ll_y, fillcolor, f1, f2, cmn.gdraw.gradient_rotate( rotation, grad)); cmn.gdraw.gradient_fill_rect( ll_x, ll_y, ur_x - ll_x, ur_y - ll_y, f0, f1, f2, cmn.gdraw.gradient_rotate( rotation, grad));
} }
} }
} }
......
xtt/lib/glow/src/glow_growrect.cpp
View file @ d5de7cd1
...@@ -841,7 +841,7 @@ void GrowRect::draw( GlowWind *w, GlowTransform *t, int highlight, int hot, void ...@@ -841,7 +841,7 @@ void GrowRect::draw( GlowWind *w, GlowTransform *t, int highlight, int hot, void
drawtype); drawtype);
} }
else { else {
glow_eDrawType f1, f2; glow_eDrawType f0, f1, f2;
double rotation; double rotation;
if ( t) if ( t)
rotation = trf.rot( t); rotation = trf.rot( t);
...@@ -849,21 +849,23 @@ void GrowRect::draw( GlowWind *w, GlowTransform *t, int highlight, int hot, void ...@@ -849,21 +849,23 @@ void GrowRect::draw( GlowWind *w, GlowTransform *t, int highlight, int hot, void
rotation = trf.rot(); rotation = trf.rot();
if ( bgcolor_gradient && background_drawtype != glow_eDrawType_No) { if ( bgcolor_gradient && background_drawtype != glow_eDrawType_No) {
f2 = GlowColor::shift_drawtype( fillcolor, -gradient_contrast/2 + chot, 0); f2 = fillcolor;
f1 = ctx->get_drawtype( background_drawtype, glow_eDrawType_FillHighlight, f1 = ctx->get_drawtype( background_drawtype, glow_eDrawType_FillHighlight,
highlight, (GrowNode *)colornode, 1); highlight, (GrowNode *)colornode, 1);
f1 = GlowColor::shift_drawtype( f1, int(float(gradient_contrast)/2+0.6) + chot, 0); f0 = f1;
} }
else if ( gradient_contrast >= 0) { else if ( gradient_contrast >= 0) {
f2 = GlowColor::shift_drawtype( fillcolor, -gradient_contrast/2 + chot, 0); f2 = GlowColor::shift_drawtype( fillcolor, -gradient_contrast/2 + chot, 0);
f1 = GlowColor::shift_drawtype( fillcolor, int(float(gradient_contrast)/2+0.6) + chot, 0); f1 = GlowColor::shift_drawtype( fillcolor, int(float(gradient_contrast)/2+0.6) + chot, 0);
f0 = fillcolor;
} }
else { else {
f2 = GlowColor::shift_drawtype( fillcolor, -int(float(gradient_contrast)/2-0.6) + chot, 0); f2 = GlowColor::shift_drawtype( fillcolor, -int(float(gradient_contrast)/2-0.6) + chot, 0);
f1 = GlowColor::shift_drawtype( fillcolor, gradient_contrast/2 + chot, 0); f1 = GlowColor::shift_drawtype( fillcolor, gradient_contrast/2 + chot, 0);
f0 = fillcolor;
} }
ctx->gdraw->gradient_fill_rect( w, ll_x + ish, ll_y + ish, ur_x - ll_x - 2 * ish, ur_y - ll_y - 2 * ish, ctx->gdraw->gradient_fill_rect( w, ll_x + ish, ll_y + ish, ur_x - ll_x - 2 * ish, ur_y - ll_y - 2 * ish,
fillcolor, f1, f2, ctx->gdraw->gradient_rotate( rotation, grad)); f0, f1, f2, ctx->gdraw->gradient_rotate( rotation, grad));
} }
} }
else { else {
...@@ -875,7 +877,7 @@ void GrowRect::draw( GlowWind *w, GlowTransform *t, int highlight, int hot, void ...@@ -875,7 +877,7 @@ void GrowRect::draw( GlowWind *w, GlowTransform *t, int highlight, int hot, void
ctx->gdraw->fill_rect( w, ll_x, ll_y, ur_x - ll_x, ur_y - ll_y, drawtype); ctx->gdraw->fill_rect( w, ll_x, ll_y, ur_x - ll_x, ur_y - ll_y, drawtype);
} }
else { else {
glow_eDrawType f1, f2; glow_eDrawType f1, f2, f0;
double rotation; double rotation;
if ( t) if ( t)
rotation = trf.rot( t); rotation = trf.rot( t);
...@@ -885,16 +887,19 @@ void GrowRect::draw( GlowWind *w, GlowTransform *t, int highlight, int hot, void ...@@ -885,16 +887,19 @@ void GrowRect::draw( GlowWind *w, GlowTransform *t, int highlight, int hot, void
f2 = fillcolor; f2 = fillcolor;
f1 = ctx->get_drawtype( background_drawtype, glow_eDrawType_FillHighlight, f1 = ctx->get_drawtype( background_drawtype, glow_eDrawType_FillHighlight,
highlight, (GrowNode *)colornode, 1); highlight, (GrowNode *)colornode, 1);
f0 = f1;
} }
else if ( gradient_contrast >= 0) { else if ( gradient_contrast >= 0) {
f2 = GlowColor::shift_drawtype( fillcolor, -gradient_contrast/2 + chot, 0); f2 = GlowColor::shift_drawtype( fillcolor, -gradient_contrast/2 + chot, 0);
f1 = GlowColor::shift_drawtype( fillcolor, int(float(gradient_contrast)/2+0.6) + chot, 0); f1 = GlowColor::shift_drawtype( fillcolor, int(float(gradient_contrast)/2+0.6) + chot, 0);
f0 = fillcolor;
} }
else { else {
f2 = GlowColor::shift_drawtype( fillcolor, -int(float(gradient_contrast)/2-0.6) + chot, 0); f2 = GlowColor::shift_drawtype( fillcolor, -int(float(gradient_contrast)/2-0.6) + chot, 0);
f1 = GlowColor::shift_drawtype( fillcolor, gradient_contrast/2, 0); f1 = GlowColor::shift_drawtype( fillcolor, gradient_contrast/2, 0);
f0 = fillcolor;
} }
ctx->gdraw->gradient_fill_rect( w, ll_x, ll_y, ur_x - ll_x, ur_y - ll_y, fillcolor, f1, f2, ctx->gdraw->gradient_rotate( rotation, grad)); ctx->gdraw->gradient_fill_rect( w, ll_x, ll_y, ur_x - ll_x, ur_y - ll_y, f0, f1, f2, ctx->gdraw->gradient_rotate( rotation, grad));
} }
} }
} }
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7