From 01de7cd35a0d1ed0bb2dd0d874af6d9fbfd23ccd Mon Sep 17 00:00:00 2001 From: David Rose Date: Sat, 27 Oct 2001 00:10:30 +0000 Subject: [PATCH] delay default parameters --- direct/src/gui/OnscreenText.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/direct/src/gui/OnscreenText.py b/direct/src/gui/OnscreenText.py index dee365c93b..487192c764 100644 --- a/direct/src/gui/OnscreenText.py +++ b/direct/src/gui/OnscreenText.py @@ -26,8 +26,8 @@ class OnscreenText(PandaObject, NodePath): frame = None, align = None, wordwrap = None, - drawOrder = DirectGuiGlobals.getDefaultDrawOrder(), - font = DirectGuiGlobals.getDefaultFont(), + drawOrder = None, + font = None, parent = aspect2d, sort = 0, mayChange = 0): @@ -150,6 +150,9 @@ class OnscreenText(PandaObject, NodePath): # Save some of the parameters for posterity. self.scale = scale self.pos = pos + + if font == None: + font = DirectGuiGlobals.getDefaultFont() # Freeze the node while we set all the properties textNode.freeze() @@ -183,6 +186,9 @@ class OnscreenText(PandaObject, NodePath): scale[0], 1, scale[1]) * Mat4.translateMat(pos[0], 0, pos[1]) textNode.setTransform(mat) + if drawOrder == None: + drawOrder = DirectGuiGlobals.getDefaultDrawOrder() + textNode.setBin('fixed') textNode.setDrawOrder(drawOrder)