From ec2251f93d2c2b822d737b6976591d360ecd2b6b Mon Sep 17 00:00:00 2001
From: betateilchen <>
Date: Sat, 14 Feb 2015 11:12:15 +0000
Subject: [PATCH] 55_InfoPanel.pm: updated

git-svn-id: https://svn.fhem.de/fhem/trunk@7967 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/55_InfoPanel.pm | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/fhem/FHEM/55_InfoPanel.pm b/fhem/FHEM/55_InfoPanel.pm
index 8dea4ada9..67ab28e35 100644
--- a/fhem/FHEM/55_InfoPanel.pm
+++ b/fhem/FHEM/55_InfoPanel.pm
@@ -332,7 +332,7 @@ sub btIP_itemGroup {
 
 sub btIP_itemImg {
   return unless $useImgTools;
-  my ($id,$x,$y,$scale,$srctype,$arg,$link,%params)= @_;
+  my ($id,$x,$y,$scale,$link,$srctype,$arg,%params)= @_;
   $id = ($id eq '-') ? createUniqueId() : $id;
   return unless(defined($arg));
   return if($arg eq "");
@@ -711,9 +711,10 @@ sub btIP_findTarget {
 
 sub btIP_xy {
   my ($x,$y,%params)= @_;
-
-  $x = $params{xx} if($x eq 'x');
-  $y = $params{yy} if($y eq 'y');
+  $x = $params{width}  if ($x eq 'max');
+  $y = $params{height} if ($y eq 'max');
+  $x = $params{xx}     if ($x eq 'x');
+  $y = $params{yy}     if ($y eq 'y');
   if((-1 < $x) && ($x < 1)) { $x *= $params{width}; }
   if((-1 < $y) && ($y < 1)) { $y *= $params{height}; }
   return($x,$y);
@@ -971,14 +972,14 @@ sub btIP_evalLayout {
         }
 
 	    when("img") {
-	      ($id,$x,$y,$scale,$srctype,$arg,$link) = split("[ \t]+", $def,7);
+	      ($id,$x,$y,$scale,$link,$srctype,$arg) = split("[ \t]+", $def,7);
 	      ($x,$y) = btIP_xy($x,$y,%params);
 	      $params{xx} = $x;
 	      $params{yy} = $y; 
-	      $arg  = AnalyzePerlCommand(undef, $arg);
-              $link = AnalyzePerlCommand(undef,$link);
-              my($output,$width,$height)= btIP_itemImg($id,$x,$y,$scale,$srctype,$arg,$link,%params);
-              $svg .= $output;
+ 	      $arg  = AnalyzePerlCommand(undef,$arg);
+          $link = AnalyzePerlCommand(undef,$link);
+          my($output,$width,$height)= btIP_itemImg($id,$x,$y,$scale,$link,$srctype,$arg,%params);
+          $svg .= $output;
 	      $params{xx} = $x;
 	      $params{yy} = $y+$height;
 	    }