Merge pull request #324 from afester/dottedUnderline

Use the -rtfx prefix for RichTextFX specific underline properties, us the underline width as the toggle to enable/disable the underline.
FXMisc · Jun 10, 2016 · 9bb46ac · 9bb46ac
2 parents 7c32514 + caeac0c
commit 9bb46ac
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 49 deletions.
diff --git a/richtextfx-demos/src/main/resources/org/fxmisc/richtext/demo/spellchecking.css b/richtextfx-demos/src/main/resources/org/fxmisc/richtext/demo/spellchecking.css
@@ -1,6 +1,6 @@
 .underlined {
-    -fx-underline-color: red;
-    -fx-underline-dash-array: 2 2;
-    -fx-underline-width: 1;
-    -fx-underline-cap: butt;
+    -rtfx-underline-color: red;
+    -rtfx-underline-dash-array: 2 2;
+    -rtfx-underline-width: 1;
+    -rtfx-underline-cap: butt;
 }
diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/ParagraphText.java b/richtextfx/src/main/java/org/fxmisc/richtext/ParagraphText.java
@@ -1,7 +1,6 @@
 package org.fxmisc.richtext;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.BiConsumer;
@@ -235,55 +234,53 @@ private void updateBackground(TextExt text, int start, int end, int index) {
      */
     private void updateUnderline(TextExt text, int start, int end, int index) {
 
-        // get all CSS properties for the underline
-
-        Paint underlineColor = text.underlineColorProperty().get();
         Number underlineWidth = text.underlineWidthProperty().get();
+        if (underlineWidth != null && underlineWidth.doubleValue() > 0) {
+
+            Path underlineShape = underlineShapes.get(index);
+            underlineShape.setStrokeWidth(underlineWidth.doubleValue());
 
-        // get the dash array - JavaFX CSS parser seems to return either a Number[] array
-        // or a single value, depending on whether only one or more than one value has been
-        // specified in the CSS
-        Double[] underlineDashArray = null;
-        Object underlineDashArrayProp = text.underlineDashArrayProperty().get();
-        if (underlineDashArrayProp != null) {
-            if (underlineDashArrayProp.getClass().isArray()) {
-                Number[] numberArray = (Number[]) underlineDashArrayProp;
-                underlineDashArray = new Double[numberArray.length];
-                int idx = 0;
-                for (Number d : numberArray) {
-                    underlineDashArray[idx++] = (Double) d;
+            // get remaining CSS properties for the underline style
+
+            Paint underlineColor = text.underlineColorProperty().get();
+
+            // get the dash array - JavaFX CSS parser seems to return either a Number[] array
+            // or a single value, depending on whether only one or more than one value has been
+            // specified in the CSS
+            Double[] underlineDashArray = null;
+            Object underlineDashArrayProp = text.underlineDashArrayProperty().get();
+            if (underlineDashArrayProp != null) {
+                if (underlineDashArrayProp.getClass().isArray()) {
+                    Number[] numberArray = (Number[]) underlineDashArrayProp;
+                    underlineDashArray = new Double[numberArray.length];
+                    int idx = 0;
+                    for (Number d : numberArray) {
+                        underlineDashArray[idx++] = (Double) d;
+                    }
+                } else {
+                    underlineDashArray = new Double[1];
+                    underlineDashArray[0] = ((Double) underlineDashArrayProp).doubleValue();
                 }
-            } else {
-                underlineDashArray = new Double[1];
-                underlineDashArray[0] = ((Double) underlineDashArrayProp).doubleValue();
             }
-        }
-
-        StrokeLineCap underlineCap = text.underlineCapProperty().get();
-
-        // apply style and render the underline
-
-        Path underlineShape = underlineShapes.get(index);
-        if (underlineColor != null) {
-            underlineShape.setStroke(underlineColor);
-        }
-        if (underlineWidth != null) {
-            underlineShape.setStrokeWidth(underlineWidth.doubleValue());
-        }
-        if (underlineDashArray != null) {
-            underlineShape.getStrokeDashArray().addAll(underlineDashArray);
-            underlineShape.setStrokeLineCap(StrokeLineCap.BUTT);
-        }
-        if (underlineCap != null) {
-            underlineShape.setStrokeLineCap(underlineCap);
-        }
+
+            StrokeLineCap underlineCap = text.underlineCapProperty().get();
+
+            // apply style
+            if (underlineColor != null) {
+                underlineShape.setStroke(underlineColor);
+            }
+            if (underlineDashArray != null) {
+                underlineShape.getStrokeDashArray().addAll(underlineDashArray);
+            }
+            if (underlineCap != null) {
+                underlineShape.setStrokeLineCap(underlineCap);
+            }
 
-        if (underlineColor != null || underlineWidth != null) {
-
             // Set path elements
             PathElement[] shape = getUnderlineShape(start, end);
             underlineShape.getElements().setAll(shape);
         }
+
     }
 
 

diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/TextExt.java b/richtextfx/src/main/java/org/fxmisc/richtext/TextExt.java
@@ -176,7 +176,7 @@ public StyleableProperty<Paint> getStyleableProperty(TextExt node) {
 
 
         private static final CssMetaData<TextExt, Paint> UNDERLINE_COLOR = new CssMetaData<TextExt, Paint>(
-                "-fx-underline-color",
+                "-rtfx-underline-color",
                 StyleConverter.getPaintConverter(),
                 Color.TRANSPARENT) {
             @Override
@@ -191,7 +191,7 @@ public StyleableProperty<Paint> getStyleableProperty(TextExt node) {
         };
 
         private static final CssMetaData<TextExt, Number> UNDERLINE_WIDTH = new CssMetaData<TextExt, Number>(
-                "-fx-underline-width",
+                "-rtfx-underline-width",
                 StyleConverter.getSizeConverter(),
                 0) {
 
@@ -207,7 +207,7 @@ public StyleableProperty<Number> getStyleableProperty(TextExt node) {
         };
 
         private static final CssMetaData<TextExt, Number[]> UNDERLINE_DASH_ARRAY = new CssMetaData<TextExt, Number[]>(
-                "-fx-underline-dash-array",
+                "-rtfx-underline-dash-array",
                 SizeConverter.SequenceConverter.getInstance(),
                 new Double[0]) {
 
@@ -223,7 +223,7 @@ public StyleableProperty<Number[]> getStyleableProperty(TextExt node) {
         };
 
         private static final CssMetaData<TextExt, StrokeLineCap> UNDERLINE_CAP = new CssMetaData<TextExt, StrokeLineCap>(
-                "-fx-underline-cap",
+                "-rtfx-underline-cap",
                 new EnumConverter<StrokeLineCap>(StrokeLineCap.class),
                 StrokeLineCap.SQUARE) {