From: Felix Domke <tmbinc@elitedvb.net>
Date: Sun, 10 May 2009 22:11:45 +0000 (+0200)
Subject: allow per-template itemheight; in multi-template-mode, template is now a (itemheight... 
X-Git-Tag: 2.6.0~319
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/c3f2fa3d78531c2cb7de469d38e44c965102d454

allow per-template itemheight; in multi-template-mode, template is now a (itemheight, templatelist)-tuple
---

diff --git a/lib/python/Components/Converter/TemplatedMultiContent.py b/lib/python/Components/Converter/TemplatedMultiContent.py
index 25c4b1a4..8a708c14 100644
--- a/lib/python/Components/Converter/TemplatedMultiContent.py
+++ b/lib/python/Components/Converter/TemplatedMultiContent.py
@@ -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)