TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Made color picker window position saved, fixed a bug of keep opening color picker window when selection is changed

Browse Source
This commit is contained in:
Gyedo Jeon 2010-01-29 19:59:23 +00:00
parent 41ad9b2776
commit ce084c9a02
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
direct/src/leveleditor/ObjectPropertyUI.py
View File

@ -143,25 +143,28 @@ class ObjectPropUICombo(ObjectPropUI):
return self.ui.GetStringSelection() return self.ui.GetStringSelection()
class ColorPicker(CubeColourDialog): class ColorPicker(CubeColourDialog):
def __init__(self, parent, colourData=None, style=CCD_SHOW_ALPHA, alpha = 255, callback=None): def __init__(self, parent, colourData=None, style=CCD_SHOW_ALPHA, alpha = 255, updateCB=None, exitCB=None):
self.callback=callback self.updateCB=updateCB
CubeColourDialog.__init__(self, parent, colourData, style) CubeColourDialog.__init__(self, parent, colourData, style)
self.okButton.Hide() self.okButton.Hide()
self.cancelButton.Hide() self.cancelButton.Hide()
self._colour.alpha = alpha self._colour.alpha = alpha
self.alphaSpin.SetValue(self._colour.alpha) self.alphaSpin.SetValue(self._colour.alpha)
self.DrawAlpha() self.DrawAlpha()
if exitCB:
self.Bind(wx.EVT_CLOSE, exitCB)
def SetPanelColours(self): def SetPanelColours(self):
self.oldColourPanel.RefreshColour(self._oldColour) self.oldColourPanel.RefreshColour(self._oldColour)
self.newColourPanel.RefreshColour(self._colour) self.newColourPanel.RefreshColour(self._colour)
if self.callback: if self.updateCB:
self.callback(self._colour.r, self._colour.g, self._colour.b, self._colour.alpha) self.updateCB(self._colour.r, self._colour.g, self._colour.b, self._colour.alpha)
class ObjectPropertyUI(ScrolledPanel): class ObjectPropertyUI(ScrolledPanel):
def __init__(self, parent, editor): def __init__(self, parent, editor):
self.editor = editor self.editor = editor
self.colorPicker = None self.colorPicker = None
self.lastColorPickerPos = None
ScrolledPanel.__init__(self, parent) ScrolledPanel.__init__(self, parent)
parentSizer = wx.BoxSizer(wx.VERTICAL) parentSizer = wx.BoxSizer(wx.VERTICAL)
@ -179,7 +182,12 @@ class ObjectPropertyUI(ScrolledPanel):
self.Layout() self.Layout()
self.SetupScrolling(self, scroll_y = True, rate_y = 20) self.SetupScrolling(self, scroll_y = True, rate_y = 20)
def colorPickerCB(self, rr, gg, bb, aa): def colorPickerExitCB(self, evt=None):
self.lastColorPickerPos = self.colorPicker.GetPosition()
self.colorPicker.Destroy()
self.colorPicker = None
def colorPickerUpdateCB(self, rr, gg, bb, aa):
r = rr / 255.0 r = rr / 255.0
g = gg / 255.0 g = gg / 255.0
b = bb / 255.0 b = bb / 255.0
@ -220,11 +228,14 @@ class ObjectPropertyUI(ScrolledPanel):
def openColorPicker(self, evt, colourData, alpha): def openColorPicker(self, evt, colourData, alpha):
if self.colorPicker: if self.colorPicker:
self.lastColorPickerPos = self.colorPicker.GetPosition()
self.colorPicker.Destroy() self.colorPicker.Destroy()
self.colorPicker = ColorPicker(self, colourData, alpha=alpha, callback=self.colorPickerCB) self.colorPicker = ColorPicker(self, colourData, alpha=alpha, updateCB=self.colorPickerUpdateCB, exitCB=self.colorPickerExitCB)
self.colorPicker.GetColourData().SetChooseFull(True) self.colorPicker.GetColourData().SetChooseFull(True)
self.colorPicker.Show() self.colorPicker.Show()
if self.lastColorPickerPos:
self.colorPicker.SetPosition(self.lastColorPickerPos)
def updateProps(self, obj): def updateProps(self, obj):
self.clearPropUI() self.clearPropUI()