From fd6d97f9fb9f4aef45296dfed1d3a960c55f1f03 Mon Sep 17 00:00:00 2001 From: Gerrit Grunwald Date: Thu, 31 May 2012 18:28:06 +0200 Subject: [PATCH] Fixed some minor problems with setting styles in the segment gauges --- .../control/skin/DotMatrixSegmentSkin.java | 6 ++++ .../internal/scene/control/skin/LedSkin.java | 1 + .../scene/control/skin/SevenSegmentSkin.java | 28 +++++++++++-------- .../control/skin/SixteenSegmentSkin.java | 7 +++++ 4 files changed, 31 insertions(+), 11 deletions(-) diff --git a/src/main/java/jfxtras/labs/internal/scene/control/skin/DotMatrixSegmentSkin.java b/src/main/java/jfxtras/labs/internal/scene/control/skin/DotMatrixSegmentSkin.java index b1902280d..9124c7b3b 100644 --- a/src/main/java/jfxtras/labs/internal/scene/control/skin/DotMatrixSegmentSkin.java +++ b/src/main/java/jfxtras/labs/internal/scene/control/skin/DotMatrixSegmentSkin.java @@ -175,13 +175,16 @@ public void updateCharacter() { for (DotMatrixSegment.Dot dot : dotMap.keySet()) { if (control.getDotMapping().containsKey(ASCII)) { if (control.getDotMapping().get(ASCII).contains(dot)) { + dotMap.get(dot).getStyleClass().clear(); dotMap.get(dot).getStyleClass().add(ON_STYLE); dotMap.get(dot).setEffect(INNER_SHADOW); } else { + dotMap.get(dot).getStyleClass().clear(); dotMap.get(dot).getStyleClass().add("dot-matrix-segment-off"); dotMap.get(dot).setEffect(null); } } else { + dotMap.get(dot).getStyleClass().clear(); dotMap.get(dot).getStyleClass().add("dot-matrix-segment-off"); dotMap.get(dot).setEffect(null); } @@ -190,13 +193,16 @@ public void updateCharacter() { for (DotMatrixSegment.Dot dot : dotMap.keySet()) { if (control.getCustomDotMapping().containsKey(ASCII)) { if (control.getCustomDotMapping().get(ASCII).contains(dot)) { + dotMap.get(dot).getStyleClass().clear(); dotMap.get(dot).getStyleClass().add(ON_STYLE); dotMap.get(dot).setEffect(INNER_SHADOW); } else { + dotMap.get(dot).getStyleClass().clear(); dotMap.get(dot).getStyleClass().add("dot-matrix-segment-off"); dotMap.get(dot).setEffect(null); } } else { + dotMap.get(dot).getStyleClass().clear(); dotMap.get(dot).getStyleClass().add("dot-matrix-segment-off"); dotMap.get(dot).setEffect(null); } diff --git a/src/main/java/jfxtras/labs/internal/scene/control/skin/LedSkin.java b/src/main/java/jfxtras/labs/internal/scene/control/skin/LedSkin.java index 69782aa94..411b63db8 100644 --- a/src/main/java/jfxtras/labs/internal/scene/control/skin/LedSkin.java +++ b/src/main/java/jfxtras/labs/internal/scene/control/skin/LedSkin.java @@ -227,6 +227,7 @@ public final void drawLed() { LED_OFF.getStyleClass().add("fx-led-off"); LED_OFF.setStroke(null); + ledOn.getStyleClass().clear(); ledOn.getStyleClass().add("fx-led-on"); ledOn.setStroke(null); ledOn.setVisible(control.isOn()); diff --git a/src/main/java/jfxtras/labs/internal/scene/control/skin/SevenSegmentSkin.java b/src/main/java/jfxtras/labs/internal/scene/control/skin/SevenSegmentSkin.java index 77d57fcd9..f0145e466 100644 --- a/src/main/java/jfxtras/labs/internal/scene/control/skin/SevenSegmentSkin.java +++ b/src/main/java/jfxtras/labs/internal/scene/control/skin/SevenSegmentSkin.java @@ -58,10 +58,10 @@ * Time: 08:12 */ public class SevenSegmentSkin extends SkinBase { - private SevenSegment control; - private boolean isDirty; - private boolean initialized; - private Group segments; + private SevenSegment control; + private boolean isDirty; + private boolean initialized; + private Group segments; private Map segmentMap; @@ -176,20 +176,22 @@ public void updateCharacter() { INNER_SHADOW.setRadius(0.05 * control.getPrefWidth()); INNER_SHADOW.setColor(Color.hsb(control.getColor().getHue(), control.getColor().getSaturation(), 0.2)); - final String ON_STYLE = control.isPlainColor() ? "sixteen-segment-plain-on" : "sixteen-segment-on"; + final String ON_STYLE = control.isPlainColor() ? "seven-segment-plain-on" : "seven-segment-on"; if (control.getCustomSegmentMapping().isEmpty()) { for (SevenSegment.Segment segment : segmentMap.keySet()) { if (control.getSegmentMapping().containsKey(ASCII)) { if (control.getSegmentMapping().get(ASCII).contains(segment)) { + segmentMap.get(segment).getStyleClass().clear(); segmentMap.get(segment).getStyleClass().add(ON_STYLE); segmentMap.get(segment).setEffect(INNER_SHADOW); } else { - segmentMap.get(segment).getStyleClass().add("sixteen-segment-off"); + segmentMap.get(segment).getStyleClass().clear(); + segmentMap.get(segment).getStyleClass().add("seven-segment-off"); segmentMap.get(segment).setEffect(null); } } else { - segmentMap.get(segment).getStyleClass().add("sixteen-segment-off"); + segmentMap.get(segment).getStyleClass().add("seven-segment-off"); segmentMap.get(segment).setEffect(null); } } @@ -197,21 +199,25 @@ public void updateCharacter() { for (SevenSegment.Segment segment : segmentMap.keySet()) { if (control.getCustomSegmentMapping().containsKey(ASCII)) { if (control.getCustomSegmentMapping().get(ASCII).contains(segment)) { + segmentMap.get(segment).getStyleClass().clear(); segmentMap.get(segment).getStyleClass().add(ON_STYLE); segmentMap.get(segment).setEffect(INNER_SHADOW); } else { - segmentMap.get(segment).getStyleClass().add("sixteen-segment-off"); + segmentMap.get(segment).getStyleClass().clear(); + segmentMap.get(segment).getStyleClass().add("seven-segment-off"); segmentMap.get(segment).setEffect(null); } } else { - segmentMap.get(segment).getStyleClass().add("sixteen-segment-off"); + segmentMap.get(segment).getStyleClass().clear(); + segmentMap.get(segment).getStyleClass().add("seven-segment-off"); segmentMap.get(segment).setEffect(null); } } } if (control.isDotOn()) { - segmentMap.get(SevenSegment.Segment.DOT).getStyleClass().add(ON_STYLE); - segmentMap.get(SevenSegment.Segment.DOT).setEffect(INNER_SHADOW); + segmentMap.get(SixteenSegment.Segment.DOT).getStyleClass().clear(); + segmentMap.get(SixteenSegment.Segment.DOT).getStyleClass().add(ON_STYLE); + segmentMap.get(SixteenSegment.Segment.DOT).setEffect(INNER_SHADOW); } } diff --git a/src/main/java/jfxtras/labs/internal/scene/control/skin/SixteenSegmentSkin.java b/src/main/java/jfxtras/labs/internal/scene/control/skin/SixteenSegmentSkin.java index d59c29f05..91269687a 100644 --- a/src/main/java/jfxtras/labs/internal/scene/control/skin/SixteenSegmentSkin.java +++ b/src/main/java/jfxtras/labs/internal/scene/control/skin/SixteenSegmentSkin.java @@ -182,13 +182,16 @@ public void updateCharacter() { for (SixteenSegment.Segment segment : segmentMap.keySet()) { if (control.getSegmentMapping().containsKey(ASCII)) { if (control.getSegmentMapping().get(ASCII).contains(segment)) { + segmentMap.get(segment).getStyleClass().clear(); segmentMap.get(segment).getStyleClass().add(ON_STYLE); segmentMap.get(segment).setEffect(INNER_SHADOW); } else { + segmentMap.get(segment).getStyleClass().clear(); segmentMap.get(segment).getStyleClass().add("sixteen-segment-off"); segmentMap.get(segment).setEffect(null); } } else { + segmentMap.get(segment).getStyleClass().clear(); segmentMap.get(segment).getStyleClass().add("sixteen-segment-off"); segmentMap.get(segment).setEffect(null); } @@ -197,19 +200,23 @@ public void updateCharacter() { for (SixteenSegment.Segment segment : segmentMap.keySet()) { if (control.getCustomSegmentMapping().containsKey(ASCII)) { if (control.getCustomSegmentMapping().get(ASCII).contains(segment)) { + segmentMap.get(segment).getStyleClass().clear(); segmentMap.get(segment).getStyleClass().add(ON_STYLE); segmentMap.get(segment).setEffect(INNER_SHADOW); } else { + segmentMap.get(segment).getStyleClass().clear(); segmentMap.get(segment).getStyleClass().add("sixteen-segment-off"); segmentMap.get(segment).setEffect(null); } } else { + segmentMap.get(segment).getStyleClass().clear(); segmentMap.get(segment).getStyleClass().add("sixteen-segment-off"); segmentMap.get(segment).setEffect(null); } } } if (control.isDotOn()) { + segmentMap.get(SixteenSegment.Segment.DOT).getStyleClass().clear(); segmentMap.get(SixteenSegment.Segment.DOT).getStyleClass().add(ON_STYLE); segmentMap.get(SixteenSegment.Segment.DOT).setEffect(INNER_SHADOW); }