From 140a687d6be3b49083f7a9117cf86fb17dbe1118 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 29 Nov 2020 16:06:46 +0100 Subject: [PATCH] Take one at fixing the singletons. --- addons/draw_gd/plugin.gd | 2 ++ addons/draw_gd/src/Autoload/DrawGD.gd | 4 +++ addons/draw_gd/src/Main.tscn | 44 ++++++++++++++++++++++++--- 3 files changed, 46 insertions(+), 4 deletions(-) diff --git a/addons/draw_gd/plugin.gd b/addons/draw_gd/plugin.gd index 14a8001..50e670e 100644 --- a/addons/draw_gd/plugin.gd +++ b/addons/draw_gd/plugin.gd @@ -25,6 +25,8 @@ func _enter_tree(): make_visible(false) +# DrawGD.refresh_nodes() + func _exit_tree(): #remove_autoload_singleton("DrawGD") diff --git a/addons/draw_gd/src/Autoload/DrawGD.gd b/addons/draw_gd/src/Autoload/DrawGD.gd index ca4bc5c..1304256 100644 --- a/addons/draw_gd/src/Autoload/DrawGD.gd +++ b/addons/draw_gd/src/Autoload/DrawGD.gd @@ -192,6 +192,10 @@ func _ready() -> void: image_clipboard = Image.new() Input.set_custom_mouse_cursor(DrawGD.cursor_image, Input.CURSOR_CROSS, Vector2(15, 15)) + refresh_nodes() + + +func refresh_nodes(): var root = get_tree().get_root() control = find_node_by_name(root, "DrawGDControl") top_menu_container = find_node_by_name(control, "TopMenuContainer") diff --git a/addons/draw_gd/src/Main.tscn b/addons/draw_gd/src/Main.tscn index 21edc02..fa7f639 100644 --- a/addons/draw_gd/src/Main.tscn +++ b/addons/draw_gd/src/Main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=13 format=2] +[gd_scene load_steps=17 format=2] [ext_resource path="res://addons/draw_gd/src/Main.gd" type="Script" id=1] [ext_resource path="res://addons/draw_gd/src/UI/Dialogs/ImageEffects/ImageEffects.tscn" type="PackedScene" id=2] @@ -13,6 +13,36 @@ [ext_resource path="res://addons/draw_gd/src/UI/TopMenuContainer.tscn" type="PackedScene" id=11] [ext_resource path="res://addons/draw_gd/src/UI/Dialogs/SaveSprite.tscn" type="PackedScene" id=12] +[sub_resource type="Image" id=1] +data = { +"data": PoolByteArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 132, 255, 132, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 132, 255, 132, 255, 132, 255, 132, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 175, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 0, 255, 175, 255, 175, 255, 132, 255, 132, 255, 132, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 175, 255, 132, 255, 0, 255, 175, 255, 175, 255, 132, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 175, 255, 132, 255, 132, 255, 132, 255, 0, 255, 175, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 175, 255, 132, 255, 132, 255, 132, 255, 175, 255, 175, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 175, 255, 132, 255, 132, 255, 132, 255, 175, 255, 175, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 175, 255, 132, 255, 132, 255, 132, 255, 175, 255, 175, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 175, 255, 132, 255, 132, 255, 132, 255, 175, 255, 175, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 175, 255, 132, 255, 132, 255, 132, 255, 175, 255, 175, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 175, 255, 132, 255, 132, 255, 132, 255, 175, 255, 175, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 0, 255, 132, 255, 132, 255, 132, 255, 175, 255, 175, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 175, 255, 175, 255, 0, 255, 132, 255, 175, 255, 175, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 175, 255, 175, 255, 175, 255, 0, 255, 175, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 175, 255, 175, 255, 175, 255, 175, 255, 175, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 48, 255, 175, 255, 175, 255, 175, 255, 175, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 48, 255, 48, 255, 48, 255, 175, 255, 0, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 48, 255, 48, 255, 0, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), +"format": "LumAlpha8", +"height": 22, +"mipmaps": false, +"width": 22 +} + +[sub_resource type="ImageTexture" id=2] +flags = 0 +flags = 0 +image = SubResource( 1 ) +size = Vector2( 22, 22 ) + +[sub_resource type="Image" id=3] +data = { +"data": PoolByteArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 132, 255, 132, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 132, 255, 132, 255, 132, 255, 132, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 0, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 175, 255, 175, 255, 0, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 175, 255, 175, 255, 175, 255, 175, 255, 0, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 175, 255, 175, 255, 175, 255, 175, 255, 175, 255, 0, 255, 132, 255, 132, 255, 132, 255, 132, 255, 132, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 175, 255, 175, 255, 175, 255, 175, 255, 175, 255, 175, 255, 0, 255, 132, 255, 132, 255, 132, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 175, 255, 175, 255, 175, 255, 175, 255, 175, 255, 175, 255, 175, 255, 0, 255, 132, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 175, 255, 175, 255, 175, 255, 175, 255, 175, 255, 175, 255, 175, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 175, 255, 175, 255, 175, 255, 175, 255, 175, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 175, 255, 175, 255, 175, 255, 175, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 255, 0, 255, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), +"format": "LumAlpha8", +"height": 22, +"mipmaps": false, +"width": 22 +} + +[sub_resource type="ImageTexture" id=4] +flags = 0 +flags = 0 +image = SubResource( 3 ) +size = Vector2( 22, 22 ) + [node name="DrawGDControl" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 @@ -98,18 +128,24 @@ window_title = "Error" dialog_text = "This is an error message!" [node name="BackupConfirmation" type="ConfirmationDialog" parent="Dialogs"] -margin_right = 349.0 -margin_bottom = 88.0 +margin_left = 429.0 +margin_top = 316.0 +margin_right = 851.0 +margin_bottom = 404.0 rect_min_size = Vector2( 250, 87.5 ) popup_exclusive = true -dialog_text = "Autosaved backup for %s was found. +dialog_text = "Autosaved backup for [user://backup-1606662249-0] was found. Do you want to reload it?" [node name="LeftCursor" type="Sprite" parent="."] visible = false +position = Vector2( 795, 667 ) +texture = SubResource( 2 ) [node name="RightCursor" type="Sprite" parent="."] visible = false +position = Vector2( 859, 667 ) +texture = SubResource( 4 ) [node name="ModulateTween" type="Tween" parent="."]