2
0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 09:16:53 +00:00

98_DOIF.pm, fixed svg function: icon_ring2: icon arguments

git-svn-id: https://svn.fhem.de/fhem/trunk@23974 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Damian 2021-03-14 22:43:36 +00:00
parent da5091d98f
commit fe7d4fad16

View File

@ -4755,7 +4755,7 @@ sub ring
}
}
if (defined $icon and $icon ne "") {
$ic="$ic\@".color($currColor,$ln) if ($icon !~ /@/);
$ic="$ic\@".color($currColor,$ln) if ($ic !~ /@/);
}
my $width=int($size/100*63);
my $height=int($size/100*58);
@ -4905,11 +4905,11 @@ sub ring2
}
if (defined $icon and $icon ne "") {
if ($icon !~ /@/) {
$ic="$icon\@".color($currColor,$ln);
} elsif ($icon =~ /^(.*\@)colorVal1/) {
if ($ic !~ /@/) {
$ic="$ic\@".color($currColor,$ln);
} elsif ($ic =~ /^(.*\@)colorVal1/) {
$ic="$1".color($currColor,$ln);
} elsif ($icon =~ /^(.*\@)colorVal2/) {
} elsif ($ic =~ /^(.*\@)colorVal2/) {
$ic="$1".color($currColor2,$ln);
}
}