diff options
| author | acid-burn <acid-burn@opendreambox.org> | 2010-10-05 09:33:32 +0200 |
|---|---|---|
| committer | acid-burn <acid-burn@opendreambox.org> | 2010-10-05 09:33:32 +0200 |
| commit | db1d27d8b635de5bf0096a4853b45f42090050ad (patch) | |
| tree | b2dceb5506ae6d27ab9d3e3a0995c26eb1b87b62 /lib/python/Components/Converter | |
| parent | ceda5c95efab67c8116ba9ed4a51d4488c46d741 (diff) | |
| parent | ca5b57073d8ef83110e6956b71134f3c1a1589a6 (diff) | |
| download | enigma2-db1d27d8b635de5bf0096a4853b45f42090050ad.tar.gz enigma2-db1d27d8b635de5bf0096a4853b45f42090050ad.zip | |
Merge commit 'origin/bug_478_Listbox_ScrollbarMode'
Conflicts:
lib/python/Components/Converter/TemplatedMultiContent.py
lib/python/Components/Renderer/Listbox.py
Diffstat (limited to 'lib/python/Components/Converter')
| -rwxr-xr-x[-rw-r--r--] | lib/python/Components/Converter/TemplatedMultiContent.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/python/Components/Converter/TemplatedMultiContent.py b/lib/python/Components/Converter/TemplatedMultiContent.py index b5a98449..b1d89f55 100644..100755 --- a/lib/python/Components/Converter/TemplatedMultiContent.py +++ b/lib/python/Components/Converter/TemplatedMultiContent.py @@ -53,14 +53,18 @@ class TemplatedMultiContent(StringList): template = self.template.get("template") itemheight = self.template["itemHeight"] selectionEnabled = self.template.get("selectionEnabled", True) + scrollbarMode = self.template.get("scrollbarMode", "showOnDemand") 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] if len(templates[style]) > 2: selectionEnabled = templates[style][2] + if len(templates[style]) > 3: + scrollbarMode = templates[style][3] self.content.setTemplate(template) self.content.setItemHeight(itemheight) self.selectionEnabled = selectionEnabled + self.scrollbarMode = scrollbarMode self.active_style = style |