update client for godot 4.0.2 (disable debug message)

PlayerB/Player/Player.tscn

@@ -285,59 +285,59 @@ character_movement_component = NodePath("../CharacterMovementComponent")
 shape = SubResource("CapsuleShape3D_ied37")
 
 [node name="Skeleton3D" parent="Armature" index="0"]
-bones/0/position = Vector3(0.00286752, 0.931133, 0.0021665)
+bones/0/position = Vector3(-0.000172998, 0.901879, -0.00179914)
-bones/0/rotation = Quaternion(-0.0407676, -0.37142, -0.0154171, 0.927441)
+bones/0/rotation = Quaternion(0.0129103, -0.477019, 0.0128396, 0.878704)
-bones/1/rotation = Quaternion(-0.0132617, 0.0404789, -0.00542303, 0.999078)
+bones/1/rotation = Quaternion(-0.034878, 0.0121777, 0.00603897, 0.999299)
-bones/2/rotation = Quaternion(0.0943702, 0.0821296, -0.0072563, 0.992117)
+bones/2/rotation = Quaternion(0.00771038, 0.00387442, 0.0077534, 0.999933)
-bones/3/rotation = Quaternion(0.154061, 0.0815378, -0.012218, 0.984615)
+bones/3/rotation = Quaternion(0.0679804, 0.00466348, 0.00750769, 0.997648)
-bones/4/rotation = Quaternion(0.129425, -0.00964817, 0.00331386, 0.991536)
+bones/4/rotation = Quaternion(0.259049, 0.120367, -0.0335045, 0.957749)
-bones/5/rotation = Quaternion(-0.0487468, 0.170424, -0.0568101, 0.982523)
+bones/5/rotation = Quaternion(-0.00246286, 0.223138, -0.172693, 0.959365)
-bones/9/rotation = Quaternion(0.475678, 0.533875, -0.570408, 0.404157)
+bones/9/rotation = Quaternion(-0.465919, -0.528453, 0.588414, -0.396769)
-bones/10/rotation = Quaternion(0.532933, -0.0741989, 0.14547, 0.83025)
+bones/10/rotation = Quaternion(0.520746, -0.203354, 0.188978, 0.807315)
-bones/11/rotation = Quaternion(-0.00751253, 0.0998335, 0.451269, 0.886754)
+bones/11/rotation = Quaternion(9.19054e-05, 0.0274316, 0.655564, 0.754641)
-bones/12/rotation = Quaternion(-0.153289, 0.123277, -0.00593906, 0.980444)
+bones/12/rotation = Quaternion(-0.0908578, 0.331043, 0.131266, 0.930013)
-bones/13/rotation = Quaternion(0.136229, 0.00290555, -0.0698596, 0.988207)
+bones/13/rotation = Quaternion(0.68532, -6.03681e-05, -0.0820378, 0.723606)
-bones/14/rotation = Quaternion(0.201943, -0.00139866, 0.0156955, 0.97927)
+bones/14/rotation = Quaternion(0.816783, -0.000611766, -0.0982718, 0.568513)
-bones/15/rotation = Quaternion(-2.23524e-08, -1.54721e-07, 7.9803e-06, 1)
+bones/15/rotation = Quaternion(0.818243, 0.00110579, -0.0972425, 0.566587)
-bones/17/rotation = Quaternion(0.284136, 0.115516, 0.18164, 0.934307)
+bones/17/rotation = Quaternion(0.217917, 0.0898311, 0.175515, 0.955844)
-bones/18/rotation = Quaternion(-0.00754712, 0.00079939, -0.000678675, 0.999971)
+bones/18/rotation = Quaternion(0.111987, -0.158249, -0.280048, 0.940207)
-bones/19/rotation = Quaternion(-6.10946e-07, -5.2211e-06, -9.82261e-06, 1)
+bones/19/rotation = Quaternion(-0.0215223, -0.07977, -0.565562, 0.820556)
-bones/21/rotation = Quaternion(0.0385101, -0.00503401, 0.0620579, 0.997316)
+bones/21/rotation = Quaternion(0.680469, 0.00849827, -0.0898124, 0.727203)
-bones/22/rotation = Quaternion(0.152149, -0.000944763, -0.00571419, 0.98834)
+bones/22/rotation = Quaternion(0.845186, -0.00222601, -0.10257, 0.524533)
-bones/23/rotation = Quaternion(1.94206e-06, -1.96826e-06, -1.6247e-07, 1)
+bones/23/rotation = Quaternion(0.811299, 0.00123152, -0.096296, 0.576645)
-bones/25/rotation = Quaternion(0.276139, -0.0192624, -0.115281, 0.953984)
+bones/25/rotation = Quaternion(0.70653, -0.0227113, -0.0611423, 0.704671)
-bones/26/rotation = Quaternion(0.287932, 0.00177289, 0.0251145, 0.95732)
+bones/26/rotation = Quaternion(0.796127, -0.00109192, -0.096178, 0.597436)
-bones/27/rotation = Quaternion(-5.58815e-09, -1.08033e-07, 3.06809e-06, 1)
+bones/27/rotation = Quaternion(0.787005, 0.00064355, -0.0937785, 0.609778)
-bones/29/rotation = Quaternion(0.302339, -0.0207995, -0.148822, 0.941281)
+bones/29/rotation = Quaternion(0.734984, -0.0394802, -0.050487, 0.675049)
-bones/30/rotation = Quaternion(0.348689, 0.0117877, 0.0500265, 0.935828)
+bones/30/rotation = Quaternion(0.753528, 0.0265116, -0.0681514, 0.653336)
-bones/31/rotation = Quaternion(1.99945e-06, -2.02538e-06, 9.9316e-06, 1)
+bones/31/rotation = Quaternion(0.882855, 0.000936385, -0.105273, 0.457695)
-bones/33/rotation = Quaternion(0.52653, -0.494906, 0.538598, 0.433297)
+bones/33/rotation = Quaternion(0.502236, -0.498063, 0.599458, 0.374623)
-bones/34/rotation = Quaternion(0.514478, 0.0830848, 0.0769871, 0.84999)
+bones/34/rotation = Quaternion(0.370554, -0.0482472, -0.469022, 0.800238)
-bones/35/rotation = Quaternion(0.0622515, -0.0620934, -0.431416, 0.897858)
+bones/35/rotation = Quaternion(0.000238858, -0.0366692, -0.862701, 0.504384)
-bones/36/rotation = Quaternion(0.110966, -0.00639391, -0.0504766, 0.992521)
+bones/36/rotation = Quaternion(-0.113264, 0.1314, -0.0768276, 0.981836)
-bones/37/rotation = Quaternion(0.111086, 0.00854173, 0.0245615, 0.993471)
+bones/37/rotation = Quaternion(0.685333, 6.17094e-05, 0.0827409, 0.723514)
-bones/38/rotation = Quaternion(0.309928, 0.00171618, -0.021322, 0.950519)
+bones/38/rotation = Quaternion(0.81459, 0.000966602, 0.0990885, 0.571511)
-bones/39/rotation = Quaternion(-2.79586e-09, 3.36491e-08, -7.53691e-06, 1)
+bones/39/rotation = Quaternion(0.821818, -0.0017916, 0.0979961, 0.561256)
-bones/41/rotation = Quaternion(0.203046, 0.0246648, -0.228941, 0.951709)
+bones/41/rotation = Quaternion(0.258103, -0.0464722, -0.166247, 0.950571)
-bones/42/rotation = Quaternion(0.00561814, 0.00161676, 0.180932, 0.983478)
+bones/42/rotation = Quaternion(0.0971873, -0.0337892, 0.319316, 0.942046)
-bones/43/rotation = Quaternion(1.68663e-06, 4.45363e-06, 1.01891e-05, 1)
+bones/43/rotation = Quaternion(0.102353, 0.051128, 0.496662, 0.86037)
-bones/45/rotation = Quaternion(0.0385272, 0.00975336, 0.0105134, 0.999155)
+bones/45/rotation = Quaternion(0.68078, -0.0190739, 0.101264, 0.725204)
-bones/46/rotation = Quaternion(0.147211, 0.000197627, 0.00967613, 0.989058)
+bones/46/rotation = Quaternion(0.853091, 0.000644792, 0.103455, 0.511402)
-bones/47/rotation = Quaternion(-1.92115e-07, -1.9491e-07, 2.67951e-07, 1)
+bones/47/rotation = Quaternion(0.803307, 7.36886e-05, 0.0971108, 0.587595)
-bones/49/rotation = Quaternion(0.211278, -0.0064634, 0.0649752, 0.975243)
+bones/49/rotation = Quaternion(0.723188, 0.0327217, 0.0549051, 0.687687)
-bones/50/rotation = Quaternion(0.343467, -0.00251803, -0.036149, 0.938465)
+bones/50/rotation = Quaternion(0.758867, 0.00171341, 0.0930925, 0.644555)
-bones/51/rotation = Quaternion(-3.51451e-06, -3.27981e-06, -3.25159e-06, 1)
+bones/51/rotation = Quaternion(0.799428, -0.002656, 0.0944829, 0.59328)
-bones/53/rotation = Quaternion(0.207037, -0.0111315, 0.0919152, 0.973942)
+bones/53/rotation = Quaternion(0.738816, 0.0655906, 0.0273769, 0.670149)
-bones/54/rotation = Quaternion(0.372181, -0.0132523, -0.070539, 0.925381)
+bones/54/rotation = Quaternion(0.747741, 0.00140453, 0.0915433, 0.657648)
-bones/55/rotation = Quaternion(-5.59105e-09, -1.15109e-14, -1.09178e-05, 1)
+bones/55/rotation = Quaternion(0.885414, -0.00156687, 0.10615, 0.452518)
-bones/57/rotation = Quaternion(-0.12559, 0.00681877, 0.983203, 0.13226)
+bones/57/rotation = Quaternion(-0.126738, 0.140515, 0.969622, 0.155006)
-bones/58/rotation = Quaternion(-0.285334, 0.069074, -0.0173783, 0.955778)
+bones/58/rotation = Quaternion(-0.378447, -0.0320807, -0.00808686, 0.925032)
-bones/59/rotation = Quaternion(0.591416, 0.0619472, 0.11457, 0.795779)
+bones/59/rotation = Quaternion(0.629739, 0.0424758, 0.115003, 0.767072)
-bones/60/rotation = Quaternion(0.353628, 0.0202899, 0.0040719, 0.935157)
+bones/60/rotation = Quaternion(0.340454, 0.0167316, 0.00602515, 0.940093)
-bones/62/rotation = Quaternion(-0.0793266, -0.207014, -0.9696, 0.103574)
+bones/62/rotation = Quaternion(0.156635, 0.280779, 0.931659, -0.169234)
-bones/63/rotation = Quaternion(-0.310959, 0.117688, -0.0372882, 0.942371)
+bones/63/rotation = Quaternion(-0.307456, 0.043324, -0.0155887, 0.950448)
-bones/64/rotation = Quaternion(0.491708, -0.0209777, -0.0377644, 0.869687)
+bones/64/rotation = Quaternion(0.442158, -0.046071, -0.0947431, 0.890729)
-bones/65/rotation = Quaternion(0.35992, -0.000617787, -0.0302186, 0.932493)
+bones/65/rotation = Quaternion(0.352065, -0.016805, -0.00581727, 0.935807)
 
 [node name="flashlight" parent="Armature" index="1" instance=ExtResource("5_euvsl")]
 transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 1.12407, 0.156779)

