From db9f32db1fc28ce38a82703bba7d59f50516bfbf Mon Sep 17 00:00:00 2001 From: Bruno Salmon Date: Mon, 11 Dec 2023 10:09:08 +0000 Subject: [PATCH] Fixed possible layout loop in LabeledSkinBase --- .../main/java/javafx/scene/control/skin/LabeledSkinBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webfx-kit/webfx-kit-javafxcontrols-emul/src/main/java/javafx/scene/control/skin/LabeledSkinBase.java b/webfx-kit/webfx-kit-javafxcontrols-emul/src/main/java/javafx/scene/control/skin/LabeledSkinBase.java index 2346dc28b..4a9663a53 100644 --- a/webfx-kit/webfx-kit-javafxcontrols-emul/src/main/java/javafx/scene/control/skin/LabeledSkinBase.java +++ b/webfx-kit/webfx-kit-javafxcontrols-emul/src/main/java/javafx/scene/control/skin/LabeledSkinBase.java @@ -723,7 +723,7 @@ private Text getTextToMeasure(Font font, String text, double wrappingWidth) { // textToMesure.setFont(font); //textToMesure.setTextAlignment(getSkinnable().getTextAlignment()); // Reusing also noWrappingText if the passed wrapping width is greater (=> for sure text will stay on 1 line) and text & font identical - } else if (noWrappingTextWidth > 0 && wrappingWidth > noWrappingTextWidth && Objects.equals(noWrappingText.getText(), text) && Objects.equals(noWrappingText.getFont(), font)) { + } else if (noWrappingTextWidth > 0 && wrappingWidth >= noWrappingTextWidth && Objects.equals(noWrappingText.getText(), text) && Objects.equals(noWrappingText.getFont(), font)) { textToMesure = noWrappingText; } else { // Otherwise using this.text to measure and apply wrapping width & text to it (should be final values to apply for html mapping) textToMesure = this.text;