oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

menu to the top right position

Browse Source
This commit is contained in:
Oier Bravo
2023-09-16 19:13:02 +02:00
parent 1394861ee7
commit 8674ffffa4
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gymkhana/addons/escoria-ui-return-monkey-island/game.gd
View File

@@ -90,7 +90,7 @@ func _ready():
escoria.logger.error(self, "Error connecting tooltip_size_updated with update_tooltip_following_mouse_position") escoria.logger.error(self, "Error connecting tooltip_size_updated with update_tooltip_following_mouse_position")
func _enter_tree(): 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) \ if ESCProjectSettingsManager.get_setting(ESCProjectSettingsManager.ENABLE_ROOM_SELECTOR) \
and room_selector_parent.get_node_or_null("room_select") == null: and room_selector_parent.get_node_or_null("room_select") == null:

33
gymkhana/addons/escoria-ui-return-monkey-island/game.tscn
View File

@@ -45,19 +45,9 @@ margin_top = 18.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 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"] [node name="Spacer" type="Control" parent="CanvasLayer/ui/HBoxContainer"]
margin_left = 62.0 margin_right = 1186.0
margin_right = 1280.0 margin_bottom = 90.0
margin_bottom = 83.0
size_flags_horizontal = 3 size_flags_horizontal = 3
[node name="inventory_ui" parent="CanvasLayer/ui/HBoxContainer" instance=ExtResource( 1 )] [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 )] [node name="main_menu" parent="CanvasLayer" instance=ExtResource( 7 )]
visible = false 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="."] [node name="tooltip_layer" type="CanvasLayer" parent="."]
layer = 2 layer = 2
@@ -96,4 +103,4 @@ color = Color( 1, 1, 1, 1 )
offset_from_cursor_action1 = Vector2( 0, 30 ) offset_from_cursor_action1 = Vector2( 0, 30 )
offset_from_cursor_action2 = Vector2( 0, -20 ) 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"]