Merge pull request #844 from Jugen/fix_highlight_fill

Fixed highlight fill
FXMisc · Aug 21, 2019 · 1da8760 · 1da8760
2 parents 8a81524 + 15f9122
commit 1da8760
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 16 deletions.
diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/GenericStyledArea.java b/richtextfx/src/main/java/org/fxmisc/richtext/GenericStyledArea.java
@@ -313,12 +313,6 @@ public class GenericStyledArea<PS, SEG, S> extends Region
      *                                                                        *
      * ********************************************************************** */
 
-    /**
-     * Background fill for highlighted text.
-     */
-    private final StyleableObjectProperty<Paint> highlightFill
-            = new CustomStyleableProperty<>(Color.DODGERBLUE, "highlightFill", this, HIGHLIGHT_FILL);
-
     /**
      * Text color for highlighted text.
      */
@@ -1571,10 +1565,6 @@ private void suspendVisibleParsWhile(Runnable runnable) {
      *                                                                        *
      * ********************************************************************** */
 
-    private static final CssMetaData<GenericStyledArea<?, ?, ?>, Paint> HIGHLIGHT_FILL = new CustomCssMetaData<>(
-            "-fx-highlight-fill", StyleConverter.getPaintConverter(), Color.DODGERBLUE, s -> s.highlightFill
-    );
-
     private static final CssMetaData<GenericStyledArea<?, ?, ?>, Paint> HIGHLIGHT_TEXT_FILL = new CustomCssMetaData<>(
             "-fx-highlight-text-fill", StyleConverter.getPaintConverter(), Color.WHITE, s -> s.highlightTextFill
     );
@@ -1584,7 +1574,6 @@ private void suspendVisibleParsWhile(Runnable runnable) {
     static {
         List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<>(Region.getClassCssMetaData());
 
-        styleables.add(HIGHLIGHT_FILL);
         styleables.add(HIGHLIGHT_TEXT_FILL);
 
         CSS_META_DATA_LIST = Collections.unmodifiableList(styleables);

diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/SelectionPath.java b/richtextfx/src/main/java/org/fxmisc/richtext/SelectionPath.java
@@ -37,6 +37,9 @@ public class SelectionPath extends Path {
     SelectionPath(Val<IndexRange> range) {
         setManaged(false);
         this.range = range;
+        highlightFill.addListener( (ob,ov,nv) -> setFill( nv ) );
+        setFill( getHighlightFill() );
+        setStrokeWidth( 0.0 );
     }
 
     @Override

diff --git a/richtextfx/src/main/resources/org/fxmisc/richtext/styled-text-area.css b/richtextfx/src/main/resources/org/fxmisc/richtext/styled-text-area.css
@@ -10,8 +10,3 @@
     -rtfx-blink-rate: 500ms;
     -fx-stroke-width: 1.0;
 }
-
-.styled-text-area .selection {
-    -fx-fill: dodgerblue;
-    -fx-stroke-width: 0;
-}