addons/AMSG/Components/AnimationBlend.gd

@@ -2,7 +2,6 @@ extends AnimationTree
 class_name AnimBlend
 @onready @export var movement_script : CharacterMovementComponent  # I use this to get variables from main movement script
 
-var count:int=0
 
 func _physics_process(_delta):
 	if !movement_script:
@@ -27,13 +26,6 @@ func _physics_process(_delta):
 			set("parameters/VelocityDirection/crouch/transition_request" , "crouch")
 
 	#standing
-	print("-------")
-	print(movement_script.gait == Global.gait.walking)
-	print(movement_script.input_is_moving)
-	if movement_script.gait == Global.gait.walking and movement_script.input_is_moving:
-		count +=1
-		if count > 100:
-			print("Debug")
 	set("parameters/VelocityDirection/standing/conditions/idle",!movement_script.input_is_moving)
 	set("parameters/VelocityDirection/standing/conditions/walking",movement_script.gait == Global.gait.walking and movement_script.input_is_moving)
 	set("parameters/VelocityDirection/standing/conditions/running",movement_script.gait == Global.gait.running and movement_script.input_is_moving)
@@ -65,5 +57,3 @@ func _physics_process(_delta):
 	set("parameters/Turn/blend_amount" , 1 if movement_script.is_rotating_in_place else 0)
 	set("parameters/RightOrLeft/blend_amount" ,0 if movement_script.rotation_difference_camera_mesh > 0 else 1)
 
