mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-17 20:23:47 -04:00
*** empty log message ***
This commit is contained in:
parent
38d80de205
commit
773dab435a
@ -249,6 +249,7 @@ class OnscreenPanel(PandaObject.PandaObject, NodePath):
|
||||
func = None,
|
||||
manage = 1,
|
||||
label = None,
|
||||
labels = None,
|
||||
scale = 0.1,
|
||||
width = None,
|
||||
align = None,
|
||||
@ -280,7 +281,7 @@ class OnscreenPanel(PandaObject.PandaObject, NodePath):
|
||||
|
||||
assert self.panelSetup
|
||||
|
||||
if label == None:
|
||||
if (label == None) and (labels == None):
|
||||
label = name
|
||||
if drawOrder == None:
|
||||
drawOrder = self.panelDrawOrder + 10
|
||||
@ -291,6 +292,7 @@ class OnscreenPanel(PandaObject.PandaObject, NodePath):
|
||||
|
||||
button = Button.Button(buttonName,
|
||||
label = label,
|
||||
labels = labels,
|
||||
scale = scale,
|
||||
width = width,
|
||||
align = align,
|
||||
|
Loading…
x
Reference in New Issue
Block a user