mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-03 10:22:45 -04:00
dgui: accept arg in setText, setImage, setGeom, also add clearers
This enables the "setters" to behave in a way that people expect setters to behave. Since `setText(None)` now does not behave expectedly, a `clearText()` has also been added to remove the text. Closes #385
This commit is contained in:
parent
8b3cc74cad
commit
822f89fadb
@ -61,7 +61,14 @@ class DirectFrame(DirectGuiWidget):
|
|||||||
def destroy(self):
|
def destroy(self):
|
||||||
DirectGuiWidget.destroy(self)
|
DirectGuiWidget.destroy(self)
|
||||||
|
|
||||||
def setText(self):
|
def clearText(self):
|
||||||
|
self['text'] = None
|
||||||
|
self.setText()
|
||||||
|
|
||||||
|
def setText(self, text=None):
|
||||||
|
if text is not None:
|
||||||
|
self['text'] = text
|
||||||
|
|
||||||
# Determine if user passed in single string or a sequence
|
# Determine if user passed in single string or a sequence
|
||||||
if self['text'] == None:
|
if self['text'] == None:
|
||||||
textList = (None,) * self['numStates']
|
textList = (None,) * self['numStates']
|
||||||
@ -100,7 +107,14 @@ class DirectFrame(DirectGuiWidget):
|
|||||||
sort = DGG.TEXT_SORT_INDEX,
|
sort = DGG.TEXT_SORT_INDEX,
|
||||||
)
|
)
|
||||||
|
|
||||||
def setGeom(self):
|
def clearGeom(self):
|
||||||
|
self['geom'] = None
|
||||||
|
self.setGeom()
|
||||||
|
|
||||||
|
def setGeom(self, geom=None):
|
||||||
|
if geom is not None:
|
||||||
|
self['geom'] = geom
|
||||||
|
|
||||||
# Determine argument type
|
# Determine argument type
|
||||||
geom = self['geom']
|
geom = self['geom']
|
||||||
|
|
||||||
@ -142,7 +156,14 @@ class DirectFrame(DirectGuiWidget):
|
|||||||
geom = geom, scale = 1,
|
geom = geom, scale = 1,
|
||||||
sort = DGG.GEOM_SORT_INDEX)
|
sort = DGG.GEOM_SORT_INDEX)
|
||||||
|
|
||||||
def setImage(self):
|
def clearImage(self):
|
||||||
|
self['image'] = None
|
||||||
|
self.setImage()
|
||||||
|
|
||||||
|
def setImage(self, image=None):
|
||||||
|
if image is not None:
|
||||||
|
self['image'] = image
|
||||||
|
|
||||||
# Determine argument type
|
# Determine argument type
|
||||||
arg = self['image']
|
arg = self['image']
|
||||||
if arg == None:
|
if arg == None:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user