fix calculation of dynamic height of the ChoiceBox screen

[enigma2.git] / data / skin_default.xml

diff --git a/data/skin_default.xml b/data/skin_default.xml
index 8db2709f5cebc0b7ee8968be1021cffb212fd843..cddc18f49d38cb447d8a3e4efcb4d2c30839f344 100644 (file)
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -291,13 +291,14 @@ textsize = self["text"].getSize()
 # y size still must be fixed in font stuff...
 textsize = (textsize[0] + 50, textsize[1] + 50)
 count = len(self.list)
-if count > 6:
-       count = 6
-offset = 30 * count
+if count > 10:
+       count = 10
+offset = 25 * count
 wsizex = textsize[0] + 60
 wsizey = textsize[1] + offset
-if (400 > wsizex):
-       wsizex = 400
+
+if (450 > wsizex):
+       wsizex = 450
 wsize = (wsizex, wsizey)
 
 
@@ -308,7 +309,7 @@ self.instance.resize(eSize(*wsize))
 self["text"].instance.resize(eSize(*textsize))
 
 # move list
-listsize = (wsizex, 30 * len(self.list))
+listsize = (wsizex, 25 * count)
 self["list"].instance.move(ePoint(0, textsize[1]))
 self["list"].instance.resize(eSize(*listsize))
 
@@ -341,6 +342,14 @@ newwidth = wsize[0]
                <widget name="timeshift" position="0,30" size="150,30" font="Regular;25" halign="center" 
                        backgroundColor="transpBlack" foregroundColor="white" />
        </screen>
+       <screen name="TimeDateInput" position="150,150" size="400,200" title="Time/Date Input">
+               <widget name="config" position="5,10" size="380,150" />
+               <widget name="ok" position="110,165" size="53,30" pixmap="ok.png" />
+               <widget name="oktext" position="110,165" size="53,30" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1" />
+               <widget name="cancel" position="210,165" size="100,30" pixmap="cancel.png" />
+               <widget name="canceltext" position="210,165" size="100,30" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1" />
+       </screen>
+
        <screen name="MessageBox" position="60,300" size="600,10" title="Message">
                <widget name="text" position="60,10" size="520,0" font="Regular;22" />
                <widget name="ErrorPixmap" pixmap="error.png" position="0,0" zPosition="3" size="53,53" alphatest="on" transparent="1" />