From 4dbc4997a020e7ed396af18635eb6b9e1e4f19b1 Mon Sep 17 00:00:00 2001 From: michiel Date: Tue, 2 Dec 2025 11:51:00 +0100 Subject: [PATCH] added back button sounds because SOMEONE fucked it up..... --- .../java/org/toop/app/widget/Primitive.java | 38 ++++++++++++++----- .../toop/app/widget/complex/ToggleWidget.java | 7 +++- 2 files changed, 33 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/org/toop/app/widget/Primitive.java b/app/src/main/java/org/toop/app/widget/Primitive.java index a50e4e4..451aebe 100644 --- a/app/src/main/java/org/toop/app/widget/Primitive.java +++ b/app/src/main/java/org/toop/app/widget/Primitive.java @@ -1,6 +1,8 @@ package org.toop.app.widget; import javafx.scene.image.ImageView; +import org.toop.framework.audio.events.AudioEvents; +import org.toop.framework.eventbus.EventFlow; import org.toop.framework.resource.resources.ImageAsset; import org.toop.local.AppContext; @@ -73,8 +75,11 @@ public final class Primitive { } if (onAction != null) { - button.setOnAction(_ -> - onAction.run()); + button.setOnAction(_ -> { + onAction.run(); + playButtonSound(); + System.out.println("HI I got called button"); + }); } return button; @@ -115,12 +120,18 @@ public final class Primitive { slider.setMax(max); slider.setValue(value); - if (onValueChanged != null) { - slider.valueProperty().addListener((_, _, newValue) -> - onValueChanged.accept(newValue.intValue())); - } + if (onValueChanged != null) { + slider.valueProperty().addListener((_, _, newValue) -> { + onValueChanged.accept(newValue.intValue()); + }); + } - return slider; + slider.setOnMouseReleased(event -> { + playButtonSound(); + System.out.println("I got called!"); + }); + + return slider; } @SafeVarargs @@ -137,9 +148,12 @@ public final class Primitive { } if (onValueChanged != null) { - choice.valueProperty().addListener((_, _, newValue) -> - onValueChanged.accept(newValue)); - } + choice.valueProperty().addListener((_, _, newValue) -> { + onValueChanged.accept(newValue); + playButtonSound(); + System.out.println("hi i got called choice"); + }); + } choice.setItems(FXCollections.observableArrayList(items)); @@ -191,4 +205,8 @@ public final class Primitive { return vbox; } + + private static void playButtonSound() { + new EventFlow().addPostEvent(new AudioEvents.ClickButton()).postEvent(); + } } \ No newline at end of file diff --git a/app/src/main/java/org/toop/app/widget/complex/ToggleWidget.java b/app/src/main/java/org/toop/app/widget/complex/ToggleWidget.java index 67f338c..1ffe419 100644 --- a/app/src/main/java/org/toop/app/widget/complex/ToggleWidget.java +++ b/app/src/main/java/org/toop/app/widget/complex/ToggleWidget.java @@ -2,6 +2,8 @@ package org.toop.app.widget.complex; import org.toop.app.widget.Primitive; import org.toop.app.widget.Widget; +import org.toop.framework.audio.events.AudioEvents; +import org.toop.framework.eventbus.EventFlow; import org.toop.local.AppContext; import java.util.function.Consumer; @@ -29,8 +31,9 @@ public class ToggleWidget implements Widget { state = !state; updateText(); if (onToggle != null) { - onToggle.accept(state); - } + onToggle.accept(state); + new EventFlow().addPostEvent(new AudioEvents.ClickButton()).postEvent(); // TODO FIX PRIMITIVES + } }); container = Primitive.vbox(button);