-
-

addons/AMSG/Components/CharacterMovementComponent.gd

@@ -606,13 +606,10 @@ func ik_look_at(position: Vector3):
 
 var PrevVelocity :Vector3
 func add_movement_input(direction: Vector3, Speed: float , Acceleration: float) -> void:
-	print("add_movement_input")
 	if is_flying == false:
-		print("add_movement_input no is_flying")
 		character_node.velocity.x = lerp(character_node.velocity.x, direction.x * Speed, Acceleration * get_physics_process_delta_time())
 		character_node.velocity.z = lerp(character_node.velocity.z, direction.z * Speed, Acceleration * get_physics_process_delta_time())
 	else:
-		print("add_movement_input is_flying")
 		character_node.set_velocity(character_node.get_velocity().lerp(direction * Speed, Acceleration * get_physics_process_delta_time()))
 		character_node.move_and_slide()
 	input_velocity = Speed * direction
@@ -626,7 +623,6 @@ func add_movement_input(direction: Vector3, Speed: float , Acceleration: float)
 	actual_velocity = character_node.velocity
 	#tiltCharacterMesh
 	if tilt == true:
-		print("add_movement_input tilt")
 		var MovementDirectionRelativeToCamera = input_velocity.normalized().rotated(Vector3.UP,-camera_root.HObject.transform.basis.get_euler().y)
 		var IsMovingBackwardRelativeToCamera = false if input_velocity.rotated(Vector3.UP,-camera_root.HObject.transform.basis.get_euler().y).z >= -0.1 else true
 		if IsMovingBackwardRelativeToCamera:

