8356042: RichTextArea: tab stops attributes

apps/samples/RichTextAreaDemo/src/com/oracle/demo/richtext/editor/Actions.java

@@ -49,6 +49,8 @@
 import javafx.scene.control.Dialog;
 import javafx.scene.input.DataFormat;
 import javafx.scene.paint.Color;
+import javafx.scene.text.TabStop;
+import javafx.scene.text.TabStopPolicy;
 import javafx.stage.FileChooser;
 import javafx.stage.Window;
 import com.oracle.demo.richtext.common.Styles;
@@ -103,13 +105,15 @@ public class Actions {
     public final FxAction wrapText = new FxAction();
 
     private final RichTextArea control;
+    private final Ruler ruler;
     private final ReadOnlyBooleanWrapper modified = new ReadOnlyBooleanWrapper();
     private final ReadOnlyObjectWrapper<File> file = new ReadOnlyObjectWrapper<>();
     private final SimpleObjectProperty<StyleAttributeMap> styles = new SimpleObjectProperty<>();
     private final SimpleObjectProperty<TextStyle> textStyle = new SimpleObjectProperty<>();
 
-    public Actions(RichTextArea control) {
+    public Actions(RichTextArea control, Ruler ruler) {
         this.control = control;
+        this.ruler = ruler;
 
         // undo/redo actions
         redo.disabledProperty().bind(control.redoableProperty().not());
@@ -206,6 +210,18 @@ private void handleCaret() {
         italic.setSelected(a.getBoolean(StyleAttributeMap.ITALIC), false);
         underline.setSelected(a.getBoolean(StyleAttributeMap.UNDERLINE), false);
         strikeThrough.setSelected(a.getBoolean(StyleAttributeMap.STRIKE_THROUGH), false);
+
+        if (ruler != null) {
+            TabStopPolicy tp = ruler.getTabStopPolicy();
+            if (tp != null) {
+                TabStop[] ts = a.get(StyleAttributeMap.TAB_STOPS);
+                if (ts == null) {
+                    tp.tabStops().clear();
+                } else {
+                    tp.tabStops().setAll(ts);
+                }
+            }
+        }
     }
 
     private void toggle(StyleAttribute<Boolean> attr) {

apps/samples/RichTextAreaDemo/src/com/oracle/demo/richtext/editor/RichEditorDemoPane.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
@@ -39,13 +39,19 @@
 import javafx.scene.control.ToolBar;
 import javafx.scene.input.KeyCode;
 import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.VBox;
 import javafx.scene.text.Font;
+import javafx.scene.text.TabStop;
+import javafx.scene.text.TabStopPolicy;
 import com.oracle.demo.richtext.common.TextStyle;
 import com.oracle.demo.richtext.editor.settings.EndKey;
 import com.oracle.demo.richtext.util.FX;
+import com.oracle.demo.richtext.util.FxAction;
 import jfx.incubator.scene.control.input.KeyBinding;
 import jfx.incubator.scene.control.richtext.RichTextArea;
+import jfx.incubator.scene.control.richtext.SelectionSegment;
 import jfx.incubator.scene.control.richtext.TextPos;
+import jfx.incubator.scene.control.richtext.model.StyleAttributeMap;
 
 /**
  * Main Panel.
@@ -55,10 +61,12 @@
 public class RichEditorDemoPane extends BorderPane {
     public final RichTextArea editor;
     public final Actions actions;
+    private final Ruler ruler;
     private final ComboBox<String> fontName;
     private final ComboBox<Integer> fontSize;
     private final ColorPicker textColor;
     private final ComboBox<TextStyle> textStyle;
+    private TabStopPolicy tabPolicy;
 
     public RichEditorDemoPane() {
         FX.name(this, "RichEditorDemoPane");
@@ -69,7 +77,14 @@ public RichEditorDemoPane() {
             System.out.println("Custom function: W key is pressed");
         });
 
-        actions = new Actions(editor);
+        ruler = new Ruler(editor);
+        ruler.setOnChange(this::handleTabStopChange);
+        tabPolicy = new TabStopPolicy();
+        ruler.setTabStopPolicy(tabPolicy);
+
+        FX.setPopupMenu(ruler, this::createRulerPopupMenu);
+
+        actions = new Actions(editor, ruler);
         editor.setContextMenu(createContextMenu());
 
         fontName = new ComboBox<>();
@@ -108,9 +123,8 @@ public RichEditorDemoPane() {
         textColor = new ColorPicker();
         // TODO save/restore custom colors
         FX.tooltip(textColor, "Text Color");
-        // FIX there is no API for this!  why is this a property of a skin, not the control??
         // https://stackoverflow.com/questions/21246137/remove-text-from-colour-picker
-        textColor.setStyle("-fx-color-label-visible: false ;");
+        textColor.setStyle("-fx-color-label-visible: false;");
         textColor.setOnAction((ev) -> {
             actions.setTextColor(textColor.getValue());
         });
@@ -123,14 +137,15 @@ public RichEditorDemoPane() {
             editor.requestFocus();
         });
 
-        setTop(createToolBar());
+        setTop(new VBox(createToolBar(), ruler));
         setCenter(editor);
 
         actions.textStyleProperty().addListener((s,p,c) -> {
             setTextStyle(c);
         });
 
         Settings.endKey.subscribe(this::setEndKey);
+        Settings.contentPadding.bindBidirectional(editor.contentPaddingProperty());
     }
 
     private ToolBar createToolBar() {
@@ -175,6 +190,12 @@ private ContextMenu createContextMenu() {
         return m;
     }
 
+    private ContextMenu createRulerPopupMenu() {
+        ContextMenu m = new ContextMenu();
+        FX.item(m, "Tab Options...", new FxAction(this::showTabOptions));
+        return m;
+    }
+
     private static List<String> collectFonts() {
         return Font.getFamilies();
     }
@@ -228,4 +249,23 @@ private static int findLastText(String text, int start) {
         }
         return i;
     }
+
+    private void showTabOptions() {
+        // TODO
+    }
+
+    private void handleTabStopChange() {
+        // TODO update default tabs if changed
+        SelectionSegment sel = editor.getSelection();
+        if (sel != null) {
+            TabStop[] ts = tabPolicy.tabStops().toArray(TabStop[]::new);
+            StyleAttributeMap a = StyleAttributeMap.builder().set(StyleAttributeMap.TAB_STOPS, ts).build();
+            int min = sel.getMin().index();
+            int max = sel.getMax().index();
+            for (int ix = min; ix <= max; ix++) {
+                TextPos p = TextPos.ofLeading(ix, 0);
+                editor.applyStyle(p, p, a);
+            }
+        }
+    }
 }