From 66b55547a4a7a56de3d3949d5d3a97d35cdb6ed1 Mon Sep 17 00:00:00 2001
From: lolodomo <lg.hc@free.fr>
Date: Sat, 4 Mar 2023 22:24:22 +0100
Subject: [PATCH] [BasicUI] Fix label color initialization for color widget
 (#1753)

Fix #1752

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
---
 .../internal/render/ColorpickerRenderer.java      | 15 ++-------------
 .../src/main/resources/snippets/colorpicker.html  |  2 +-
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/ColorpickerRenderer.java b/bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/ColorpickerRenderer.java
index d9b520bb5..a135cc91d 100644
--- a/bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/ColorpickerRenderer.java
+++ b/bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/ColorpickerRenderer.java
@@ -89,19 +89,8 @@ public class ColorpickerRenderer extends AbstractWidgetRenderer {
         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
index 8829c7d8c..378198b2a 100644
--- 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