*** empty log message ***

This commit is contained in:
David Rose 2001-04-11 22:40:03 +00:00
parent 2ef3bcf209
commit b231a04368
2 changed files with 21 additions and 9 deletions

View File

@ -11,6 +11,7 @@ class Button(DirectObject):
label = None, label = None,
scale = 0.1, scale = 0.1,
width = None, width = None,
align = None,
drawOrder = getDefaultDrawOrder(), drawOrder = getDefaultDrawOrder(),
font = getDefaultFont(), font = getDefaultFont(),
pos = (0, 0), pos = (0, 0),
@ -37,17 +38,17 @@ class Button(DirectObject):
# text label, make text button # text label, make text button
self.label = label self.label = label
self.lUp = Label.textLabel(self.label, upStyle, self.lUp = Label.textLabel(self.label, upStyle, scale,
scale, width, drawOrder, font) width, drawOrder, font)
if width == None: if width == None:
width = self.lUp.getWidth() / scale width = self.lUp.getWidth() / scale
self.width = width self.width = width
self.lLit = Label.textLabel(self.label, litStyle, self.lLit = Label.textLabel(self.label, litStyle, scale,
scale, width, drawOrder, font) width, drawOrder, font)
self.lDown = Label.textLabel(self.label, downStyle, self.lDown = Label.textLabel(self.label, downStyle, scale,
scale, width, drawOrder, font) width, drawOrder, font)
if supportInactive: if supportInactive:
self.lInactive = Label.textLabel(self.label, inactiveStyle, self.lInactive = Label.textLabel(self.label, inactiveStyle,
@ -94,6 +95,14 @@ class Button(DirectObject):
self.button = GuiButton.GuiButton(self.name, self.lUp, self.lLit, self.button = GuiButton.GuiButton(self.name, self.lUp, self.lLit,
self.lDown, self.lDown, self.lInactive) self.lDown, self.lDown, self.lInactive)
self.button.setDrawOrder(drawOrder) self.button.setDrawOrder(drawOrder)
if align == TMALIGNLEFT:
self.xoffset = width / 2.0 * scale
elif align == TMALIGNRIGHT:
self.xoffset = -width / 2.0 * scale
else:
self.xoffset = 0
self.setPos(pos[0], pos[1]) self.setPos(pos[0], pos[1])
self.managed = 0 self.managed = 0
@ -157,14 +166,15 @@ class Button(DirectObject):
self.managed = 0 self.managed = 0
def getPos(self): def getPos(self):
return self.button.getPos() v = self.button.getPos()
return Vec3(v[0] - self.xoffset, v[1], v[2])
def setPos(self, x, y, node = None): def setPos(self, x, y, node = None):
if node == None: if node == None:
v3 = Vec3(x, 0., y) v3 = Vec3(x + self.xoffset, 0., y)
else: else:
mat = node.getMat(base.render2d) mat = node.getMat(base.render2d)
v3 = Vec3(mat.xformPoint(Point3(x, 0., y))) v3 = Vec3(mat.xformPoint(Point3(x + self.xoffset, 0., y)))
self.button.setPos(v3) self.button.setPos(v3)

View File

@ -233,6 +233,7 @@ class OnscreenPanel(PandaObject.PandaObject, NodePath):
label = None, label = None,
scale = 0.1, scale = 0.1,
width = None, width = None,
align = None,
drawOrder = None, drawOrder = None,
font = None, font = None,
pos = (0, 0), pos = (0, 0),
@ -273,6 +274,7 @@ class OnscreenPanel(PandaObject.PandaObject, NodePath):
label = label, label = label,
scale = scale, scale = scale,
width = width, width = width,
align = align,
drawOrder = drawOrder, drawOrder = drawOrder,
font = font, font = font,
pos = pos, pos = pos,