huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-18 17:19:50 +00:00
Code Issues Wiki Activity

UndoRedo vol 4 - Fixed bug when user drew and the cursor was outside the canvas

Browse source 
Users can now undo/redo when they draw outside the canvas. Release the button outside the canvas, press the button outside the canvas and then bring it inside to draw. All work now. I hope.
This commit is contained in:
OverloadedOrama 2019-11-03 23:07:57 +02:00
parent 04c3173c4c
commit 8fadacdf12
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Scripts/Canvas.gd
View file

@ -75,6 +75,7 @@ func _process(delta) -> void:
var mouse_pos := get_local_mouse_position() - location var mouse_pos := get_local_mouse_position() - location
var mouse_pos_floored := mouse_pos.floor() var mouse_pos_floored := mouse_pos.floor()
var mouse_pos_ceiled := mouse_pos.ceil() var mouse_pos_ceiled := mouse_pos.ceil()
var mouse_in_canvas := point_in_rectangle(mouse_pos, location, location + size)
var current_mouse_button := "None" var current_mouse_button := "None"
var current_action := "None" var current_action := "None"
if Input.is_mouse_button_pressed(BUTTON_LEFT): if Input.is_mouse_button_pressed(BUTTON_LEFT):
@ -85,7 +86,7 @@ func _process(delta) -> void:
current_action = Global.current_right_tool current_action = Global.current_right_tool
if visible: if visible:
if !point_in_rectangle(mouse_pos, location, location + size): if !mouse_in_canvas:
if !Input.is_mouse_button_pressed(BUTTON_LEFT) && !Input.is_mouse_button_pressed(BUTTON_RIGHT): if !Input.is_mouse_button_pressed(BUTTON_LEFT) && !Input.is_mouse_button_pressed(BUTTON_RIGHT):
if mouse_inside_canvas: if mouse_inside_canvas:
mouse_inside_canvas = false mouse_inside_canvas = false
@ -95,15 +96,25 @@ func _process(delta) -> void:
#Handle Undo/Redo #Handle Undo/Redo
if point_in_rectangle(mouse_pos, location, location + size) && Global.can_draw && Global.has_focus && Global.current_frame == frame: var can_handle : bool = mouse_in_canvas && Global.can_draw && Global.has_focus && Global.current_frame == frame
if (Input.is_action_just_pressed("left_mouse") && !Input.is_action_pressed("right_mouse")) || (Input.is_action_just_pressed("right_mouse") && !Input.is_action_pressed("left_mouse")): var mouse_pressed : bool = (Input.is_action_just_pressed("left_mouse") && !Input.is_action_pressed("right_mouse")) || (Input.is_action_just_pressed("right_mouse") && !Input.is_action_pressed("left_mouse"))
#If we're already pressing a mouse button and we haven't handled undo yet,...
#... it means that the cursor was outside the canvas. Then, ...
#simulate "just pressed" logic the moment the cursor gets inside the canvas
if Input.is_action_pressed("left_mouse") || Input.is_action_pressed("right_mouse"):
if mouse_in_canvas && Global.undos < Global.undo_redo.get_version():
mouse_pressed = true
if mouse_pressed:
if can_handle:
if current_action != "None": if current_action != "None":
if current_action == "RectSelect": if current_action == "RectSelect":
handle_undo("Rectangle Select") handle_undo("Rectangle Select")
else: else:
handle_undo("Draw") handle_undo("Draw")
elif (Input.is_action_just_released("left_mouse") && !Input.is_action_pressed("right_mouse")) || (Input.is_action_just_released("right_mouse") && !Input.is_action_pressed("left_mouse")):
elif (Input.is_action_just_released("left_mouse") && !Input.is_action_pressed("right_mouse")) || (Input.is_action_just_released("right_mouse") && !Input.is_action_pressed("left_mouse")): if can_handle || Global.undos == Global.undo_redo.get_version():
if previous_action != "None" && previous_action != "RectSelect": if previous_action != "None" && previous_action != "RectSelect":
handle_redo("Draw") handle_redo("Draw")
@ -118,7 +129,7 @@ func _process(delta) -> void:
"Eraser": "Eraser":
pencil_and_eraser(mouse_pos, Color(0, 0, 0, 0), current_mouse_button) pencil_and_eraser(mouse_pos, Color(0, 0, 0, 0), current_mouse_button)
"Fill": "Fill":
if point_in_rectangle(mouse_pos, location, location + size) && Global.can_draw && Global.has_focus && Global.current_frame == frame: if mouse_in_canvas && Global.can_draw && Global.has_focus && Global.current_frame == frame:
var current_color : Color var current_color : Color
var horizontal_mirror := false var horizontal_mirror := false
var vertical_mirror := false var vertical_mirror := false
@ -145,7 +156,7 @@ func _process(delta) -> void:
flood_fill(pos, layers[current_layer_index][0].get_pixelv(pos), current_color) flood_fill(pos, layers[current_layer_index][0].get_pixelv(pos), current_color)
"PaintAllPixelsSameColor": "PaintAllPixelsSameColor":
if point_in_rectangle(mouse_pos, location, location + size) && Global.can_draw && Global.has_focus && Global.current_frame == frame: if mouse_in_canvas && Global.can_draw && Global.has_focus && Global.current_frame == frame:
var current_color : Color var current_color : Color
if current_mouse_button == "left_mouse": if current_mouse_button == "left_mouse":
current_color = Global.left_color_picker.color current_color = Global.left_color_picker.color
@ -160,7 +171,7 @@ func _process(delta) -> void:
layers[current_layer_index][0].set_pixel(xx, yy, current_color) layers[current_layer_index][0].set_pixel(xx, yy, current_color)
sprite_changed_this_frame = true sprite_changed_this_frame = true
"LightenDarken": "LightenDarken":
if point_in_rectangle(mouse_pos, location, location + size) && Global.can_draw && Global.has_focus && Global.current_frame == frame: if mouse_in_canvas && Global.can_draw && Global.has_focus && Global.current_frame == frame:
var pixel_color : Color = layers[current_layer_index][0].get_pixelv(mouse_pos) var pixel_color : Color = layers[current_layer_index][0].get_pixelv(mouse_pos)
var amount := 0.05 var amount := 0.05
var color_changed := pixel_color.lightened(amount) var color_changed := pixel_color.lightened(amount)