From d1fbce9bb2912858fe72d6621b3fad5dbbed82f5 Mon Sep 17 00:00:00 2001
From: DS_Starter <DS_Starter@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Thu, 9 Oct 2025 16:46:03 +0000
Subject: [PATCH] 76_SolarForecast: one more fix of color filling of svg icon

git-svn-id: https://svn.fhem.de/fhem/trunk@30369 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/76_SolarForecast.pm               | 9 ++++++---
 fhem/contrib/DS_Starter/76_SolarForecast.pm | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/fhem/FHEM/76_SolarForecast.pm b/fhem/FHEM/76_SolarForecast.pm
index b7723548f..ff292cf00 100644
--- a/fhem/FHEM/76_SolarForecast.pm
+++ b/fhem/FHEM/76_SolarForecast.pm
@@ -160,6 +160,7 @@ BEGIN {
 
 # Versions History intern
 my %vNotesIntern = (
+  "1.59.2" => "09.10.2025  one more fix of color filling of svg icon ",
   "1.59.1" => "08.10.2025  fixed transfer at day change, optimal SoC consideration in SoC forecast for optPower strategy ".
                            "__normIconInnerScale: add path color filling, Calculation of time-weighted consumption or PV generation ".
                            "in the current hour ",
@@ -19645,9 +19646,11 @@ sub __normIconInnerScale {
   $ox += $pad;                                                                                 # fügt $pad ViewBox-Einheiten Rand links bzw. oben hinzu.
   $oy += $pad;
 
-  if ($fill) {
-	  $inner =~ s{<path(?![^>]*\bfill)}{<path fill="$fill"}g;
-	  $inner =~ s{<path(?![^>]*\bstroke)}{<path stroke="$fill"}g;
+  if ($fill) {     
+      $inner =~ s/\bfill="[^"]*"/fill="$fill"/gi;
+      for my $tag (qw(path rect circle ellipse polygon polyline line)) {
+          $inner =~ s{<$tag(?![^>]*\bfill=)}{<$tag fill="$fill"}gi;
+      }
   }
   
   $inner = qq{<g transform="translate($ox $oy) scale($scale)">}.$inner.'</g>';                 # gib Inner-Content zurück, umgeben von der Transform-Gruppe
diff --git a/fhem/contrib/DS_Starter/76_SolarForecast.pm b/fhem/contrib/DS_Starter/76_SolarForecast.pm
index b7723548f..ff292cf00 100644
--- a/fhem/contrib/DS_Starter/76_SolarForecast.pm
+++ b/fhem/contrib/DS_Starter/76_SolarForecast.pm
@@ -160,6 +160,7 @@ BEGIN {
 
 # Versions History intern
 my %vNotesIntern = (
+  "1.59.2" => "09.10.2025  one more fix of color filling of svg icon ",
   "1.59.1" => "08.10.2025  fixed transfer at day change, optimal SoC consideration in SoC forecast for optPower strategy ".
                            "__normIconInnerScale: add path color filling, Calculation of time-weighted consumption or PV generation ".
                            "in the current hour ",
@@ -19645,9 +19646,11 @@ sub __normIconInnerScale {
   $ox += $pad;                                                                                 # fügt $pad ViewBox-Einheiten Rand links bzw. oben hinzu.
   $oy += $pad;
 
-  if ($fill) {
-	  $inner =~ s{<path(?![^>]*\bfill)}{<path fill="$fill"}g;
-	  $inner =~ s{<path(?![^>]*\bstroke)}{<path stroke="$fill"}g;
+  if ($fill) {     
+      $inner =~ s/\bfill="[^"]*"/fill="$fill"/gi;
+      for my $tag (qw(path rect circle ellipse polygon polyline line)) {
+          $inner =~ s{<$tag(?![^>]*\bfill=)}{<$tag fill="$fill"}gi;
+      }
   }
   
   $inner = qq{<g transform="translate($ox $oy) scale($scale)">}.$inner.'</g>';                 # gib Inner-Content zurück, umgeben von der Transform-Gruppe