scenes/controls/controls.gd

@@ -528,3 +528,8 @@ func _on_factor_player_horizontale_value_changed(value):
 func _on_factor_player_verticale_value_changed(value):
 	$Window/v/Tab/JOYPAD/v/FactorPlayerVerticale/value.set_text(str(value))
 	Common.set_factor_player_verticale_joypad(value)
+
+
+func _on_window_visibility_changed():
+	if $Window.visible:
+		$Window/v/Quit.grab_focus()

scenes/controls/controls.tscn

@@ -10,6 +10,8 @@ layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
 script = ExtResource("1_2c8s6")
 
 [node name="Window" type="Window" parent="."]
@@ -448,6 +450,7 @@ anchors_preset = 0
 anchors_preset = 0
 
 [connection signal="close_requested" from="Window" to="." method="_on_quit_pressed"]
+[connection signal="visibility_changed" from="Window" to="." method="_on_window_visibility_changed"]
 [connection signal="item_selected" from="Window/v/Tab/CONTROL/Menu/ShowMethod" to="." method="_on_option_button_item_selected"]
 [connection signal="pressed" from="Window/v/Tab/CONTROL/Menu/SortByInput" to="." method="_on_sort_by_input_pressed"]
 [connection signal="pressed" from="Window/v/Tab/CONTROL/Menu/Reload" to="." method="reload_control_system"]

scenes/hud/hud.gd

@@ -5,7 +5,7 @@ var git_commit:String
 var tag_release:String
 
 func _ready():
-	$MenuTheme.connect("update_theme", update_theme.bind())
+	#$MenuTheme.connect("update_theme", update_theme.bind())
 	#var fileCheck = FileAccess.open("res://commit.txt")
 	if FileAccess.file_exists("res://commit.txt"):
 		var file = FileAccess.open("res://commit.txt", FileAccess.READ)
@@ -35,9 +35,27 @@ func update_theme():
 	self.set_theme(select_theme)
 
 
-func _input(_event):
+func _input(_event:InputEvent):
 	if Input.is_action_just_pressed("ui_menu"):
 		$Menu.visible = ! $Menu.visible
+		if $Menu.visible:
+			# Force focus on Keys
+			$Menu/About.grab_focus()
+#	elif $Menu.visible:
+#		if _event.is_action_pressed("INPUT_ACTION_RIGHT"):
+#			print("INPUT_ACTION_RIGHT 2")
+#			#$Control.accept_event()
+#			#Input.flush_buffered_events()
+#		elif _event.is_action_pressed("INPUT_ACTION_LEFT"):
+#			print("INPUT_ACTION_LEFT 2")
+#		elif Input.is_action_just_pressed("INPUT_ACTION_LEFT"):
+#			print("INPUT_ACTION_LEFT")
+#		elif Input.is_action_just_pressed("INPUT_ACTION_RIGHT"):
+#			print("INPUT_ACTION_RIGHT")
+#			#set_input_as_handled()
+#			#accept_event()
+#			#Viewport.set_input_as_handled()
+#			#self.get_parent_control().set_input_as_handled()
 
 
 func _on_timer_timeout():

scenes/hud/hud.tscn

@@ -13,62 +13,63 @@ layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
 theme = ExtResource("1_iq3fo")
 script = ExtResource("1_s6f6d")
 
 [node name="Message" type="HBoxContainer" parent="."]
-anchors_preset = 10
+layout_mode = 0
 anchor_right = 1.0
 size_flags_horizontal = 0
 size_flags_vertical = 0
 alignment = 2
 
 [node name="Label" type="Label" parent="Message"]
