From 26c2272c1ba74f06f0c3c83373237e48ba8e7312 Mon Sep 17 00:00:00 2001 From: Fabien Freling Date: Mon, 8 Jun 2020 19:09:54 +0200 Subject: [PATCH] simplify button depth logic --- src/DepthButton.gd | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/DepthButton.gd b/src/DepthButton.gd index b08ec04..5f37058 100644 --- a/src/DepthButton.gd +++ b/src/DepthButton.gd @@ -91,22 +91,24 @@ func set_pressed(value: bool) -> void: # Signals # func _on_Button_button_down(): - button.rect_position.y += depth - _pressed_depth + button.rect_position.y = depth - _pressed_depth emit_signal("button_down") func _on_Button_button_up(): - button.rect_position.y -= depth - _pressed_depth + if _toggled: + button.rect_position.y = depth - _toggled_depth + else: + button.rect_position.y = 0 emit_signal("button_up") func _on_Button_toggled(button_pressed): if _toggled == button_pressed: return - var delta = depth - _toggled_depth - if (not _toggled) and button_pressed: # off -> on - button.rect_position.y += depth - _toggled_depth - elif _toggled and (not button_pressed): # on -> off - button.rect_position.y -= depth - _toggled_depth + if button_pressed: + button.rect_position.y = depth - _toggled_depth + else: + button.rect_position.y = 0 _toggled = button_pressed emit_signal("toggled", _toggled)