From 81e44f3703f4eb78f356f249d8792b8caeeb34d7 Mon Sep 17 00:00:00 2001 From: betateilchen <> Date: Fri, 13 Feb 2015 23:52:14 +0000 Subject: [PATCH] 55_InfoPanel.pm: updated git-svn-id: https://svn.fhem.de/fhem/trunk@7966 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/55_InfoPanel.pm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/fhem/FHEM/55_InfoPanel.pm b/fhem/FHEM/55_InfoPanel.pm index af4e313ce..8dea4ada9 100644 --- a/fhem/FHEM/55_InfoPanel.pm +++ b/fhem/FHEM/55_InfoPanel.pm @@ -578,7 +578,7 @@ sub btIP_itemTextBox { } sub btIP_itemTicker { - my ($id,$x,$y,$items,$speed,$arg,%params) = @_; + my ($id,$x,$y,$width,$items,$speed,$arg,%params) = @_; $id = ($id eq '-') ? createUniqueId() : $id; my $pause = 2 * $speed; my $color = substr($params{rgb},0,6); @@ -589,9 +589,11 @@ sub btIP_itemTicker { "\n". "
\n\n
\n\n"; + return $ticker; } @@ -1116,12 +1118,12 @@ sub btIP_evalLayout { } when("ticker") { - ($id,$x,$y,$format,$speed,$arg)= split("[ \t]+", $def, 6); + ($id,$x,$y,$width,$format,$speed,$arg)= split("[ \t]+", $def, 7); ($x,$y)= btIP_xy($x,$y,%params); $params{xx} = $x; $params{yy} = $y; $arg = AnalyzePerlCommand(undef,$arg); - $defs{$name}{fhem}{div} .= btIP_itemTicker($id,$x,$y,$format,$speed,$arg,%params); + $defs{$name}{fhem}{div} .= btIP_itemTicker($id,$x,$y,$width,$format,$speed,$arg,%params); } when("time") { @@ -1137,8 +1139,8 @@ sub btIP_evalLayout { ($x,$y)= btIP_xy($x,$y,%params); $fgcolor = AnalyzePerlCommand(undef,$fgcolor); $bgcolor = AnalyzePerlCommand(undef,$bgcolor); - $link = AnalyzePerlCommand(undef,$link); - $svg .= btIP_itemTrash($id,$x,$y,$scale,$fgcolor,$bgcolor,$link,%params); + $link = AnalyzePerlCommand(undef,$link); + $svg .= btIP_itemTrash($id,$x,$y,$scale,$fgcolor,$bgcolor,$link,%params); $params{xx} = $x; $params{yy} = $y; }