diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/game.gd b/gymkhana/addons/escoria-ui-return-monkey-island/game.gd index 133f4222..304029ab 100644 --- a/gymkhana/addons/escoria-ui-return-monkey-island/game.gd +++ b/gymkhana/addons/escoria-ui-return-monkey-island/game.gd @@ -90,7 +90,7 @@ func _ready(): escoria.logger.error(self, "Error connecting tooltip_size_updated with update_tooltip_following_mouse_position") func _enter_tree(): - var room_selector_parent = $CanvasLayer/ui/HBoxContainer/VBoxContainer + var room_selector_parent = $CanvasLayer/menu_button/VBoxContainer if ESCProjectSettingsManager.get_setting(ESCProjectSettingsManager.ENABLE_ROOM_SELECTOR) \ and room_selector_parent.get_node_or_null("room_select") == null: diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/game.tscn b/gymkhana/addons/escoria-ui-return-monkey-island/game.tscn index 8c5430a6..0a0249e7 100644 --- a/gymkhana/addons/escoria-ui-return-monkey-island/game.tscn +++ b/gymkhana/addons/escoria-ui-return-monkey-island/game.tscn @@ -45,19 +45,9 @@ margin_top = 18.0 size_flags_horizontal = 3 size_flags_vertical = 3 -[node name="VBoxContainer" type="VBoxContainer" parent="CanvasLayer/ui/HBoxContainer"] -margin_right = 58.0 -margin_bottom = 83.0 - -[node name="MenuButton" type="Button" parent="CanvasLayer/ui/HBoxContainer/VBoxContainer"] -margin_right = 58.0 -margin_bottom = 27.0 -text = "Menu" - [node name="Spacer" type="Control" parent="CanvasLayer/ui/HBoxContainer"] -margin_left = 62.0 -margin_right = 1280.0 -margin_bottom = 83.0 +margin_right = 1186.0 +margin_bottom = 90.0 size_flags_horizontal = 3 [node name="inventory_ui" parent="CanvasLayer/ui/HBoxContainer" instance=ExtResource( 1 )] @@ -75,6 +65,23 @@ theme = ExtResource( 9 ) [node name="main_menu" parent="CanvasLayer" instance=ExtResource( 7 )] visible = false +[node name="menu_button" type="Control" parent="CanvasLayer"] +margin_left = 1191.0 +margin_top = 7.0 +margin_right = 1268.0 +margin_bottom = 45.0 + +[node name="VBoxContainer" type="VBoxContainer" parent="CanvasLayer/menu_button"] +margin_left = -52.0 +margin_top = 6.0 +margin_right = 76.0 +margin_bottom = 80.0 + +[node name="MenuButton" type="Button" parent="CanvasLayer/menu_button/VBoxContainer"] +margin_right = 128.0 +margin_bottom = 20.0 +text = "Menu" + [node name="tooltip_layer" type="CanvasLayer" parent="."] layer = 2 @@ -96,4 +103,4 @@ color = Color( 1, 1, 1, 1 ) offset_from_cursor_action1 = Vector2( 0, 30 ) offset_from_cursor_action2 = Vector2( 0, -20 ) -[connection signal="pressed" from="CanvasLayer/ui/HBoxContainer/VBoxContainer/MenuButton" to="." method="_on_MenuButton_pressed"] +[connection signal="pressed" from="CanvasLayer/menu_button/VBoxContainer/MenuButton" to="." method="_on_MenuButton_pressed"]