Commit 671af3a3 authored by Claes Sjofors's avatar Claes Sjofors

Ge, AnalogColor.Border implemented in java

parent 977f2ae9
...@@ -3898,14 +3898,23 @@ public class Dyn { ...@@ -3898,14 +3898,23 @@ public class Dyn {
if ( (dyn.total_dyn_type1 & Dyn.mDynType1_Tone) != 0) { if ( (dyn.total_dyn_type1 & Dyn.mDynType1_Tone) != 0) {
if ( set_color) { if ( set_color) {
if ( color < Glow.eDrawTone__) if ( color >= Glow.eDrawTone__) {
object.setColorTone( color); if ( border == 0)
else
object.setFillColor( color); object.setFillColor( color);
else
object.setBorderColor( color);
}
else
object.setColorTone( color);
dyn.ignoreColor = true; dyn.ignoreColor = true;
} }
else { else {
if ( color >= Glow.eDrawTone__) {
if ( border == 0)
object.resetFillColor(); object.resetFillColor();
else
object.resetBorderColor();
}
object.resetColorTone(); object.resetColorTone();
dyn.resetColor = true; dyn.resetColor = true;
} }
...@@ -3913,11 +3922,17 @@ public class Dyn { ...@@ -3913,11 +3922,17 @@ public class Dyn {
} }
else { else {
if ( set_color) { if ( set_color) {
if ( border == 0)
object.setFillColor( color); object.setFillColor( color);
else
object.setBorderColor( color);
dyn.ignoreColor = true; dyn.ignoreColor = true;
} }
else { else {
if ( border == 0)
object.resetFillColor(); object.resetFillColor();
else
object.resetBorderColor();
dyn.resetColor = true; dyn.resetColor = true;
} }
dyn.repaintNow = true; dyn.repaintNow = true;
......
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