Proposed paragraph style setting (Paragraph style vanishs after text/…

…style update. Otherwise complete)
FXMisc · Oct 14, 2015 · 0ae84c2 · 0ae84c2
1 parent cb3b5f9
commit 0ae84c2
Show file tree

Hide file tree

Showing 15 changed files with 240 additions and 176 deletions.
diff --git a/richtextfx-demos/src/main/java/org/fxmisc/richtext/demo/RichText.java b/richtextfx-demos/src/main/java/org/fxmisc/richtext/demo/RichText.java
@@ -17,6 +17,8 @@
 import javafx.application.Application;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
 import javafx.collections.FXCollections;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
@@ -33,6 +35,8 @@
 
 import org.fxmisc.richtext.Codec;
 import org.fxmisc.richtext.InlineStyleTextArea;
+import org.fxmisc.richtext.Paragraph;
+import org.fxmisc.richtext.StyleSpan;
 import org.fxmisc.richtext.StyleSpans;
 import org.reactfx.SuspendableNo;
 
@@ -180,14 +184,16 @@ private static String cssColor(Color color) {
         final Optional<Color> backgroundColor;
 
         public StyleInfo() {
-            bold = Optional.empty();
-            italic = Optional.empty();
-            underline = Optional.empty();
-            strikethrough = Optional.empty();
-            fontSize = Optional.empty();
-            fontFamily = Optional.empty();
-            textColor = Optional.empty();
-            backgroundColor = Optional.empty();
+            this(
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty()
+            );
         }
 
         public StyleInfo(
@@ -350,6 +356,7 @@ public static void main(String[] args) {
     }
 
     private final SuspendableNo updatingToolbar = new SuspendableNo();
+    private final BooleanProperty applyToParagraph = new SimpleBooleanProperty(false);
 
     @Override
     public void start(Stage primaryStage) {
@@ -529,21 +536,32 @@ private void toggleStrikethrough() {
     }
 
     private void updateStyleInSelection(Function<StyleSpans<StyleInfo>, StyleInfo> mixinGetter) {
-        IndexRange selection = area.getSelection();
-        if(selection.getLength() != 0) {
-            StyleSpans<StyleInfo> styles = area.getStyleSpans(selection);
-            StyleInfo mixin = mixinGetter.apply(styles);
-            StyleSpans<StyleInfo> newStyles = styles.mapStyles(style -> style.updateWith(mixin));
-            area.setStyleSpans(selection.getStart(), newStyles);
+        if (applyToParagraph.get()) {
+            StyleInfo mixin = mixinGetter.apply(StyleSpans.singleton(new StyleSpan<>(StyleInfo.EMPTY, 0)));
+            Paragraph paragraph = area.getParagraph(area.getCurrentParagraph());
+            paragraph.setParagraphStyle(mixin);
+        } else {
+            IndexRange selection = area.getSelection();
+            if(selection.getLength() != 0) {
+                StyleSpans<StyleInfo> styles = area.getStyleSpans(selection);
+                StyleInfo mixin = mixinGetter.apply(styles);
+                StyleSpans<StyleInfo> newStyles = styles.mapStyles(style -> style.updateWith(mixin));
+                area.setStyleSpans(selection.getStart(), newStyles);
+            }
         }
     }
 
     private void updateStyleInSelection(StyleInfo mixin) {
-        IndexRange selection = area.getSelection();
-        if(selection.getLength() != 0) {
-            StyleSpans<StyleInfo> styles = area.getStyleSpans(selection);
-            StyleSpans<StyleInfo> newStyles = styles.mapStyles(style -> style.updateWith(mixin));
-            area.setStyleSpans(selection.getStart(), newStyles);
+        if (applyToParagraph.get()) {
+            Paragraph paragraph = area.getParagraph(area.getCurrentParagraph());
+            paragraph.setParagraphStyle(mixin);
+        } else {
+            IndexRange selection = area.getSelection();
+            if (selection.getLength() != 0) {
+                StyleSpans<StyleInfo> styles = area.getStyleSpans(selection);
+                StyleSpans<StyleInfo> newStyles = styles.mapStyles(style -> style.updateWith(mixin));
+                area.setStyleSpans(selection.getStart(), newStyles);
+            }
         }
     }
 

diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/ClipboardActions.java b/richtextfx/src/main/java/org/fxmisc/richtext/ClipboardActions.java
@@ -17,7 +17,7 @@
 /**
  * Clipboard actions for {@link TextEditingArea}.
  */
-public interface ClipboardActions<S> extends EditActions<S> {
+public interface ClipboardActions<S, PS> extends EditActions<S, PS> {
 
     Optional<Codec<S>> getStyleCodec();
 

diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/EditActions.java b/richtextfx/src/main/java/org/fxmisc/richtext/EditActions.java
@@ -5,7 +5,7 @@
 /**
  * Extended edit actions for {@link TextEditingArea}.
  */
-public interface EditActions<S> extends TextEditingArea<S> {
+public interface EditActions<S, PS> extends TextEditingArea<S, PS> {
 
     /**
      * Appends the given text to the end of the text content.
@@ -17,7 +17,7 @@ default void appendText(String text) {
     /**
      * Appends the given rich-text content to the end of this text-editing area.
      */
-    default void append(StyledDocument<S> document) {
+    default void append(StyledDocument<S, PS> document) {
         insert(getLength(), document);
     }
 
@@ -37,7 +37,7 @@ default void insertText(int index, String text) {
      * @param index The location to insert the text.
      * @param document The rich-text content to insert.
      */
-    default void insert(int index, StyledDocument<S> document) {
+    default void insert(int index, StyledDocument<S, PS> document) {
         replace(index, index, document);
     }
 
@@ -105,7 +105,7 @@ default void replaceText(String replacement) {
     /**
      * Replaces the entire content with the given rich-text content.
      */
-    default void replace(StyledDocument<S> replacement) {
+    default void replace(StyledDocument<S, PS> replacement) {
         replace(0, getLength(), replacement);
     }
 
@@ -125,7 +125,7 @@ default void replaceSelection(String replacement) {
      * caret position. If there was a selection, then the selection is cleared
      * and the given replacement text is inserted.
      */
-    default void replaceSelection(StyledDocument<S> replacement) {
+    default void replaceSelection(StyledDocument<S, PS> replacement) {
         replace(getSelection(), replacement);
     }