-offset_left = 1037.0
+layout_mode = 2
-offset_right = 1152.0
-offset_bottom = 31.0
 size_flags_vertical = 1
 text = "Echap = Menu"
 
 [node name="Menu" type="HBoxContainer" parent="."]
 visible = false
-anchors_preset = 10
+layout_mode = 0
 anchor_right = 1.0
 offset_right = 40.0
 offset_bottom = 40.0
 alignment = 1
 
 [node name="Keys" type="Button" parent="Menu"]
-offset_left = 510.0
+layout_mode = 2
-offset_right = 554.0
+focus_neighbor_right = NodePath("../Themes")
-offset_bottom = 40.0
 text = "HUD/KEYS"
 
 [node name="Themes" type="Button" parent="Menu"]
-offset_right = 8.0
+layout_mode = 2
-offset_bottom = 31.0
+focus_neighbor_left = NodePath("../Keys")
+focus_neighbor_right = NodePath("../Languages")
 text = "HUD/THEMES"
 
 [node name="Languages" type="Button" parent="Menu"]
-offset_left = 492.0
+layout_mode = 2
-offset_right = 574.0
+focus_neighbor_left = NodePath("../Themes")
-offset_bottom = 40.0
+focus_neighbor_right = NodePath("../Music")
 text = "HUD/LANGUAGES"
 
 [node name="Music" type="Button" parent="Menu"]
-offset_right = 87.0
+layout_mode = 2
-offset_bottom = 19.0
+focus_neighbor_left = NodePath("../Languages")
+focus_neighbor_right = NodePath("../About")
 text = "HUD/MUSIC"
 
 [node name="About" type="Button" parent="Menu"]
-offset_right = 40.0
+layout_mode = 2
-offset_bottom = 19.0
+focus_neighbor_left = NodePath("../Music")
+focus_neighbor_right = NodePath("../Quit")
 text = "HUD/ABOUT"
 
 [node name="Quit" type="Button" parent="Menu"]
-offset_left = 578.0
+layout_mode = 2
-offset_right = 619.0
+focus_neighbor_left = NodePath("../About")
-offset_bottom = 40.0
 text = "HUD/QUIT"
 
 [node name="Timer" type="Timer" parent="."]
@@ -85,7 +86,7 @@ title = "POPUP_ABOUT_MESSAGE/TITLE"
 
 [node name="MenuLanguage" parent="." instance=ExtResource("3_gyqw8")]
 visible = false
-layout_mode = 3
+layout_mode = 1
 anchor_left = 0.096
 anchor_top = 0.137
 offset_left = -0.304001
@@ -95,21 +96,20 @@ metadata/_edit_layout_mode = 1
 
 [node name="MenuLanguage2" parent="." instance=ExtResource("2_um8fw")]
 visible = false
-layout_mode = 3
-anchors_preset = 0
 
 [node name="MenuControl" parent="." instance=ExtResource("3_08xl7")]
-layout_mode = 3
+layout_mode = 1
-anchors_preset = 15
+grow_horizontal = 2
+grow_vertical = 2
 
 [node name="MenuTheme" parent="." instance=ExtResource("4_1poje")]
 visible = false
-layout_mode = 3
+layout_mode = 1
-anchors_preset = 15
+grow_horizontal = 2
+grow_vertical = 2
 
 [node name="MusicManager" parent="." instance=ExtResource("6_0ivsi")]
-layout_mode = 3
+visible = false
-anchors_preset = 0
 
 [connection signal="pressed" from="Menu/Keys" to="." method="_on_keys_pressed"]
 [connection signal="pressed" from="Menu/Themes" to="." method="_on_themes_pressed"]

scenes/languages/languages.gd

@@ -49,3 +49,8 @@ func show_window():
 	$Window.show_window()
 	#.visible = true
 
+
+
+func _on_window_old_visibility_changed():
+	if $Window.visible:
+		$WindowOld/VBoxContainer/Quit.grab_focus()

scenes/languages/languages.tscn

@@ -4,7 +4,9 @@
 [ext_resource type="PackedScene" uid="uid://otvln5ol34bj" path="res://scenes/languages/languages2.tscn" id="2_plade"]
 
 [node name="Control" type="Control"]
-script = ExtResource( "1_qc7c5" )
+layout_mode = 3
+anchors_preset = 0
+script = ExtResource("1_qc7c5")
 
 [node name="WindowOld" type="Window" parent="."]
 title = "Language"
@@ -13,6 +15,7 @@ size = Vector2i(300, 150)
 visible = false
 
 [node name="VBoxContainer" type="VBoxContainer" parent="WindowOld"]
+anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
@@ -22,28 +25,24 @@ size_flags_vertical = 3
 metadata/_edit_use_custom_anchors = false
 
 [node name="Label" type="Label" parent="WindowOld/VBoxContainer"]
-offset_right = 1024.0
+layout_mode = 2
-offset_bottom = 26.0
 text = "Select language"
 
 [node name="Select" type="OptionButton" parent="WindowOld/VBoxContainer"]
-offset_top = 30.0
+layout_mode = 2
-offset_right = 1024.0
-offset_bottom = 565.0
 size_flags_vertical = 3
 metadata/_edit_use_custom_anchors = false
 
 [node name="Quit" type="Button" parent="WindowOld/VBoxContainer"]
-offset_left = 491.0
+layout_mode = 2
-offset_top = 569.0
-offset_right = 533.0
-offset_bottom = 600.0
 size_flags_horizontal = 4
 size_flags_vertical = 8
 text = "Quit"
 
-[node name="Window" parent="." instance=ExtResource( "2_plade" )]
+[node name="Window" parent="." instance=ExtResource("2_plade")]
+layout_mode = 1
 
 [connection signal="close_requested" from="WindowOld" to="." method="_on_quit_pressed"]
+[connection signal="visibility_changed" from="WindowOld" to="." method="_on_window_old_visibility_changed"]
 [connection signal="item_selected" from="WindowOld/VBoxContainer/Select" to="." method="_on_select_item_selected"]
 [connection signal="pressed" from="WindowOld/VBoxContainer/Quit" to="." method="_on_quit_pressed"]

scenes/languages/languages2.gd

@@ -119,6 +119,7 @@ func show_window():
 		selected = id
 	$NinePatchRect/V/H2/VBoxContainer/Select.select(selected)
 	self.set_visible(true)
+	#$NinePatchRect/V/H2/VBoxContainer/Quit.grab_focus()
 
 
 func _on_select_item_selected(_index):
@@ -196,3 +197,8 @@ func _on_resize_bottom_right_mouse_entered():
 
 func _on_resize_bottom_right_mouse_exited():
 	enterResizeBottomRight = false
+#
+#
+#func _on_visibility_changed():
+#	if self.visible:
+#		$NinePatchRect/V/H2/VBoxContainer/Quit.grab_focus()

scenes/main/main.tscn

@@ -17,5 +17,3 @@ spawn_path = NodePath("../PlayerSpawnLocation")
 [node name="terrain_basic_setup" parent="." instance=ExtResource("2_jj4oa")]
 
 [node name="Control" parent="." instance=ExtResource("3_5vcj4")]
-grow_horizontal = 2
-grow_vertical = 2

scenes/music/music_manager.gd

@@ -250,3 +250,9 @@ func _on_global_value_changed(value) -> void:
 
 func _on_window_close_requested() -> void:
 	$Window.hide()
+
+
+func _on_window_visibility_changed():
+	if $Window.visible:
+		$Window/VBox/HBoxContainer/Quit.grab_focus()
+

scenes/music/music_manager.tscn

@@ -3,7 +3,9 @@
 [ext_resource type="Script" path="res://scenes/music/music_manager.gd" id="1_dltpv"]
 
 [node name="MusicManager" type="Control"]
-script = ExtResource( "1_dltpv" )
+layout_mode = 3
+anchors_preset = 0
+script = ExtResource("1_dltpv")
 
 [node name="Music" type="AudioStreamPlayer" parent="."]
 volume_db = 23.803
@@ -17,165 +19,134 @@ size = Vector2i(800, 450)
 visible = false
 
 [node name="VBox" type="VBoxContainer" parent="Window"]
+anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 
 [node name="Tab" type="TabContainer" parent="Window/VBox"]
-offset_right = 1024.0
+layout_mode = 2
-offset_bottom = 565.0
-grow_horizontal = 2
-grow_vertical = 2
 size_flags_vertical = 3
+focus_mode = 2
 tab_alignment = 1
 
 [node name="Music" type="VBoxContainer" parent="Window/VBox/Tab"]
-anchor_right = 1.0
+visible = false
-anchor_bottom = 1.0
+layout_mode = 2
-offset_top = 31.0
+focus_mode = 2
-grow_horizontal = 2
-grow_vertical = 2
 
 [node name="HBox" type="HBoxContainer" parent="Window/VBox/Tab/Music"]
-offset_left = 160.0
+layout_mode = 2
-offset_right = 864.0
-offset_bottom = 31.0
 size_flags_horizontal = 4
 size_flags_vertical = 0
 
 [node name="Play" type="CheckButton" parent="Window/VBox/Tab/Music/HBox"]
