From 99c4302a52d43728f7524060012a7c762a2c2056 Mon Sep 17 00:00:00 2001 From: Tiger Date: Sun, 11 Jan 2026 21:42:06 +0100 Subject: [PATCH] fix: text updates now forced to deferred --- src/logic-scenes/board/card.gd | 2 +- src/logic-scenes/board/sticky-note.gd | 4 +-- src/logic-scenes/card_burner/card_burner.tscn | 36 +++++++------------ 3 files changed, 15 insertions(+), 27 deletions(-) diff --git a/src/logic-scenes/board/card.gd b/src/logic-scenes/board/card.gd index e206946..cd0f712 100644 --- a/src/logic-scenes/board/card.gd +++ b/src/logic-scenes/board/card.gd @@ -32,7 +32,7 @@ var transfor_arr: Array[Transform2D] = [ @export var text: String = "" : set(value): text = value - _on_text_updated() + _on_text_updated.call_deferred() @onready var label: Label = $Label @onready var background_sprite: AnimatedSprite2D = $AnimatedSprite2D diff --git a/src/logic-scenes/board/sticky-note.gd b/src/logic-scenes/board/sticky-note.gd index 4951125..61dd4d9 100644 --- a/src/logic-scenes/board/sticky-note.gd +++ b/src/logic-scenes/board/sticky-note.gd @@ -23,7 +23,7 @@ signal transform_tween_finished @export var text: String = "" : set (value): if is_node_ready(): - _on_text_updated() + _on_text_updated.call_deferred() text = value var content: Node2D var label: Label @@ -112,7 +112,7 @@ func _ready() -> void: label = $Content/Label background_sprite = $Content/BackgroundSprite content = $Content - _on_text_updated() + _on_text_updated.call_deferred() input_event.connect(_on_input_event) mouse_entered.connect(_on_mouse_entered) diff --git a/src/logic-scenes/card_burner/card_burner.tscn b/src/logic-scenes/card_burner/card_burner.tscn index c0c5cd3..fba621d 100644 --- a/src/logic-scenes/card_burner/card_burner.tscn +++ b/src/logic-scenes/card_burner/card_burner.tscn @@ -1,17 +1,17 @@ [gd_scene load_steps=15 format=3 uid="uid://g2a27jwdapai"] [ext_resource type="Script" uid="uid://bbia2hcdwctyn" path="res://logic-scenes/card_burner/card_burner.gd" id="1_copuj"] -[ext_resource type="Script" uid="uid://2loic2eeec5b" path="res://logic-scenes/board/card.gd" id="2_l4ogr"] [ext_resource type="Texture2D" uid="uid://615hvpuiacvm" path="res://addons/input_prompts/icons/xbox/X.png" id="3_ckmi5"] [ext_resource type="PackedScene" uid="uid://uc6urpgv7n1y" path="res://logic-scenes/card_burner/cursor_candle.tscn" id="3_l4ogr"] [ext_resource type="Script" uid="uid://bbs1u7ojno7xo" path="res://addons/input_prompts/action_prompt/action_prompt.gd" id="4_x6cxt"] +[ext_resource type="PackedScene" uid="uid://dy5rd437h5hsw" path="res://logic-scenes/board/card.tscn" id="5_ckmi5"] -[sub_resource type="InputEventKey" id="InputEventKey_ckmi5"] +[sub_resource type="InputEventKey" id="InputEventKey_x6cxt"] device = -1 physical_keycode = 88 unicode = 120 -[sub_resource type="InputEventJoypadButton" id="InputEventJoypadButton_x6cxt"] +[sub_resource type="InputEventJoypadButton" id="InputEventJoypadButton_23lqb"] device = -1 button_index = 2 pressed = true @@ -128,11 +128,6 @@ offset_right = -518.0 offset_bottom = 14.0 rotation = -0.0352522 -[node name="Card" type="Area2D" parent="Control/Ancor1"] -script = ExtResource("2_l4ogr") -text = "card" -metadata/_custom_type_script = "uid://2loic2eeec5b" - [node name="Ancor2" type="Control" parent="Control"] unique_name_in_owner = true anchors_preset = 0 @@ -142,11 +137,6 @@ offset_right = -183.0 offset_bottom = 35.0 rotation = 0.0120591 -[node name="card" type="Area2D" parent="Control/Ancor2"] -script = ExtResource("2_l4ogr") -text = "card" -metadata/_custom_type_script = "uid://2loic2eeec5b" - [node name="Ancor3" type="Control" parent="Control"] unique_name_in_owner = true anchors_preset = 0 @@ -156,11 +146,6 @@ offset_right = 153.0 offset_bottom = 22.0 rotation = -0.0139755 -[node name="card" type="Area2D" parent="Control/Ancor3"] -script = ExtResource("2_l4ogr") -text = "card" -metadata/_custom_type_script = "uid://2loic2eeec5b" - [node name="Ancor4" type="Control" parent="Control"] unique_name_in_owner = true anchors_preset = 0 @@ -170,11 +155,6 @@ offset_right = 495.0 offset_bottom = 15.0 rotation = 0.0245775 -[node name="card" type="Area2D" parent="Control/Ancor4"] -script = ExtResource("2_l4ogr") -text = "card" -metadata/_custom_type_script = "uid://2loic2eeec5b" - [node name="HSplitContainer" type="HSplitContainer" parent="Control"] layout_mode = 1 anchors_preset = 5 @@ -196,7 +176,7 @@ stretch_mode = 5 script = ExtResource("4_x6cxt") action = "skip" icon = 0 -events = Array[InputEvent]([null, SubResource("InputEventKey_ckmi5"), SubResource("InputEventJoypadButton_x6cxt")]) +events = Array[InputEvent]([null, SubResource("InputEventKey_x6cxt"), SubResource("InputEventJoypadButton_23lqb")]) metadata/_custom_type_script = "uid://bbs1u7ojno7xo" [node name="SkipButton" type="Button" parent="Control/HSplitContainer"] @@ -218,3 +198,11 @@ root_node = NodePath("../Control/HSplitContainer") libraries = { &"": SubResource("AnimationLibrary_kaqqi") } + +[node name="Card1" parent="." instance=ExtResource("5_ckmi5")] + +[node name="Card2" parent="." instance=ExtResource("5_ckmi5")] + +[node name="Card3" parent="." instance=ExtResource("5_ckmi5")] + +[node name="Card4" parent="." instance=ExtResource("5_ckmi5")]