FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 16:56:54 +00:00
Code Issues Releases Wiki Activity

Revert "02_RSS.pm: filled textbox"

Browse Source 
This reverts commit 924268bc89116b47335274b20370af8669432829.

git-svn-id: https://svn.fhem.de/fhem/trunk@7638 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2015-01-20 13:04:21 +00:00
parent ab95bcd7f7
commit e01304c50c
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fhem/FHEM/02_RSS.pm
View File

@ -338,7 +338,7 @@ RSS_itemText {
sub
RSS_itemTextBox {
my ($S,$x,$y,$boxwidth,$bgcolor,$text,%params)= @_;
my ($S,$x,$y,$boxwidth,$text,%params)= @_;
return unless(defined($text));
if($params{useTextWrap}) {
@ -350,12 +350,7 @@ RSS_itemTextBox {
);
$wrapbox->set_font($params{font}, $params{pt});
$wrapbox->set(align => $params{thalign}, width => $boxwidth);
my ($left, $top, $right, $bottom);
($left, $top, $right, $bottom) = $wrapbox->draw($x, $y);
if(defined($bgcolor)) {
$S->filledRectangle($left,$top,$right,$bottom,RSS_color($S,$bgcolor));
($left, $top, $right, $bottom) = $wrapbox->draw($x, $y);
}
my ($left, $top, $right, $bottom) = $wrapbox->draw($x, $y);
return $bottom;
} else {
RSS_itemText($S,$x,$y,$text,%params);
@ -512,7 +507,7 @@ RSS_evalLayout($$@) {
$params{y}= 0;
my ($x,$y,$x1,$y1,$x2,$y2,$scale,$bgcolor,$boxwidth,$text,$imgtype,$srctype,$arg,$format);
my ($x,$y,$x1,$y1,$x2,$y2,$scale,$boxwidth,$text,$imgtype,$srctype,$arg,$format);
my $cont= "";
foreach my $line (@layout) {
@ -590,12 +585,11 @@ RSS_evalLayout($$@) {
#Debug "$name: ($x,$y) $txt";
RSS_itemText($S,$x,$y,$txt,%params);
} elsif($cmd eq "textbox") {
($x,$y,$boxwidth,$bgcolor,$text)= split("[ \t]+", $def, 5);
($x,$y,$boxwidth,$text)= split("[ \t]+", $def, 4);
($x,$y)= RSS_xy($S, $x,$y,%params);
$bgcolor = ($bgcolor ne "") ? AnalyzePerlCommand(undef,$bgcolor) : undef;
my $txt= AnalyzePerlCommand(undef, $text);
#Debug "$name: ($x,$y) $txt";
$y= RSS_itemTextBox($S,$x,$y,$boxwidth,$bgcolor,$txt,%params);
$y= RSS_itemTextBox($S,$x,$y,$boxwidth,$txt,%params);
$params{x} = $x;
$params{y} = $y;
} elsif($cmd eq "line") {