-offset_right = 230.0
+layout_mode = 2
-offset_bottom = 31.0
+focus_neighbor_top = NodePath("../..")
 button_pressed = true
 text = "MUSIC_MANAGER/PLAY"
 
 [node name="Random" type="CheckButton" parent="Window/VBox/Tab/Music/HBox"]
-offset_left = 234.0
+layout_mode = 2
-offset_right = 498.0
+focus_neighbor_top = NodePath("../..")
-offset_bottom = 31.0
 button_pressed = true
 text = "MUSIC_MANAGER/RANDOM"
 
 [node name="Reinit" type="Button" parent="Window/VBox/Tab/Music/HBox"]
-offset_left = 502.0
+layout_mode = 2
-offset_right = 704.0
+focus_neighbor_top = NodePath("../..")
-offset_bottom = 31.0
 text = "MUSIC_MANAGER/REINIT"
 
 [node name="ScrollContainer" type="ScrollContainer" parent="Window/VBox/Tab/Music"]
-offset_top = 35.0
+layout_mode = 2
-offset_right = 1024.0
-offset_bottom = 534.0
 size_flags_vertical = 3
 
 [node name="ListMusic" type="VBoxContainer" parent="Window/VBox/Tab/Music/ScrollContainer"]
-offset_right = 1024.0
+layout_mode = 2
-offset_bottom = 499.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 
 [node name="Mixer" type="VBoxContainer" parent="Window/VBox/Tab"]
-visible = false
+layout_mode = 2
-offset_right = 40.0
+focus_mode = 2
-offset_bottom = 40.0
 
 [node name="GlobalLevel" type="HBoxContainer" parent="Window/VBox/Tab/Mixer"]
-offset_right = 40.0
+layout_mode = 2
-offset_bottom = 40.0
 
 [node name="Label" type="Label" parent="Window/VBox/Tab/Mixer/GlobalLevel"]
-offset_right = 40.0
+layout_mode = 2
-offset_bottom = 23.0
 size_flags_horizontal = 3
 text = "MUSIC_MANAGER/GLOBAL_VOLUME"
 
 [node name="global" type="HSlider" parent="Window/VBox/Tab/Mixer/GlobalLevel"]
-offset_right = 8.0
+layout_mode = 2
-offset_bottom = 16.0
 size_flags_horizontal = 3
 
 [node name="Value" type="Label" parent="Window/VBox/Tab/Mixer/GlobalLevel"]
-minimum_size = Vector2(50, 0)
+layout_mode = 2
-offset_right = 40.0
-offset_bottom = 23.0
 text = "0"
 
 [node name="MusicLevel" type="HBoxContainer" parent="Window/VBox/Tab/Mixer"]
-offset_right = 40.0
+layout_mode = 2
-offset_bottom = 40.0
 
 [node name="Label" type="Label" parent="Window/VBox/Tab/Mixer/MusicLevel"]
-offset_right = 40.0
+layout_mode = 2
-offset_bottom = 23.0
 size_flags_horizontal = 3
 text = "MUSIC_MANAGER/MUSIC_VOLUME"
 
 [node name="music" type="HSlider" parent="Window/VBox/Tab/Mixer/MusicLevel"]
-offset_right = 8.0
+layout_mode = 2
-offset_bottom = 16.0
 size_flags_horizontal = 3
 
 [node name="Value" type="Label" parent="Window/VBox/Tab/Mixer/MusicLevel"]
-minimum_size = Vector2(50, 0)
+layout_mode = 2
-offset_right = 40.0
-offset_bottom = 23.0
 text = "0"
 
 [node name="EffectLevel" type="HBoxContainer" parent="Window/VBox/Tab/Mixer"]
-offset_right = 40.0
+layout_mode = 2
-offset_bottom = 40.0
 
 [node name="Label" type="Label" parent="Window/VBox/Tab/Mixer/EffectLevel"]
-offset_right = 40.0
+layout_mode = 2
-offset_bottom = 23.0
 size_flags_horizontal = 3
 text = "MUSIC_MANAGER/EFFECT_VOLUME"
 
 [node name="effect" type="HSlider" parent="Window/VBox/Tab/Mixer/EffectLevel"]
-offset_right = 8.0
+layout_mode = 2
-offset_bottom = 16.0
 size_flags_horizontal = 3
 
 [node name="Value" type="Label" parent="Window/VBox/Tab/Mixer/EffectLevel"]
-minimum_size = Vector2(50, 0)
+layout_mode = 2
-offset_right = 40.0
-offset_bottom = 23.0
 text = "0"
 
 [node name="HBoxContainer" type="HBoxContainer" parent="Window/VBox"]
