From a0d96c6a7b68c46c00bece1c7cb36cfde92686ab Mon Sep 17 00:00:00 2001
From: Rebecca Williams <rjw@observatorysciences.co.uk>
Date: Tue, 12 Aug 2025 16:44:24 +0100
Subject: [PATCH 1/3] Fix no_write cursor not showing for multi-line TextEntry
 widget

Fixes issue #3502 where no_write cursor only showed around the border
of disabled TextEntry widgets with multi-line entry enabled.
---
 .../javafx/widgets/TextEntryRepresentation.java        | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/TextEntryRepresentation.java b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/TextEntryRepresentation.java
index 6ae8f2c1a9..edb6872901 100644
--- a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/TextEntryRepresentation.java
+++ b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/TextEntryRepresentation.java
@@ -9,6 +9,7 @@
 
 import static org.csstudio.display.builder.representation.ToolkitRepresentation.logger;
 
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 
@@ -51,6 +52,8 @@ public class TextEntryRepresentation extends RegionBaseRepresentation<TextInputC
      */
     private boolean active = false;
     private volatile boolean enabled = true;
+    private static final String NODE_ID = UUID.randomUUID().toString();;
+
 
     private final DirtyFlag dirty_size = new DirtyFlag();
     private final DirtyFlag dirty_style = new DirtyFlag();
@@ -101,6 +104,7 @@ public TextInputControl createJFXNode() throws Exception
             text = new TextField();
         text.setMinSize(Region.USE_PREF_SIZE, Region.USE_PREF_SIZE);
         text.getStyleClass().add("text_entry");
+        text.setId(NODE_ID);
 
         if (! toolkit.isEditMode())
         {
@@ -425,6 +429,12 @@ else if(jfx_node instanceof TextArea){
                 String alignment = model_widget.propHorizontalAlignment().getValue().toString().toLowerCase();
                 PseudoClass alignmentClass = PseudoClass.getPseudoClass(alignment);
                 jfx_node.pseudoClassStateChanged(alignmentClass, true);
+                
+                if (jfx_node.getScene() != null) {
+                    // Need to get the TextArea 'content' node to set the cursor
+                    // for the whole widget otherwise it will only show on the borders.
+                    jfx_node.getScene().lookup("#"+NODE_ID+" .content").setCursor(Cursors.NO_WRITE);
+                }
             }
         }
         if (! active)

From d0dd5a404e072e69d1062ca4b1df3ada7dbf1c37 Mon Sep 17 00:00:00 2001
From: Rebecca Williams <rjw@observatorysciences.co.uk>
Date: Tue, 12 Aug 2025 17:50:04 +0100
Subject: [PATCH 2/3] Add 'enabled' check and remove static declaration of ID
 variable

---
 .../javafx/widgets/TextEntryRepresentation.java          | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/TextEntryRepresentation.java b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/TextEntryRepresentation.java
index edb6872901..f0fa371ad4 100644
--- a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/TextEntryRepresentation.java
+++ b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/TextEntryRepresentation.java
@@ -52,7 +52,7 @@ public class TextEntryRepresentation extends RegionBaseRepresentation<TextInputC
      */
     private boolean active = false;
     private volatile boolean enabled = true;
-    private static final String NODE_ID = UUID.randomUUID().toString();;
+    private final String node_id = UUID.randomUUID().toString();;
 
 
     private final DirtyFlag dirty_size = new DirtyFlag();
@@ -104,7 +104,7 @@ public TextInputControl createJFXNode() throws Exception
             text = new TextField();
         text.setMinSize(Region.USE_PREF_SIZE, Region.USE_PREF_SIZE);
         text.getStyleClass().add("text_entry");
-        text.setId(NODE_ID);
+        text.setId(node_id);
 
         if (! toolkit.isEditMode())
         {
@@ -430,10 +430,11 @@ else if(jfx_node instanceof TextArea){
                 PseudoClass alignmentClass = PseudoClass.getPseudoClass(alignment);
                 jfx_node.pseudoClassStateChanged(alignmentClass, true);
                 
-                if (jfx_node.getScene() != null) {
+                if (jfx_node.getScene() != null && !enabled) {
                     // Need to get the TextArea 'content' node to set the cursor
                     // for the whole widget otherwise it will only show on the borders.
-                    jfx_node.getScene().lookup("#"+NODE_ID+" .content").setCursor(Cursors.NO_WRITE);
+                    jfx_node.getScene().lookup("#"+node_id+" .content").setCursor(Cursors.NO_WRITE);
+                    jfx_node.layout();
                 }
             }
         }

From d6080b29677cfd8169a49f3514b4938a4af2b302 Mon Sep 17 00:00:00 2001
From: Rebecca Williams <rjw@observatorysciences.co.uk>
Date: Tue, 12 Aug 2025 17:54:03 +0100
Subject: [PATCH 3/3] Disabled look should only apply to runtime display

Add check that we are not in edit mode before setting disabled look
and cursor.
---
 .../javafx/widgets/JFXBaseRepresentation.java      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/JFXBaseRepresentation.java b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/JFXBaseRepresentation.java
index c6ecdb754b..cd9493c545 100644
--- a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/JFXBaseRepresentation.java
+++ b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/JFXBaseRepresentation.java
@@ -369,12 +369,14 @@ public void updateOrder()
      * @param children list of children nodes under the parent widget
      */
     public void setDisabledLook(Boolean enabled, ObservableList<Node> children) {
-        jfx_node.setCursor(enabled ? Cursor.DEFAULT : Cursors.NO_WRITE);
-        if (children != null) {
-            for (Node node : children)
-            {
-                Styles.update(node, Styles.NOT_ENABLED, !enabled);
-            }   
+        if (!toolkit.isEditMode()) {
+            jfx_node.setCursor(enabled ? Cursor.DEFAULT : Cursors.NO_WRITE);
+            if (children != null) {
+                for (Node node : children)
+                {
+                    Styles.update(node, Styles.NOT_ENABLED, !enabled);
+                }   
+            }
         }
     }
 }