git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
whitespace cleanup
[enigma2.git]
/
lib
/
python
/
Screens
/
Screen.py
diff --git
a/lib/python/Screens/Screen.py
b/lib/python/Screens/Screen.py
index 797acbc946d99c63c5a28883a0cf79a9221f157e..cfcb52840e4e4a558cb2a12089f63e95ed42610b 100644
(file)
--- a/
lib/python/Screens/Screen.py
+++ b/
lib/python/Screens/Screen.py
@@
-12,26
+12,29
@@
class Screen(dict, HTMLSkin, GUISkin):
self.skinName = self.__class__.__name__
self.session = session
GUISkin.__init__(self)
self.skinName = self.__class__.__name__
self.session = session
GUISkin.__init__(self)
-
+
self.onClose = [ ]
self.onFirstExecBegin = [ ]
self.onExecBegin = [ ]
self.onShown = [ ]
self.onClose = [ ]
self.onFirstExecBegin = [ ]
self.onExecBegin = [ ]
self.onShown = [ ]
-
+
self.onShow = [ ]
self.onHide = [ ]
self.onShow = [ ]
self.onHide = [ ]
-
+
self.execing = False
self.execing = False
- self.shown = False
+ self.shown = True
+ # already shown is false until the screen is really shown (after creation)
+ self.already_shown = False
+
self.renderer = [ ]
self.renderer = [ ]
-
+
# in order to support screens *without* a help,
# we need the list in every screen. how ironic.
self.helpList = [ ]
# in order to support screens *without* a help,
# we need the list in every screen. how ironic.
self.helpList = [ ]
-
+
self.close_on_next_exec = None
self.close_on_next_exec = None
-
+
# stand alone screens (for example web screens)
# don't care about having or not having focus.
self.stand_alone = False
# stand alone screens (for example web screens)
# don't care about having or not having focus.
self.stand_alone = False
@@
-114,9
+117,10
@@
class Screen(dict, HTMLSkin, GUISkin):
self.instance.setFocus(o.instance)
def show(self):
self.instance.setFocus(o.instance)
def show(self):
- if
self.shown
:
+ if
(self.shown and self.already_shown) or not self.instance
:
return
self.shown = True
return
self.shown = True
+ self.already_shown = True
self.instance.show()
for x in self.onShow:
x()
self.instance.show()
for x in self.onShow:
x()
@@
-125,7
+129,7
@@
class Screen(dict, HTMLSkin, GUISkin):
val.onShow()
def hide(self):
val.onShow()
def hide(self):
- if not self.shown:
+ if not self.shown
or not self.instance
:
return
self.shown = False
self.instance.hide()
return
self.shown = False
self.instance.hide()