[BasicUI] Fix label color initialization for color widget (#1753)

Fix #1752 Signed-off-by: Laurent Garnier <lg.hc@free.fr>
openhab · Mar 4, 2023 · 66b5554 · 66b5554
1 parent 7553748
commit 66b5554
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/...nhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/ColorpickerRenderer.java b/...nhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/ColorpickerRenderer.java
@@ -89,19 +89,8 @@ public EList<Widget> renderWidget(Widget w, StringBuilder sb, String sitemap) th
         snippet = snippet.replace("%frequency%", frequency);
         snippet = snippet.replace("%servletname%", WebAppServlet.SERVLET_PATH);
 
-        String style = "";
-        String color = itemUIRegistry.getLabelColor(w);
-        if (color != null) {
-            style = "color:" + color;
-        }
-        snippet = snippet.replace("%labelstyle%", style);
-
-        style = "";
-        color = itemUIRegistry.getValueColor(w);
-        if (color != null) {
-            style = "color:" + color;
-        }
-        snippet = snippet.replace("%valuestyle%", style);
+        // Process the color tags
+        snippet = processColor(w, snippet);
 
         sb.append(snippet);
         return ECollections.emptyEList();

diff --git a/bundles/org.openhab.ui.basic/src/main/resources/snippets/colorpicker.html b/bundles/org.openhab.ui.basic/src/main/resources/snippets/colorpicker.html
@@ -2,7 +2,7 @@
 	<span class="mdl-form__icon">
 		%icon_snippet%
 	</span>
-	<span class="mdl-form__label">
+	<span %labelstyle% class="mdl-form__label">
 		%label%
 	</span>
 	<div