aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2024-09-27 20:49:11 +0200
committermetamuffin <metamuffin@disroot.org>2024-09-27 20:49:16 +0200
commit6fddd0ebf9346214798fee5f1c26733e55e8056d (patch)
treed9d62aa5e72c34c8fc3014542976fa3bbece711c
parent08b25219a4cb5f54a192780253fddcb66de426e6 (diff)
downloadhurrycurry-6fddd0ebf9346214798fee5f1c26733e55e8056d.tar
hurrycurry-6fddd0ebf9346214798fee5f1c26733e55e8056d.tar.bz2
hurrycurry-6fddd0ebf9346214798fee5f1c26733e55e8056d.tar.zst
disable hover sound for disabled ui; fixes #153
-rw-r--r--client/menu/menu.gd2
-rw-r--r--client/menu/menu_background.tscn1
2 files changed, 1 insertions, 2 deletions
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