From 901c2759127f73f1027d10ae7459f660c5582aac Mon Sep 17 00:00:00 2001 From: Relintai Date: Mon, 19 Oct 2020 12:39:09 +0200 Subject: [PATCH] The character, crafting, spellbook and talent windows will properly ignore the mouse now. --- game/ui/bags/Bag.tscn | 2 ++ game/ui/character/CharacterWindow.tscn | 1 + game/ui/crafting/CraftingWindow.tscn | 2 ++ game/ui/spellbook/SpellBookWindow.tscn | 2 ++ game/ui/talents/TalentWindow.tscn | 2 ++ 5 files changed, 9 insertions(+) diff --git a/game/ui/bags/Bag.tscn b/game/ui/bags/Bag.tscn index 5533f10c..08de2b71 100644 --- a/game/ui/bags/Bag.tscn +++ b/game/ui/bags/Bag.tscn @@ -256,8 +256,10 @@ margin_bottom = 26.5702 rect_min_size = Vector2( 30, 20 ) [node name="ItemTooltip" parent="." instance=ExtResource( 5 )] +toplevel = false margin_left = 4.0 margin_top = 4.0 margin_right = 299.0 margin_bottom = 227.0 + [connection signal="pressed" from="PanelContainer/VBoxContainer/HBoxContainer/CloseButton" to="." method="hide"] diff --git a/game/ui/character/CharacterWindow.tscn b/game/ui/character/CharacterWindow.tscn index 793efee7..25abd6dd 100644 --- a/game/ui/character/CharacterWindow.tscn +++ b/game/ui/character/CharacterWindow.tscn @@ -381,4 +381,5 @@ margin_top = 1051.0 margin_right = 204.0 margin_bottom = 1066.0 stat_name = "Weapon Damage Max" + [connection signal="pressed" from="Panel/VBoxContainer/HBoxContainer/Button" to="." method="_on_Button_pressed"] diff --git a/game/ui/crafting/CraftingWindow.tscn b/game/ui/crafting/CraftingWindow.tscn index 6fd13e36..e8d411b9 100644 --- a/game/ui/crafting/CraftingWindow.tscn +++ b/game/ui/crafting/CraftingWindow.tscn @@ -11,6 +11,7 @@ [node name="CraftingWindow" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 +mouse_filter = 2 theme = ExtResource( 1 ) script = ExtResource( 2 ) __meta__ = { @@ -307,6 +308,7 @@ margin_bottom = 234.0 text = "No recipes" align = 1 valign = 1 + [connection signal="pressed" from="PanelContainer/VBoxContainer/Header/Button" to="." method="hide"] [connection signal="pressed" from="PanelContainer/VBoxContainer/Categories/HBoxContainer2/Alchemy" to="." method="set_category" binds= [ 1 ]] [connection signal="pressed" from="PanelContainer/VBoxContainer/Categories/HBoxContainer2/Smithing" to="." method="set_category" binds= [ 2 ]] diff --git a/game/ui/spellbook/SpellBookWindow.tscn b/game/ui/spellbook/SpellBookWindow.tscn index a860f024..2f081fb3 100644 --- a/game/ui/spellbook/SpellBookWindow.tscn +++ b/game/ui/spellbook/SpellBookWindow.tscn @@ -7,6 +7,7 @@ [node name="SpellBookWindow" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 +mouse_filter = 2 theme = ExtResource( 1 ) script = ExtResource( 2 ) __meta__ = { @@ -173,4 +174,5 @@ margin_bottom = 26.5702 size_flags_horizontal = 3 size_flags_vertical = 3 text = "Next page >" + [connection signal="pressed" from="PanelContainer/PagedContent/Header/Button" to="." method="hide"] diff --git a/game/ui/talents/TalentWindow.tscn b/game/ui/talents/TalentWindow.tscn index 1756aa90..44b83f6d 100644 --- a/game/ui/talents/TalentWindow.tscn +++ b/game/ui/talents/TalentWindow.tscn @@ -8,6 +8,7 @@ [node name="TalentWindow" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 +mouse_filter = 2 theme = ExtResource( 1 ) script = ExtResource( 3 ) spec_scene = ExtResource( 2 ) @@ -112,4 +113,5 @@ size_flags_vertical = 3 __meta__ = { "_edit_use_anchors_": false } + [connection signal="pressed" from="PanelContainer/VBoxContainer/Header/Button" to="." method="hide"]