From 72825ecae62cf10b21f97aa077ec2672a5a353c7 Mon Sep 17 00:00:00 2001 From: Adrian Schmid Date: Sun, 2 Jul 2023 10:42:58 +0200 Subject: [PATCH] improved area movement --- src/logic-scenes/board/card.gd | 9 +++++++-- src/logic-scenes/board/post-it.gd | 11 ++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/logic-scenes/board/card.gd b/src/logic-scenes/board/card.gd index 134ccc3..15fbef4 100644 --- a/src/logic-scenes/board/card.gd +++ b/src/logic-scenes/board/card.gd @@ -76,6 +76,8 @@ func _process(delta: float) -> void: if highlighted: _handle_wiggle(delta) + + _move_card() func _handle_wiggle(delta): wiggle_pos += delta * wiggle_speed * wiggle_intensity @@ -105,11 +107,14 @@ func _on_mouse_exited(): func _on_input_event(viewport, event, shape_idx): - if event is InputEventMouseMotion and is_dragged: - position += event.relative + if event is InputEventMouseMotion: + _move_card() if event is InputEventMouseButton: if event.button_index == MOUSE_BUTTON_LEFT: if is_dragable and "handle_mouse_button" in owner: owner.handle_mouse_button(self, event) +func _move_card(): + if is_dragged: + position += get_viewport().get_mouse_position() - position diff --git a/src/logic-scenes/board/post-it.gd b/src/logic-scenes/board/post-it.gd index b19bcd5..c808d39 100644 --- a/src/logic-scenes/board/post-it.gd +++ b/src/logic-scenes/board/post-it.gd @@ -62,7 +62,8 @@ func replace_with(postit: PostIt): self.sibling = postit.sibling func _process(delta: float) -> void: - pass + _move_post_it() + func _on_focus_entered(): print(self, "is focused") @@ -80,11 +81,15 @@ func _on_mouse_exited(): highlighted = false func _on_input_event(viewport, event, shape_idx): - if event is InputEventMouseMotion and is_dragged: - position += event.relative + if event is InputEventMouseMotion: + _move_post_it() if event is InputEventMouseButton: if event.button_index == MOUSE_BUTTON_LEFT: if is_dragable and "handle_mouse_button" in owner: owner.handle_mouse_button(self, event) +func _move_post_it(): + if is_dragged: + position += get_viewport().get_mouse_position() - position +