TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 02:42:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

attempt to straighten out fade screen sorting issues

Browse Source
This commit is contained in:
David Rose 2006-09-18 18:48:32 +00:00
parent 59522ff4d2
commit 2e5055303d
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
direct/src/gui/DirectDialog.py
View File

@ -308,6 +308,7 @@ class DirectDialog(DirectFrame):
def show(self): def show(self):
if self['fadeScreen']: if self['fadeScreen']:
base.transitions.fadeScreen(self['fadeScreen']) base.transitions.fadeScreen(self['fadeScreen'])
self.setBin('gui-popup', 0)
NodePath.show(self) NodePath.show(self)
def hide(self): def hide(self):

8
direct/src/showbase/Transitions.py
View File

@ -75,14 +75,10 @@ class Transitions:
guiId = 'fade', guiId = 'fade',
relief = None, relief = None,
image = self.fadeModel, image = self.fadeModel,
image_scale = 2 * base.getAspectRatio(), image_scale = 2,
state = DGG.NORMAL, state = DGG.NORMAL,
) )
self.fade.setBin('unsorted', 0)
def rescaleFade():
self.fade['image_scale'] = 2 * base.getAspectRatio()
self.fade.accept('aspectRatioChanged', rescaleFade)
def fadeIn(self, t=0.5, finishIval=None): def fadeIn(self, t=0.5, finishIval=None):
""" """