From a7e5d4c43121d47dcaee4efa5a41679e22f4e3e9 Mon Sep 17 00:00:00 2001
From: Rebecca Williams <rjw@observatorysciences.co.uk>
Date: Wed, 23 Jul 2025 10:51:14 +0100
Subject: [PATCH 1/3] Remove legacy LCID macro

This prevents Phoebus from detecting if a display is already open
as the URI for the embedded display being open contains this macro.
See issue #3458.
---
 .../builder/model/widgets/EmbeddedDisplayWidget.java  | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/EmbeddedDisplayWidget.java b/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/EmbeddedDisplayWidget.java
index 4eab584967..ca5dcb967e 100644
--- a/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/EmbeddedDisplayWidget.java
+++ b/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/EmbeddedDisplayWidget.java
@@ -307,17 +307,6 @@ public WidgetProperty<?> getProperty(String name) throws IllegalArgumentExceptio
         return super.getProperty(name);
     }
 
-    @Override
-    public Macros getEffectiveMacros()
-    {
-        final Macros macros = new Macros(super.getEffectiveMacros());
-
-        // Legacy "Linking Container" defined a "Linking Container ID" macro.
-        macros.add("LCID", getID());
-
-        return macros;
-    }
-
     /** @return 'file' property */
     public WidgetProperty<String> propFile()
     {

From c35350658b077f26b7e4752b14960f7088b8faa0 Mon Sep 17 00:00:00 2001
From: Rebecca Williams <rjw@observatorysciences.co.uk>
Date: Wed, 23 Jul 2025 10:54:27 +0100
Subject: [PATCH 2/3] Remove defaut demo macros that are getting added to URIs

This prevents Phoebus from detecting if a display is already open.
See issue #3458.
---
 .../src/main/resources/display_model_preferences.properties     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/display/model/src/main/resources/display_model_preferences.properties b/app/display/model/src/main/resources/display_model_preferences.properties
index d898002f26..48478ca9d4 100644
--- a/app/display/model/src/main/resources/display_model_preferences.properties
+++ b/app/display/model/src/main/resources/display_model_preferences.properties
@@ -32,7 +32,7 @@ font_files=examples:font.def
 # * May then contain characters or numbers
 # * May also contain underscores
 # 
-macros=<EXAMPLE_MACRO>Value from Preferences</EXAMPLE_MACRO><TEST>true</TEST>
+macros=
 
 
 # Timeout [ms] for loading files: Displays, but also color, font, widget class files

From e94a71ca09d65b04c1e14125c8d5225f94567ad4 Mon Sep 17 00:00:00 2001
From: Rebecca Williams <rjw@observatorysciences.co.uk>
Date: Wed, 23 Jul 2025 13:59:29 +0100
Subject: [PATCH 3/3] Add example for the format of global macros

---
 .../src/main/resources/display_model_preferences.properties    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/display/model/src/main/resources/display_model_preferences.properties b/app/display/model/src/main/resources/display_model_preferences.properties
index 48478ca9d4..55d3a38ef8 100644
--- a/app/display/model/src/main/resources/display_model_preferences.properties
+++ b/app/display/model/src/main/resources/display_model_preferences.properties
@@ -31,7 +31,8 @@ font_files=examples:font.def
 # * Must start with character
 # * May then contain characters or numbers
 # * May also contain underscores
-# 
+# E.g.
+#  macros=<EXAMPLE_MACRO>Value from Preferences</EXAMPLE_MACRO><TEST>true</TEST>
 macros=