cyberarm/cyberarm_engine
1
0
Fork 0
mirror of https://github.com/cyberarm/cyberarm_engine.git synced 2025-12-16 05:02:34 +00:00
Code Issues Projects Releases Wiki Activity

Fixed crash if GuiState @mouse_over has no parent

Browse Source
This commit is contained in:
cyberarm
2020-08-28 08:37:24 -05:00
parent ce64b8a205
commit b06ceaabce
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/cyberarm_engine/ui/gui_state.rb
View File

@@ -145,7 +145,7 @@ module CyberarmEngine
end end
def redirect_mouse_button(button) def redirect_mouse_button(button)
hide_menu unless @menu and (@menu == @mouse_over) or (@mouse_over.parent == @menu) hide_menu unless @menu and (@menu == @mouse_over) or (@mouse_over&.parent == @menu)
if @focus && @mouse_over != @focus if @focus && @mouse_over != @focus
@focus.publish(:blur) @focus.publish(:blur)
@@ -164,7 +164,7 @@ module CyberarmEngine
end end
def redirect_released_mouse_button(button) def redirect_released_mouse_button(button)
hide_menu if @menu and (@menu == @mouse_over) or (@mouse_over.parent == @menu) hide_menu if @menu and (@menu == @mouse_over) or (@mouse_over&.parent == @menu)
if @mouse_over if @mouse_over
@mouse_over.publish(:"released_#{button}_mouse_button", window.mouse_x, window.mouse_y) @mouse_over.publish(:"released_#{button}_mouse_button", window.mouse_x, window.mouse_y)