From d5f9b5698c6d6347f25262cee20b3a13ae3e6a41 Mon Sep 17 00:00:00 2001 From: Relintai Date: Mon, 30 Nov 2020 14:57:34 +0100 Subject: [PATCH] Fix drawing in the editor. --- addons/draw_gd/plugin.gd | 6 +++++- addons/draw_gd/src/Classes/Project.gd | 4 ---- addons/draw_gd/src/UI/Canvas/Canvas.gd | 2 +- addons/draw_gd/src/UI/Dialogs/ImageEffects/RotateImage.tscn | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/draw_gd/plugin.gd b/addons/draw_gd/plugin.gd index 50e670e..132fadc 100644 --- a/addons/draw_gd/plugin.gd +++ b/addons/draw_gd/plugin.gd @@ -15,6 +15,10 @@ func get_plugin_icon(): func get_plugin_name(): return "DrawGD" +func _input(event): + if main_node && main_node.visible && main_node.canvas: + main_node.canvas._input(event) + func _enter_tree(): #add_autoload_singleton("DrawGD", "res://addons/draw_gd/src/Autoload/DrawGD.gd") @@ -22,7 +26,7 @@ func _enter_tree(): main_node = _scene.instance() get_editor_interface().get_editor_viewport().add_child(main_node) - + make_visible(false) # DrawGD.refresh_nodes() diff --git a/addons/draw_gd/src/Classes/Project.gd b/addons/draw_gd/src/Classes/Project.gd index 8539ef6..9dcc5f2 100644 --- a/addons/draw_gd/src/Classes/Project.gd +++ b/addons/draw_gd/src/Classes/Project.gd @@ -43,10 +43,6 @@ func _init(pDrawGD, _frames = null, _name := tr("untitled"), _size := Vector2(64 else: frames = _frames - if _frames is Array: - print("dadad") - - name = _name size = _size select_all_pixels() diff --git a/addons/draw_gd/src/UI/Canvas/Canvas.gd b/addons/draw_gd/src/UI/Canvas/Canvas.gd index 3cf5244..582f7f8 100644 --- a/addons/draw_gd/src/UI/Canvas/Canvas.gd +++ b/addons/draw_gd/src/UI/Canvas/Canvas.gd @@ -55,7 +55,7 @@ func _input(event : InputEvent) -> void: # return current_pixel = get_local_mouse_position() + location - + if DrawGD.has_focus: update() diff --git a/addons/draw_gd/src/UI/Dialogs/ImageEffects/RotateImage.tscn b/addons/draw_gd/src/UI/Dialogs/ImageEffects/RotateImage.tscn index 631f60b..a589b32 100644 --- a/addons/draw_gd/src/UI/Dialogs/ImageEffects/RotateImage.tscn +++ b/addons/draw_gd/src/UI/Dialogs/ImageEffects/RotateImage.tscn @@ -56,7 +56,7 @@ mouse_default_cursor_shape = 2 size_flags_horizontal = 3 size_flags_vertical = 3 text = "Rotxel" -items = [ "Rotxel", null, false, 0, null, "Upscale, Rotate and Downscale", null, false, 1, null, "Nearest neighbour", null, false, 2, null ] +items = [ "Rotxel", null, false, 0, null, "Upscale, Rotate and Downscale", null, false, 1, null, "Nearest neighbour", null, false, 2, null, "Rotxel", null, false, 3, null, "Upscale, Rotate and Downscale", null, false, 4, null, "Nearest neighbour", null, false, 5, null, "Rotxel", null, false, 6, null, "Upscale, Rotate and Downscale", null, false, 7, null, "Nearest neighbour", null, false, 8, null, "Rotxel", null, false, 9, null, "Upscale, Rotate and Downscale", null, false, 10, null, "Nearest neighbour", null, false, 11, null, "Rotxel", null, false, 12, null, "Upscale, Rotate and Downscale", null, false, 13, null, "Nearest neighbour", null, false, 14, null, "Rotxel", null, false, 15, null, "Upscale, Rotate and Downscale", null, false, 16, null, "Nearest neighbour", null, false, 17, null, "Rotxel", null, false, 18, null, "Upscale, Rotate and Downscale", null, false, 19, null, "Nearest neighbour", null, false, 20, null, "Rotxel", null, false, 21, null, "Upscale, Rotate and Downscale", null, false, 22, null, "Nearest neighbour", null, false, 23, null, "Rotxel", null, false, 24, null, "Upscale, Rotate and Downscale", null, false, 25, null, "Nearest neighbour", null, false, 26, null ] selected = 0 [node name="AngleOptions" type="HBoxContainer" parent="VBoxContainer"]