diff --git a/scenes/main.tscn b/scenes/main.tscn index 5379838..6723a2e 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -1628,9 +1628,10 @@ script = ExtResource("powerup_ui_script") [node name="PowerUpBtn" type="Button" parent="PowerUpInventoryUI" unique_id=1549270030] layout_mode = 0 -offset_top = 2.547058 -offset_right = 85.498886 -offset_bottom = 83.304146 +offset_left = 0.78915405 +offset_top = 2.0920486 +offset_right = 76.5548 +offset_bottom = 79.51765 size_flags_horizontal = 3 size_flags_vertical = 3 focus_mode = 0 @@ -1696,10 +1697,10 @@ expand_icon = true [node name="InteractionBtn" type="VBoxContainer" parent="TouchLayer/TouchControls" unique_id=1738242916] layout_mode = 0 -offset_left = 136.00002 -offset_top = 109.0 -offset_right = 218.00002 -offset_bottom = 186.0877 +offset_left = 138.0 +offset_top = 116.0 +offset_right = 215.3921 +offset_bottom = 190.84177 rotation = -0.10297442 theme_override_constants/separation = 10 @@ -1711,7 +1712,6 @@ focus_mode = 0 icon = ExtResource("25_qkpxi") flat = true icon_alignment = 1 -vertical_icon_alignment = 0 expand_icon = true [node name="PutBtn" type="Button" parent="TouchLayer/TouchControls/InteractionBtn" unique_id=1027790362] diff --git a/scenes/ui/settings_menu.tscn b/scenes/ui/settings_menu.tscn index b9a78c5..c31d43a 100644 --- a/scenes/ui/settings_menu.tscn +++ b/scenes/ui/settings_menu.tscn @@ -325,13 +325,13 @@ label_settings = SubResource("LabelSettings_heading") [node name="MoveUpBtn" type="Button" parent="PanelContainer/VBoxContainer/ContentSection/TabContainer/Controls/VBox/MoveGrid" unique_id=100000008] unique_name_in_owner = true -custom_minimum_size = Vector2(150, 40) +custom_minimum_size = Vector2(143, 38) layout_mode = 2 text = "W" [node name="MoveUpAltBtn" type="Button" parent="PanelContainer/VBoxContainer/ContentSection/TabContainer/Controls/VBox/MoveGrid" unique_id=100000108] unique_name_in_owner = true -custom_minimum_size = Vector2(150, 40) +custom_minimum_size = Vector2(143, 38) layout_mode = 2 text = "Up" @@ -343,13 +343,13 @@ label_settings = SubResource("LabelSettings_heading") [node name="MoveDownBtn" type="Button" parent="PanelContainer/VBoxContainer/ContentSection/TabContainer/Controls/VBox/MoveGrid" unique_id=100000010] unique_name_in_owner = true -custom_minimum_size = Vector2(150, 40) +custom_minimum_size = Vector2(143, 38) layout_mode = 2 text = "S" [node name="MoveDownAltBtn" type="Button" parent="PanelContainer/VBoxContainer/ContentSection/TabContainer/Controls/VBox/MoveGrid" unique_id=100000110] unique_name_in_owner = true -custom_minimum_size = Vector2(150, 40) +custom_minimum_size = Vector2(143, 38) layout_mode = 2 text = "Down" @@ -361,13 +361,13 @@ label_settings = SubResource("LabelSettings_heading") [node name="MoveLeftBtn" type="Button" parent="PanelContainer/VBoxContainer/ContentSection/TabContainer/Controls/VBox/MoveGrid" unique_id=100000012] unique_name_in_owner = true -custom_minimum_size = Vector2(150, 40) +custom_minimum_size = Vector2(143, 38) layout_mode = 2 text = "A" [node name="MoveLeftAltBtn" type="Button" parent="PanelContainer/VBoxContainer/ContentSection/TabContainer/Controls/VBox/MoveGrid" unique_id=100000112] unique_name_in_owner = true -custom_minimum_size = Vector2(150, 40) +custom_minimum_size = Vector2(143, 38) layout_mode = 2 text = "Left" @@ -379,13 +379,13 @@ label_settings = SubResource("LabelSettings_heading") [node name="MoveRightBtn" type="Button" parent="PanelContainer/VBoxContainer/ContentSection/TabContainer/Controls/VBox/MoveGrid" unique_id=100000014] unique_name_in_owner = true -custom_minimum_size = Vector2(150, 40) +custom_minimum_size = Vector2(143, 38) layout_mode = 2 text = "D" [node name="MoveRightAltBtn" type="Button" parent="PanelContainer/VBoxContainer/ContentSection/TabContainer/Controls/VBox/MoveGrid" unique_id=100000114] unique_name_in_owner = true -custom_minimum_size = Vector2(150, 40) +custom_minimum_size = Vector2(143, 38) layout_mode = 2 text = "Right" @@ -412,13 +412,13 @@ label_settings = SubResource("LabelSettings_heading") [node name="UsePowerupBtn" type="Button" parent="PanelContainer/VBoxContainer/ContentSection/TabContainer/Controls/VBox/PowerUpGrid" unique_id=100000119] unique_name_in_owner = true -custom_minimum_size = Vector2(150, 40) +custom_minimum_size = Vector2(143, 38) layout_mode = 2 text = "F" [node name="UsePowerupAltBtn" type="Button" parent="PanelContainer/VBoxContainer/ContentSection/TabContainer/Controls/VBox/PowerUpGrid" unique_id=100000120] unique_name_in_owner = true -custom_minimum_size = Vector2(150, 40) +custom_minimum_size = Vector2(143, 38) layout_mode = 2 text = "N/A" @@ -445,13 +445,13 @@ label_settings = SubResource("LabelSettings_heading") [node name="AttackModeBtn" type="Button" parent="PanelContainer/VBoxContainer/ContentSection/TabContainer/Controls/VBox/PowerBarGrid" unique_id=100000030] unique_name_in_owner = true -custom_minimum_size = Vector2(150, 40) +custom_minimum_size = Vector2(143, 38) layout_mode = 2 text = "Q" [node name="AttackModeAltBtn" type="Button" parent="PanelContainer/VBoxContainer/ContentSection/TabContainer/Controls/VBox/PowerBarGrid" unique_id=100000130] unique_name_in_owner = true -custom_minimum_size = Vector2(150, 40) +custom_minimum_size = Vector2(143, 38) layout_mode = 2 text = "N/A" @@ -463,13 +463,13 @@ label_settings = SubResource("LabelSettings_heading") [node name="TektonGrabBtn" type="Button" parent="PanelContainer/VBoxContainer/ContentSection/TabContainer/Controls/VBox/PowerBarGrid" unique_id=100000041] unique_name_in_owner = true -custom_minimum_size = Vector2(150, 40) +custom_minimum_size = Vector2(143, 38) layout_mode = 2 text = "G" [node name="TektonGrabAltBtn" type="Button" parent="PanelContainer/VBoxContainer/ContentSection/TabContainer/Controls/VBox/PowerBarGrid" unique_id=100000141] unique_name_in_owner = true -custom_minimum_size = Vector2(150, 40) +custom_minimum_size = Vector2(143, 38) layout_mode = 2 text = "N/A" @@ -496,13 +496,13 @@ label_settings = SubResource("LabelSettings_heading") [node name="GrabBtn" type="Button" parent="PanelContainer/VBoxContainer/ContentSection/TabContainer/Controls/VBox/OtherGrid" unique_id=100000037] unique_name_in_owner = true -custom_minimum_size = Vector2(150, 40) +custom_minimum_size = Vector2(143, 38) layout_mode = 2 text = "Space" [node name="GrabAltBtn" type="Button" parent="PanelContainer/VBoxContainer/ContentSection/TabContainer/Controls/VBox/OtherGrid" unique_id=100000137] unique_name_in_owner = true -custom_minimum_size = Vector2(150, 40) +custom_minimum_size = Vector2(143, 38) layout_mode = 2 text = "N/A" diff --git a/scripts/managers/touch_controls.gd b/scripts/managers/touch_controls.gd index dd5903c..897d23f 100644 --- a/scripts/managers/touch_controls.gd +++ b/scripts/managers/touch_controls.gd @@ -494,13 +494,13 @@ func _apply_settings(): if grab_button: grab_button.visible = true - grab_button.vertical_icon_alignment = VERTICAL_ALIGNMENT_TOP - grab_button.scale = Vector2(button_scale, button_scale) - grab_button.set_anchors_preset(Control.PRESET_BOTTOM_RIGHT) - grab_button.offset_left = button_positions.grab.x - grab_button.offset_top = button_positions.grab.y - grab_button.offset_right = button_positions.grab.x + button_size - grab_button.offset_bottom = button_positions.grab.y + button_size + #grab_button.vertical_icon_alignment = VERTICAL_ALIGNMENT_TOP + #grab_button.scale = Vector2(button_scale, button_scale) + #grab_button.set_anchors_preset(Control.PRESET_BOTTOM_RIGHT) + #grab_button.offset_left = button_positions.grab.x + #grab_button.offset_top = button_positions.grab.y + #grab_button.offset_right = button_positions.grab.x + button_size + #grab_button.offset_bottom = button_positions.grab.y + button_size if put_button: put_button.visible = false