Compute pref width of ParagraphTile, including tests (#417)

* Compute pref width of ParagraphTile, including tests

* Set pref width base on children

* remove unneeded code

Author: jperedadnr

rta/pom.xml

@@ -14,12 +14,12 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.release>11</maven.compiler.release>
+        <maven.compiler.release>21</maven.compiler.release>
         <javafx.version>23.0.1</javafx.version>
         <gpg.plugin.version>3.2.7</gpg.plugin.version>
         <emoji.version>1.1.0</emoji.version>
         <test.headless/>
-        <test.javafx.version>26-ea+15</test.javafx.version>
+        <test.javafx.version>26-ea+18</test.javafx.version>
     </properties>
 
     <dependencies>
@@ -228,7 +228,7 @@
         <profile>
             <id>test</id>
             <properties>
-                <test.headless>-Dtestfx.headless=true -Dprism.order=sw</test.headless>
+                <test.headless>-Dglass.platform=Headless -Dprism.order=sw</test.headless>
             </properties>
             <dependencies>
                 <dependency>

rta/src/main/java/com/gluonhq/richtextarea/ParagraphTile.java

@@ -140,13 +140,15 @@ void setParagraph(Paragraph paragraph, List<Node> fragments, List<Integer> posit
             if (!fragments.isEmpty()) {
                 HBox gridBox = createGridBox(fragments, positions, background, decoration);
                 contentPane.getChildren().add(gridBox);
+                contentPane.setPrefWidth(gridBox.getPrefWidth());
                 contentPane.layout();
             }
         } else {
             Layer layer = new Layer(paragraph.getStart(), paragraph.getEnd(), false);
             layer.setContent(fragments, background, decoration);
             layers.add(layer);
             contentPane.getChildren().add(layer);
+            contentPane.setPrefWidth(layer.getPrefWidth());
             updateGraphicBox(layer, control.getParagraphGraphicFactory());
             graphicBox.setPadding(new Insets(decoration.getTopInset(), 2, decoration.getBottomInset(), 0));
             contentPane.layout();

rta/src/test/java/com/gluonhq/richtextarea/ui/RTATest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Gluon
+ * Copyright (c) 2024, 2025, Gluon
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,7 +41,10 @@
 import com.gluonhq.richtextarea.model.TextDecoration;
 import javafx.application.Platform;
 import javafx.event.ActionEvent;
+import javafx.geometry.Orientation;
+import javafx.scene.Node;
 import javafx.scene.Scene;
+import javafx.scene.control.ScrollBar;
 import javafx.scene.control.ToggleButton;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.Clipboard;
@@ -92,9 +95,9 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.testfx.api.FxAssert.verifyThat;
-import static org.testfx.util.WaitForAsyncUtils.sleep;
 import static org.testfx.util.WaitForAsyncUtils.waitForFxEvents;
 
 @ExtendWith(ApplicationExtension.class)
@@ -891,6 +894,7 @@ public void copyPaste3Test(FxRobot robot) {
         assertEquals(NORMAL, ((TextDecoration) dm4.getDecoration()).getFontWeight());
         assertEquals("black", ((TextDecoration) dm4.getDecoration()).getForeground());
     }
+
     @Test
     public void multiLineDocumentTest(FxRobot robot) {
         run(() -> {
@@ -923,7 +927,54 @@ public void multiLineDocumentTest(FxRobot robot) {
             assertInstanceOf(Text.class, tf.getChildren().get(0));
             assertFalse(((Text) tf.getChildren().get(0)).getText().contains("\n"));
         }
-        sleep(4, TimeUnit.SECONDS);
+    }
+
+    @Test
+    public void longLineWrapDocumentTest(FxRobot robot) {
+        run(() -> {
+            String text = "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book.";
+            TextDecoration textDecoration = TextDecoration.builder().presets().fontFamily("Arial").build();
+            ParagraphDecoration paragraphDecoration = ParagraphDecoration.builder().presets().build();
+            Document document = new Document(text,
+                    List.of(new DecorationModel(0, text.length(), textDecoration, paragraphDecoration)), text.length());
+            richTextArea.getActionFactory().open(document).execute(new ActionEvent());
+        });
+        waitForFxEvents();
+
+        verifyThat(".rich-text-area", node -> node instanceof RichTextArea);
+        assertEquals(2, robot.lookup(".scroll-bar").queryAll().size());
+        ScrollBar scrollBar = (ScrollBar) robot.lookup(".scroll-bar").queryAll().stream().filter(Node::isVisible).findFirst().orElse(null);
+        assertNull(scrollBar);
+        assertEquals(1, robot.lookup(".text-flow").queryAll().size());
+        assertInstanceOf(TextFlow.class, robot.lookup(".text-flow").query());
+        TextFlow tf = robot.lookup(".text-flow").query();
+        assertEquals(3, tf.getLayoutInfo().getTextLineCount());
+    }
+
+    @Test
+    public void longLineNoWrapDocumentTest(FxRobot robot) {
+        run(() -> {
+            String text = "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book.";
+            TextDecoration textDecoration = TextDecoration.builder().presets().fontFamily("Arial").build();
+            ParagraphDecoration paragraphDecoration = ParagraphDecoration.builder().presets().build();
+            Document document = new Document(text,
+                    List.of(new DecorationModel(0, text.length(), textDecoration, paragraphDecoration)), text.length());
+            richTextArea.setContentAreaWidth(2000);
+            richTextArea.getActionFactory().open(document).execute(new ActionEvent());
+        });
+        waitForFxEvents();
+
+        verifyThat(".rich-text-area", node -> node instanceof RichTextArea);
+        assertEquals(2, robot.lookup(".scroll-bar").queryAll().size());
+        ScrollBar scrollBar = (ScrollBar) robot.lookup(".scroll-bar").queryAll().stream().filter(Node::isVisible).findFirst().orElse(null);
+        assertNotNull(scrollBar);
+        assertEquals(Orientation.HORIZONTAL, scrollBar.getOrientation());
+        assertEquals(0, scrollBar.getValue());
+        assertEquals(1, robot.lookup(".text-flow").queryAll().size());
+        assertInstanceOf(TextFlow.class, robot.lookup(".text-flow").query());
+        TextFlow tf = robot.lookup(".text-flow").query();
+        assertEquals(2000, tf.prefWidth(tf.getHeight()));
+        assertEquals(1, tf.getLayoutInfo().getTextLineCount());
     }
 
     @Test