X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c479beea7cc338380a38e29ae041c03b2c299ac1..b4d8c89302c67237b8a121a8f262e9db0022a9e7:/lib/python/Components/Renderer/Canvas.py

diff --git a/lib/python/Components/Renderer/Canvas.py b/lib/python/Components/Renderer/Canvas.py
index 01b05fb0..bd7ffb5e 100644
--- a/lib/python/Components/Renderer/Canvas.py
+++ b/lib/python/Components/Renderer/Canvas.py
@@ -29,12 +29,28 @@ class Canvas(Renderer):
 
 	def draw(self, list):
 		for l in list:
-			print "drawing ..", l
-			self.instance.fillRect(eRect(l[1], l[2], l[3], l[4]), gRGB(l[5]))
+			if l[0] == 1:
+				self.instance.fillRect(eRect(l[1], l[2], l[3], l[4]), gRGB(l[5]))
+			elif l[0] == 2:
+				self.instance.writeText(eRect(l[1], l[2], l[3], l[4]), gRGB(l[5]), gRGB(l[6]), l[7], l[8], l[9])
+			else:
+				print "drawlist entry:", l
+				raise "invalid drawlist entry"
 
 	def changed(self, what):
 		self.pull_updates()
 
 	def postWidgetCreate(self, instance):
 		self.sequence = None
+
+		from enigma import eSize
+
+		def parseSize(str):
+			x, y = str.split(',')
+			return eSize(int(x), int(y))
+
+		for (attrib, value) in self.skinAttributes:
+			if attrib == "size":
+				self.instance.setSize(parseSize(value))
+
 		self.pull_updates()