Fixed wrapping text issue with Labeled and set content biais

webfx-project · Nov 3, 2023 · df75d42 · df75d42
1 parent cf54b5e
commit df75d42
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/webfx-kit/webfx-kit-javafxcontrols-emul/src/main/java/javafx/scene/control/Labeled.java b/webfx-kit/webfx-kit-javafxcontrols-emul/src/main/java/javafx/scene/control/Labeled.java
@@ -1,7 +1,10 @@
 package javafx.scene.control;
 
+import dev.webfx.kit.mapper.peers.javafxgraphics.markers.*;
+import dev.webfx.kit.util.properties.FXProperties;
 import javafx.beans.property.*;
 import javafx.geometry.Insets;
+import javafx.geometry.Orientation;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.Scene;
@@ -10,8 +13,6 @@
 import javafx.scene.paint.Paint;
 import javafx.scene.text.Font;
 import javafx.scene.text.TextAlignment;
-import dev.webfx.kit.mapper.peers.javafxgraphics.markers.*;
-import dev.webfx.kit.util.properties.FXProperties;
 /**
  * @author Bruno Salmon
  */
@@ -156,6 +157,14 @@ public final boolean isWrapText() {
         return wrapText == null ? false : wrapText.getValue();
     }
 
+    /**
+     * If wrapText is true, then contentBias will be HORIZONTAL, otherwise it is null.
+     * @return orientation of width/height dependency or null if there is none
+     */
+    @Override public Orientation getContentBias() {
+        return isWrapText()? Orientation.HORIZONTAL : null;
+    }
+
     /**
      * Specifies the behavior to use if the text of the {@code Labeled}
      * exceeds the available space for rendering the text.

diff --git a/...ebfx-kit-javafxcontrols-emul/src/main/java/javafx/scene/control/skin/LabeledSkinBase.java b/...ebfx-kit-javafxcontrols-emul/src/main/java/javafx/scene/control/skin/LabeledSkinBase.java
@@ -30,6 +30,7 @@ public abstract class LabeledSkinBase<C extends Labeled, B extends BehaviorBase<
      */
     LabeledText text;
     final Text noWrappingText = new Text(); { noWrappingText.setVisible(false); } // WebFX addition (to remove if possible)
+    private double noWrappingTextWidth;
 
     /**
      * Indicates that the text content is invalid and needs to be updated.
@@ -538,7 +539,7 @@ private void removeMnemonic() {
     private void updateWrappingWidth() {
         final Labeled labeled = getSkinnable();
         text.setWrappingWidth(0d);
-        if (labeled.isWrapText()) {
+        if (labeled.isWrapText() /* WebFX addition: */ && wrapWidth < noWrappingTextWidth) { // we don't set the wrapping width if not necessary due to lack of double precision in HTML (rounding to inferior pixel can cause an unwanted text wrap)
             // Note that the wrapping width needs to be set to zero before
             // getting the text's real preferred width.
             double w = Math.min(text.prefWidth(-1), wrapWidth);
@@ -695,7 +696,10 @@ private double computeTextWidth(Font font, String text, double wrappingWidth) {
             return 0;
         /*if (wrappingWidth <= 0) // Commented because it doesn't include the extra space around the text like in the html node
             return WebFxKitLauncher.measureText(text, font).getWidth();*/
-        return getTextToMeasure(font, text, wrappingWidth).prefWidth(-1);
+        double textWidth = getTextToMeasure(font, text, wrappingWidth).prefWidth(-1);
+        if (wrappingWidth == 0)
+            noWrappingTextWidth = textWidth;
+        return textWidth;
     }
 
     private double computeTextHeight(Font font, String text, double wrappingWidth, double lineSpacing, TextBoundsType boundsType) {