git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix size calculation and centering of choiceboxes
[enigma2.git]
/
data
/
skin_default.xml
diff --git
a/data/skin_default.xml
b/data/skin_default.xml
index cf0fe69ea49c4e0d106dc567df33c63906514ed7..bb64b4aedc5e114a9d389695dc782b825fccc812 100644
(file)
--- a/
data/skin_default.xml
+++ b/
data/skin_default.xml
@@
-436,36
+436,36
@@
from enigma import eSize, ePoint
orgwidth = self.instance.size().width()
orgpos = self.instance.position()
orgwidth = self.instance.size().width()
orgpos = self.instance.position()
-textsize = self[
"text"
].getSize()
+textsize = self[
"text"
].getSize()
# y size still must be fixed in font stuff...
textsize = (textsize[0] + 50, textsize[1] + 50)
count = len(self.list)
# y size still must be fixed in font stuff...
textsize = (textsize[0] + 50, textsize[1] + 50)
count = len(self.list)
-if count
>
10:
+if count
>
10:
count = 10
offset = 25 * count
wsizex = textsize[0] + 60
wsizey = textsize[1] + offset
count = 10
offset = 25 * count
wsizex = textsize[0] + 60
wsizey = textsize[1] + offset
-if (
450 >
wsizex):
- wsizex =
45
0
+if (
520 >
wsizex):
+ wsizex =
52
0
wsize = (wsizex, wsizey)
wsize = (wsizex, wsizey)
-
# resize
self.instance.resize(eSize(*wsize))
# resize label
# resize
self.instance.resize(eSize(*wsize))
# resize label
-self[
"text"
].instance.resize(eSize(*textsize))
+self[
"text"
].instance.resize(eSize(*textsize))
# move list
listsize = (wsizex, 25 * count)
# move list
listsize = (wsizex, 25 * count)
-self[
"list"
].instance.move(ePoint(0, textsize[1]))
-self[
"list"
].instance.resize(eSize(*listsize))
+self[
"list"
].instance.move(ePoint(0, textsize[1]))
+self[
"list"
].instance.resize(eSize(*listsize))
# center window
newwidth = wsize[0]
# center window
newwidth = wsize[0]
-#self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
+self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count > 7 and 2 or 3)))
+
</applet>
</screen>
<screen name="TimerEdit" position="70,100" size="590,335" title="Timer Edit">
</applet>
</screen>
<screen name="TimerEdit" position="70,100" size="590,335" title="Timer Edit">
@@
-514,7
+514,7
@@
from enigma import eSize, ePoint
orgwidth = self.instance.size().width()
orgpos = self.instance.position()
orgwidth = self.instance.size().width()
orgpos = self.instance.position()
-textsize = self[
"text"
].getSize()
+textsize = self[
"text"
].getSize()
# y size still must be fixed in font stuff...
textsize = (textsize[0] + 50, textsize[1] + 50)
# y size still must be fixed in font stuff...
textsize = (textsize[0] + 50, textsize[1] + 50)
@@
-523,7
+523,7
@@
if self.type == self.TYPE_YESNO:
offset = 60
wsizex = textsize[0] + 60
wsizey = textsize[1] + offset
offset = 60
wsizex = textsize[0] + 60
wsizey = textsize[1] + offset
-if (280
>
wsizex):
+if (280
>
wsizex):
wsizex = 280
wsize = (wsizex, wsizey)
wsizex = 280
wsize = (wsizex, wsizey)
@@
-532,12
+532,12
@@
wsize = (wsizex, wsizey)
self.instance.resize(eSize(*wsize))
# resize label
self.instance.resize(eSize(*wsize))
# resize label
-self[
"text"
].instance.resize(eSize(*textsize))
+self[
"text"
].instance.resize(eSize(*textsize))
# move list
listsize = (wsizex, 50)
# move list
listsize = (wsizex, 50)
-self[
"list"
].instance.move(ePoint(0, textsize[1]))
-self[
"list"
].instance.resize(eSize(*listsize))
+self[
"list"
].instance.move(ePoint(0, textsize[1]))
+self[
"list"
].instance.resize(eSize(*listsize))
# center window
newwidth = wsize[0]
# center window
newwidth = wsize[0]