From 12fcf4dae5e458df1ff869bdea7da6525f10112c Mon Sep 17 00:00:00 2001
From: Rebecca Williams <rjw@observatorysciences.co.uk>
Date: Fri, 3 Jul 2026 14:30:08 +0100
Subject: [PATCH] Fix bug with a rotated Label in a Group widget

A translation is applied to the JFX Label to get a rotated label
but the width property of the label remains unchanged and so the
group pane thinks this child is wider than it should be and paints
the group out to this width causing screen sizing problems.
---
 .../javafx/widgets/LabelRepresentation.java   | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/LabelRepresentation.java b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/LabelRepresentation.java
index 3585156e5d..66b46fd532 100644
--- a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/LabelRepresentation.java
+++ b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/LabelRepresentation.java
@@ -7,6 +7,7 @@
  *******************************************************************************/
 package org.csstudio.display.builder.representation.javafx.widgets;
 
+import javafx.scene.layout.Pane;
 import org.csstudio.display.builder.model.DirtyFlag;
 import org.csstudio.display.builder.model.UntypedWidgetPropertyListener;
 import org.csstudio.display.builder.model.WidgetProperty;
@@ -32,13 +33,14 @@
  *  @author Kay Kasemir
  */
 @SuppressWarnings("nls")
-public class LabelRepresentation extends RegionBaseRepresentation<Label, LabelWidget>
+public class LabelRepresentation extends RegionBaseRepresentation<Pane, LabelWidget>
 {
     private final DirtyFlag dirty_style = new DirtyFlag();
     private final DirtyFlag dirty_content = new DirtyFlag();
     private final UntypedWidgetPropertyListener contentChangedListener = this::contentChanged;
     private final UntypedWidgetPropertyListener styleChangedListener = this::styleChanged;
     private volatile Pos pos;
+    private Label label;
 
     /** Was there ever any transformation applied to the jfx_node?
      *
@@ -49,11 +51,11 @@ public class LabelRepresentation extends RegionBaseRepresentation<Label, LabelWi
     private boolean was_ever_transformed = false;
 
     @Override
-    public Label createJFXNode() throws Exception
+    public Pane createJFXNode() throws Exception
     {
-        final Label label = new Label();
+        label = new Label();
         label.getStyleClass().add("text_update");
-        return label;
+        return new Pane(label);
     }
 
     @Override
@@ -119,7 +121,7 @@ public void updateChanges()
         if (dirty_content.checkAndClear())
         {
             final String text = model_widget.propText().getValue();
-            jfx_node.setText(text);
+            label.setText(text);
             if (model_widget.propAutoSize().getValue())
             {
                 final Dimension2D size = TextUtils.computeTextSize(JFXUtil.convert(model_widget.propFont().getValue()), text);
@@ -140,14 +142,16 @@ public void updateChanges()
                 jfx_node.setPrefSize(width, height);
                 jfx_node.setMinSize(Control.USE_PREF_SIZE, Control.USE_PREF_SIZE);
                 jfx_node.setMaxSize(Control.USE_PREF_SIZE, Control.USE_PREF_SIZE);
+                label.setPrefSize(width, height);
                 if (was_ever_transformed)
-                    jfx_node.getTransforms().clear();
+                    label.getTransforms().clear();
                 break;
             case NINETY:
-                jfx_node.setPrefSize(height, width);
+                jfx_node.setPrefSize(width, height);
                 jfx_node.setMinSize(Control.USE_PREF_SIZE, Control.USE_PREF_SIZE);
                 jfx_node.setMaxSize(Control.USE_PREF_SIZE, Control.USE_PREF_SIZE);
-                jfx_node.getTransforms().setAll(new Rotate(-rotation.getAngle()),
+                label.setPrefSize(height, width);
+                label.getTransforms().setAll(new Rotate(-rotation.getAngle()),
                                                 new Translate(-height, 0));
                 was_ever_transformed = true;
                 break;
@@ -155,33 +159,35 @@ public void updateChanges()
                 jfx_node.setPrefSize(width, height);
                 jfx_node.setMinSize(Control.USE_PREF_SIZE, Control.USE_PREF_SIZE);
                 jfx_node.setMaxSize(Control.USE_PREF_SIZE, Control.USE_PREF_SIZE);
-                jfx_node.getTransforms().setAll(new Rotate(-rotation.getAngle()),
+                label.setPrefSize(width, height);
+                label.getTransforms().setAll(new Rotate(-rotation.getAngle()),
                                                 new Translate(-width, -height));
                 was_ever_transformed = true;
                                break;
             case MINUS_NINETY:
-                jfx_node.setPrefSize(height, width);
+                jfx_node.setPrefSize(width, height);
                 jfx_node.setMinSize(Control.USE_PREF_SIZE, Control.USE_PREF_SIZE);
                 jfx_node.setMaxSize(Control.USE_PREF_SIZE, Control.USE_PREF_SIZE);
-                jfx_node.getTransforms().setAll(new Rotate(-rotation.getAngle()),
+                label.setPrefSize(height, width);
+                label.getTransforms().setAll(new Rotate(-rotation.getAngle()),
                                                 new Translate(0, -width));
                 was_ever_transformed = true;
                 break;
             }
-            jfx_node.setAlignment(pos);
-            jfx_node.setTextAlignment(TextAlignment.values()[model_widget.propHorizontalAlignment().getValue().ordinal()]);
-            jfx_node.setWrapText(model_widget.propWrapWords().getValue());
+            label.setAlignment(pos);
+            label.setTextAlignment(TextAlignment.values()[model_widget.propHorizontalAlignment().getValue().ordinal()]);
+            label.setWrapText(model_widget.propWrapWords().getValue());
 
             Color color = JFXUtil.convert(model_widget.propForegroundColor().getValue());
-            jfx_node.setTextFill(color);
+            label.setTextFill(color);
             if (model_widget.propTransparent().getValue())
-                jfx_node.setBackground(null); // No fill
+                label.setBackground(null); // No fill
             else
             {   // Fill background
                 color = JFXUtil.convert(model_widget.propBackgroundColor().getValue());
-                jfx_node.setBackground(new Background(new BackgroundFill(color, CornerRadii.EMPTY, Insets.EMPTY)));
+                label.setBackground(new Background(new BackgroundFill(color, CornerRadii.EMPTY, Insets.EMPTY)));
             }
-            jfx_node.setFont(JFXUtil.convert(model_widget.propFont().getValue()));
+            label.setFont(JFXUtil.convert(model_widget.propFont().getValue()));
         }
     }
 }