Browse Source

attempt to straighten out fade screen sorting issues

David Rose 19 years ago
parent
commit
2e5055303d
2 changed files with 3 additions and 6 deletions
  1. 1 0
      direct/src/gui/DirectDialog.py
  2. 2 6
      direct/src/showbase/Transitions.py

+ 1 - 0
direct/src/gui/DirectDialog.py

@@ -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):

+ 2 - 6
direct/src/showbase/Transitions.py

@@ -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,
                 )
                 )
-
-            def rescaleFade():
-                self.fade['image_scale'] = 2 * base.getAspectRatio()
-            
-            self.fade.accept('aspectRatioChanged', rescaleFade)
+            self.fade.setBin('unsorted', 0)
 
 
     def fadeIn(self, t=0.5, finishIval=None):
     def fadeIn(self, t=0.5, finishIval=None):
         """
         """