TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 16:20:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

dgui: Fix popupMarker_pos related crash

Browse Source 
Set initial popupMarker position to previous default by using None as default
This commit is contained in:
Fireclaw 2019-05-25 21:55:09 +02:00 committed by rdb
parent f21830d2a8
commit 387b43adde
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
direct/src/gui/DirectOptionMenu.py
View File

@ -27,7 +27,7 @@ class DirectOptionMenu(DirectButton):
# Amount of padding to place around popup button indicator # Amount of padding to place around popup button indicator
('popupMarkerBorder', (.1, .1), None), ('popupMarkerBorder', (.1, .1), None),
# The initial position of the popup marker # The initial position of the popup marker
('popupMarker_pos', (0, 0, 0), None), ('popupMarker_pos', None, None),
# Background color to use to highlight popup menu items # Background color to use to highlight popup menu items
('highlightColor', (.5, .5, .5, 1), None), ('highlightColor', (.5, .5, .5, 1), None),
# Extra scale to use on highlight popup menu items # Extra scale to use on highlight popup menu items
@ -44,8 +44,6 @@ class DirectOptionMenu(DirectButton):
DirectButton.__init__(self, parent) DirectButton.__init__(self, parent)
# Record any user specified frame size # Record any user specified frame size
self.initFrameSize = self['frameSize'] self.initFrameSize = self['frameSize']
# Record any user specified popup marker position
self.initPopupMarkerPos = self['popupMarker_pos']
# Create a small rectangular marker to distinguish this button # Create a small rectangular marker to distinguish this button
# as a popup menu button # as a popup menu button
self.popupMarker = self.createcomponent( self.popupMarker = self.createcomponent(
@ -54,6 +52,8 @@ class DirectOptionMenu(DirectButton):
frameSize = (-0.5, 0.5, -0.2, 0.2), frameSize = (-0.5, 0.5, -0.2, 0.2),
scale = 0.4, scale = 0.4,
relief = DGG.RAISED) relief = DGG.RAISED)
# Record any user specified popup marker position
self.initPopupMarkerPos = self['popupMarker_pos']
# This needs to popup the menu too # This needs to popup the menu too
self.popupMarker.bind(DGG.B1PRESS, self.showPopupMenu) self.popupMarker.bind(DGG.B1PRESS, self.showPopupMenu)
# Check if item is highlighted on release and select it if it is # Check if item is highlighted on release and select it if it is