From 2e5055303d0ea8afe041ef4d7beef9daeee4d256 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Mon, 18 Sep 2006 18:48:32 +0000
Subject: [PATCH] attempt to straighten out fade screen sorting issues

---
 direct/src/gui/DirectDialog.py     | 1 +
 direct/src/showbase/Transitions.py | 8 ++------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/direct/src/gui/DirectDialog.py b/direct/src/gui/DirectDialog.py
index 431e4a96fc..9bb194ad35 100644
--- a/direct/src/gui/DirectDialog.py
+++ b/direct/src/gui/DirectDialog.py
@@ -308,6 +308,7 @@ class DirectDialog(DirectFrame):
     def show(self):
         if self['fadeScreen']:
             base.transitions.fadeScreen(self['fadeScreen'])
+            self.setBin('gui-popup', 0)
         NodePath.show(self)
 
     def hide(self):
diff --git a/direct/src/showbase/Transitions.py b/direct/src/showbase/Transitions.py
index 59990b7d7a..552b2d01b6 100644
--- a/direct/src/showbase/Transitions.py
+++ b/direct/src/showbase/Transitions.py
@@ -75,14 +75,10 @@ class Transitions:
                 guiId = 'fade',
                 relief = None,
                 image = self.fadeModel,
-                image_scale = 2 * base.getAspectRatio(),
+                image_scale = 2,
                 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):
         """