-offset_right = 40.0
+layout_mode = 2
-offset_bottom = 40.0
 size_flags_vertical = 8
 
 [node name="space" type="Label" parent="Window/VBox/HBoxContainer"]
-offset_right = 40.0
+layout_mode = 2
-offset_bottom = 23.0
 size_flags_horizontal = 3
 
-[node name="Button" type="Button" parent="Window/VBox/HBoxContainer"]
+[node name="Quit" type="Button" parent="Window/VBox/HBoxContainer"]
-offset_left = 496.0
+layout_mode = 2
-offset_top = 569.0
-offset_right = 527.0
-offset_bottom = 600.0
 size_flags_horizontal = 6
 size_flags_vertical = 8
 text = "MUSIC_MANAGER/QUIT"
 
 [node name="Mute" type="CheckButton" parent="Window/VBox/HBoxContainer"]
-offset_right = 236.0
+layout_mode = 2
-offset_bottom = 31.0
 size_flags_horizontal = 10
 text = "MUSIC_MANAGER/MUTE"
 
 [connection signal="finished" from="Music" to="." method="_on_music_finished"]
 [connection signal="timeout" from="EndMusic" to="." method="_on_end_music_timeout"]
 [connection signal="close_requested" from="Window" to="." method="_on_window_close_requested"]
+[connection signal="visibility_changed" from="Window" to="." method="_on_window_visibility_changed"]
 [connection signal="pressed" from="Window/VBox/Tab/Music/HBox/Play" to="." method="_on_play_pressed"]
 [connection signal="pressed" from="Window/VBox/Tab/Music/HBox/Random" to="." method="_on_random_pressed"]
 [connection signal="pressed" from="Window/VBox/Tab/Music/HBox/Reinit" to="." method="_on_reinit_pressed"]
 [connection signal="value_changed" from="Window/VBox/Tab/Mixer/GlobalLevel/global" to="." method="_on_global_value_changed"]
 [connection signal="value_changed" from="Window/VBox/Tab/Mixer/MusicLevel/music" to="." method="_on_music_value_changed"]
 [connection signal="value_changed" from="Window/VBox/Tab/Mixer/EffectLevel/effect" to="." method="_on_effect_value_changed"]
-[connection signal="pressed" from="Window/VBox/HBoxContainer/Button" to="." method="_on_button_pressed"]
+[connection signal="pressed" from="Window/VBox/HBoxContainer/Quit" to="." method="_on_button_pressed"]
 [connection signal="toggled" from="Window/VBox/HBoxContainer/Mute" to="." method="_on_mute_toggled"]

scenes/themes/themes.gd

@@ -47,3 +47,8 @@ func _on_select_item_selected(_index):
 			emit_signal( "update_theme" )
 			return
 		pos += 1
+
+
+func _on_window_visibility_changed():
+	if $Window.visible:
+		$Window/VBoxContainer/Quit.grab_focus()

scenes/themes/themes.tscn

@@ -3,14 +3,18 @@
 [ext_resource type="Script" path="res://scenes/themes/themes.gd" id="1_a1yak"]
 
 [node name="Control" type="Control"]
+layout_mode = 3
+anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
-script = ExtResource( "1_a1yak" )
+script = ExtResource("1_a1yak")
 
 [node name="Window" type="Window" parent="."]
+size = Vector2i(300, 100)
 visible = false
 
 [node name="VBoxContainer" type="VBoxContainer" parent="Window"]
+anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
@@ -18,23 +22,19 @@ grow_vertical = 2
 metadata/_edit_use_custom_anchors = false
 
 [node name="Label" type="Label" parent="Window/VBoxContainer"]
-offset_right = 98.0
+layout_mode = 2
-offset_bottom = 26.0
 text = "Select theme"
 
 [node name="Select" type="OptionButton" parent="Window/VBoxContainer"]
-offset_top = 30.0
+layout_mode = 2
-offset_right = 98.0
-offset_bottom = 61.0
 size_flags_vertical = 3
 
 [node name="Quit" type="Button" parent="Window/VBoxContainer"]
-offset_top = 65.0
+layout_mode = 2
-offset_right = 98.0
-offset_bottom = 96.0
 size_flags_horizontal = 4
 text = "Quit"
 
 [connection signal="close_requested" from="Window" to="." method="_on_quit_pressed"]
+[connection signal="visibility_changed" from="Window" to="." method="_on_window_visibility_changed"]
 [connection signal="item_selected" from="Window/VBoxContainer/Select" to="." method="_on_select_item_selected"]
 [connection signal="pressed" from="Window/VBoxContainer/Quit" to="." method="_on_quit_pressed"]