From 6fddd0ebf9346214798fee5f1c26733e55e8056d Mon Sep 17 00:00:00 2001 From: metamuffin Date: Fri, 27 Sep 2024 20:49:11 +0200 Subject: disable hover sound for disabled ui; fixes #153 --- client/menu/menu.gd | 2 +- client/menu/menu_background.tscn | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'client/menu') diff --git a/client/menu/menu.gd b/client/menu/menu.gd index 52a9bd7d..7f4a1fb6 100644 --- a/client/menu/menu.gd +++ b/client/menu/menu.gd @@ -113,7 +113,7 @@ func connect_button_sounds(node: Node): if node is Button or node is TextureButton: if not node.is_in_group("no_click_sound"): node.pressed.connect(Sound.play_click) - if node is Button or node is LineEdit or node is Slider: + if (node is Button and not node.disabled) or (node is LineEdit and node.editable) or node is Slider: node.mouse_entered.connect(Sound.play_hover) for c in node.get_children(): connect_button_sounds(c) diff --git a/client/menu/menu_background.tscn b/client/menu/menu_background.tscn index 26fe102a..19f0d506 100644 --- a/client/menu/menu_background.tscn +++ b/client/menu/menu_background.tscn @@ -69,4 +69,3 @@ mesh = SubResource("QuadMesh_fvp2p") surface_material_override/0 = SubResource("ShaderMaterial_gd87g") [node name="Map" parent="." instance=ExtResource("3_p80a7")] -optimize = false -- cgit v1.2.3-70-g09d2