From d7dcd2bc0b5cbf7cd51bf01aa8c54ec251e23171 Mon Sep 17 00:00:00 2001 From: David Rose Date: Tue, 10 Oct 2006 16:24:36 +0000 Subject: [PATCH] add barTexture --- direct/src/gui/DirectGuiBase.py | 2 ++ direct/src/gui/DirectWaitBar.py | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/direct/src/gui/DirectGuiBase.py b/direct/src/gui/DirectGuiBase.py index e5551674f5..982e60cbe9 100644 --- a/direct/src/gui/DirectGuiBase.py +++ b/direct/src/gui/DirectGuiBase.py @@ -994,6 +994,8 @@ class DirectGuiWidget(DirectGuiBase, NodePath): texture = loader.loadTexture(texture) if texture: self.frameStyle[i].setTexture(texture) + else: + self.frameStyle[i].clearTexture() self.updateFrameStyle() def setFrameVisibleScale(self): diff --git a/direct/src/gui/DirectWaitBar.py b/direct/src/gui/DirectWaitBar.py index ba6f6883c4..b3674bf214 100644 --- a/direct/src/gui/DirectWaitBar.py +++ b/direct/src/gui/DirectWaitBar.py @@ -5,6 +5,7 @@ __all__ = ['DirectWaitBar'] from pandac.PandaModules import * import DirectGuiGlobals as DGG from DirectFrame import * +import types """ import DirectWaitBar @@ -31,6 +32,7 @@ class DirectWaitBar(DirectFrame): ('value', 0, self.setValue), ('barBorderWidth', (0, 0), self.setBarBorderWidth), ('barColor', (1, 0, 0, 1), self.setBarColor), + ('barTexture', None, self.setBarTexture), ('barRelief', DGG.FLAT, self.setBarRelief), ('sortOrder', NO_FADE_SORT_INDEX, None), ) @@ -80,6 +82,17 @@ class DirectWaitBar(DirectFrame): self.barStyle.setColor(color[0], color[1], color[2], color[3]) self.updateBarStyle() + def setBarTexture(self): + # this must be a single texture (or a string). + texture = self['barTexture'] + if isinstance(texture, types.StringTypes): + texture = loader.loadTexture(texture) + if texture: + self.barStyle.setTexture(texture) + else: + self.barStyle.clearTexture() + self.updateBarStyle() + def update(self, value): self['value'] = value