From a0e6e932e434d3ea13e25d61bcedd9dec9452f1b Mon Sep 17 00:00:00 2001 From: CrispyPin Date: Sat, 26 Jun 2021 22:53:23 +0200 Subject: [PATCH] fix overlays spawning with wrong target until updated, fix add overlay button staying on after use --- ovr-utils/addons/openvr_overlay/overlay_instance.gd | 1 + ovr-utils/overlay_scripts/main_menu.gd | 4 ++++ ovr-utils/special_overlays/MainOverlay.tscn | 1 + ovr-utils/ui/add_menu.gd | 2 ++ 4 files changed, 8 insertions(+) diff --git a/ovr-utils/addons/openvr_overlay/overlay_instance.gd b/ovr-utils/addons/openvr_overlay/overlay_instance.gd index 4e9bb14..0136010 100644 --- a/ovr-utils/addons/openvr_overlay/overlay_instance.gd +++ b/ovr-utils/addons/openvr_overlay/overlay_instance.gd @@ -57,6 +57,7 @@ func _ready() -> void: container.add_child(overlay_scene.instance()) update_tracker_id() + update_offset() func add_cursor(): diff --git a/ovr-utils/overlay_scripts/main_menu.gd b/ovr-utils/overlay_scripts/main_menu.gd index 2a214f1..39848f6 100644 --- a/ovr-utils/overlay_scripts/main_menu.gd +++ b/ovr-utils/overlay_scripts/main_menu.gd @@ -40,3 +40,7 @@ func _on_QuitToggle_toggled(state: bool) -> void: func _on_Quit_pressed() -> void: Settings.force_save() get_tree().quit() + + +func _on_add_menu_closed() -> void: + $MarginContainer/VSplitContainer/MainBar/AddOverlay.pressed = false diff --git a/ovr-utils/special_overlays/MainOverlay.tscn b/ovr-utils/special_overlays/MainOverlay.tscn index 16a2538..b8a4f62 100644 --- a/ovr-utils/special_overlays/MainOverlay.tscn +++ b/ovr-utils/special_overlays/MainOverlay.tscn @@ -112,6 +112,7 @@ __meta__ = { "_edit_use_anchors_": false } +[connection signal="add_menu_closed" from="MarginContainer/VSplitContainer/Control/AddMenu" to="." method="_on_add_menu_closed"] [connection signal="toggled" from="MarginContainer/VSplitContainer/MainBar/ShowOverlays" to="." method="_on_ShowOverlays_toggled"] [connection signal="toggled" from="MarginContainer/VSplitContainer/MainBar/AddOverlay" to="." method="_on_AddOverlay_toggled"] [connection signal="toggled" from="MarginContainer/VSplitContainer/MainBar/GrabMode" to="." method="_on_GrabMode_toggled"] diff --git a/ovr-utils/ui/add_menu.gd b/ovr-utils/ui/add_menu.gd index a20e4e2..a28cc9f 100644 --- a/ovr-utils/ui/add_menu.gd +++ b/ovr-utils/ui/add_menu.gd @@ -1,5 +1,6 @@ extends Control +signal add_menu_closed var types: Array @@ -16,6 +17,7 @@ func _ready() -> void: func add_overlay(type): OverlayManager.add_overlay(type, type + " " + str(randi()%1000)) visible = false + emit_signal("add_menu_closed") func get_overlay_types(path := "res://overlays/"):