X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/15a8fe81499c156e251986f5bd33801f54c140e9..67858ed10ece500b2cf68dafb39886a0b873ec4c:/lib/python/Components/Converter/TemplatedMultiContent.py

diff --git a/lib/python/Components/Converter/TemplatedMultiContent.py b/lib/python/Components/Converter/TemplatedMultiContent.py
index 25c4b1a4..b86d94bf 100644
--- a/lib/python/Components/Converter/TemplatedMultiContent.py
+++ b/lib/python/Components/Converter/TemplatedMultiContent.py
@@ -5,7 +5,7 @@ class TemplatedMultiContent(StringList):
 	def __init__(self, args):
 		StringList.__init__(self, args)
 		from enigma import eListboxPythonMultiContent, gFont, RT_HALIGN_LEFT, RT_HALIGN_CENTER, RT_HALIGN_RIGHT, RT_VALIGN_TOP, RT_VALIGN_CENTER, RT_VALIGN_BOTTOM, RT_WRAP
-		from Components.MultiContent import MultiContentEntryText, MultiContentEntryPixmap, MultiContentEntryPixmapAlphaTest, MultiContentTemplateColor, MultiContentEntryProgress
+		from Components.MultiContent import MultiContentEntryText, MultiContentEntryPixmap, MultiContentEntryPixmapAlphaTest, MultiContentEntryPixmapAlphaBlend, MultiContentTemplateColor, MultiContentEntryProgress
 		l = locals()
 		del l["self"] # cleanup locals a bit
 		del l["args"]
@@ -18,13 +18,13 @@ class TemplatedMultiContent(StringList):
 		assert "template" in self.template or "default" in self.template["templates"] # we need to have a default template
 
 		if not "template" in self.template: # default template can be ["template"] or ["templates"]["default"]
-			self.template["template"] = self.template["templates"]["default"]
+			self.template["template"] = self.template["templates"]["default"][1]
+			self.template["itemHeight"] = self.template["template"][0]
 
 	def changed(self, what):
 		if not self.content:
 			from enigma import eListboxPythonMultiContent
 			self.content = eListboxPythonMultiContent()
-			self.content.setItemHeight(self.template["itemHeight"])
 			self.setTemplate()
 
 			# also setup fonts (also given by source)
@@ -53,8 +53,12 @@ class TemplatedMultiContent(StringList):
 			# if skin defined "templates", that means that it defines multiple styles in a dict. template should still be a default
 			templates = self.template.get("templates")
 			template = self.template.get("template")
+			itemheight = self.template["itemHeight"]
 
-			if templates and style: # if we have a custom style defined in the source, and different templates in the skin, look it up
-				template = templates.get(self.source.style, template) # default to default template
+			if templates and style and style in templates: # if we have a custom style defined in the source, and different templates in the skin, look it up
+				template = templates[style][1]
+				itemheight = templates[style][0]
 
 			self.content.setTemplate(template)
+
+			self.content.setItemHeight(itemheight)