X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/63c50e7cee4a774e5a6bd0b710dbf7c2bf24b8f3..d7c4babd6e6040f085d118086d03419036c31b48:/lib/python/Components/ScrollLabel.py diff --git a/lib/python/Components/ScrollLabel.py b/lib/python/Components/ScrollLabel.py index c7e41c7c..fb89e411 100644 --- a/lib/python/Components/ScrollLabel.py +++ b/lib/python/Components/ScrollLabel.py @@ -14,7 +14,16 @@ class ScrollLabel(HTMLComponent, GUIComponent): self.total = None def applySkin(self, desktop): - skin.applyAllAttributes(self.long_text, desktop, self.skinAttributes) + ret = False + if self.skinAttributes is not None: + skin.applyAllAttributes(self.long_text, desktop, self.skinAttributes) + attribs = [ ] + for (attrib, value) in self.skinAttributes: + if attrib.find("Color") != -1 or attrib.find("transparent") != -1: + attribs.append((attrib,value)) + skin.applyAllAttributes(self.instance, desktop, attribs) + skin.applyAllAttributes(self.scrollbar, desktop, attribs) + ret = True s = self.long_text.size() self.instance.move(self.long_text.position()) lineheight=fontRenderClass.getInstance().getLineHeight( self.long_text.getFont() ) @@ -29,10 +38,11 @@ class ScrollLabel(HTMLComponent, GUIComponent): self.long_text.move(ePoint(0,0)) self.long_text.resize(eSize(s.width()-30, self.pageHeight*16)) self.setText(self.message) + return ret def setText(self, text): self.message = text - if self.long_text is not None: + if self.long_text is not None and self.pageHeight: self.long_text.move(ePoint(0,0)) self.long_text.setText(self.message) text_height=self.long_text.calculateSize().height()