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

DirectRadioButton--removal of model-loading by default and indicator handling

Browse Source 
Signed-off-by: rdb <git@rdb.name>
This commit is contained in:
alan eborn 2014-10-15 15:05:26 +00:00 committed by rdb
parent 2e555db30e
commit 178c16e94b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
direct/src/gui/DirectRadioButton.py
View File

@ -43,7 +43,7 @@ class DirectRadioButton(DirectButton):
('boxGeom', None, None), ('boxGeom', None, None),
('boxGeomColor', None, None), ('boxGeomColor', None, None),
('boxGeomScale', 1.0, None), ('boxGeomScale', 1.0, None),
('boxImage', loader.loadModel('models/gui/radio_button_gui'), None), ('boxImage', None, None),
('boxImageScale', 1.0, None), ('boxImageScale', 1.0, None),
('boxImageColor', VBase4(1, 1, 1, 1), None), ('boxImageColor', VBase4(1, 1, 1, 1), None),
('boxRelief', None, None), ('boxRelief', None, None),
@ -69,9 +69,11 @@ class DirectRadioButton(DirectButton):
# Call option initialization functions # Call option initialization functions
self.initialiseoptions(DirectRadioButton) self.initialiseoptions(DirectRadioButton)
# After initialization with X giving it the correct size, put back space # After initialization with X giving it the correct size, put back space
if self['boxGeom'] == None: if self['boxGeom'] is None:
if not 'boxRelief' in kw and self['boxImage'] is None:
self.indicator['relief'] = DGG.SUNKEN
self.indicator['text'] = (' ', '*') self.indicator['text'] = (' ', '*')
self.indicator['text_pos'] = (0, -.5) self.indicator['text_pos'] = (0, -.25)
else: else:
self.indicator['text'] = (' ', ' ') self.indicator['text'] = (' ', ' ')