Skip to content
Snippets Groups Projects
Commit b7b88014 authored by Tobias Ullerich's avatar Tobias Ullerich
Browse files

Add volume slider color to touch mode

parent 3c45deb7
Branches
Tags
No related merge requests found
......@@ -81,9 +81,6 @@ import java.util.Optional;
public class DesktopMenuToolbarViewController extends BasicMenuToolbarViewController
implements EventHandler<ActionEvent>, ChangeListener<DesktopEditMode> {
// TODO Page Buttons gleicher Margin wie pads
// meuBar
@FXML
private MenuBar menuBar;
......@@ -163,7 +160,6 @@ public class DesktopMenuToolbarViewController extends BasicMenuToolbarViewContro
this.connect = connect;
this.connect.editModeProperty().addListener(this);
// Ist Zustand herstellen, indem Listener mit dem Initialen Wert bekannt gemacht wird.
changed(connect.editModeProperty(), null, connect.getEditMode());
initLayoutMenu();
......@@ -228,15 +224,6 @@ public class DesktopMenuToolbarViewController extends BasicMenuToolbarViewContro
iconHbox.getChildren().add(editButtons);
volumeSlider.focusedProperty().addListener(i -> mainViewController.getParent().requestFocus());
volumeSlider.styleProperty().bind(Bindings.createStringBinding(() -> {
double min = volumeSlider.getMin();
double max = volumeSlider.getMax();
double value = volumeSlider.getValue();
return createSliderStyle(min, max, value);
}, volumeSlider.valueProperty()));
}
// Desktop Edit Mode Change Listener --> Update Button
......@@ -795,11 +782,11 @@ public class DesktopMenuToolbarViewController extends BasicMenuToolbarViewContro
if (event.getSource() instanceof Button) {
handlePageButton(event);
} else if (event.getSource() instanceof MenuItem) {
handleMenuItem(event);
handleLastOpenProjectMenuItems(event);
}
}
private void handleMenuItem(ActionEvent event) {
private void handleLastOpenProjectMenuItems(ActionEvent event) {
doAction(() ->
{
// TODO Rewrite mit openProject von BasicMenuToolbarViewController
......
......@@ -7,6 +7,7 @@ import de.tobias.playpad.PlayPadPlugin;
import de.tobias.playpad.project.Project;
import de.tobias.playpad.settings.GlobalSettings;
import de.tobias.playpad.settings.keys.Key;
import javafx.beans.binding.Bindings;
import javafx.event.ActionEvent;
import javafx.event.EventHandler;
import javafx.fxml.FXML;
......@@ -61,6 +62,16 @@ public abstract class BasicMenuToolbarViewController extends MenuToolbarViewCont
volumeSlider.setValue(volumeSlider.getValue() + ev.getDeltaX() * 0.001);
});
volumeSlider.styleProperty().bind(Bindings.createStringBinding(() -> {
double min = volumeSlider.getMin();
double max = volumeSlider.getMax();
double value = volumeSlider.getValue();
return createSliderStyle(min, max, value);
}, volumeSlider.valueProperty()));
FontIcon fontIcon = new FontIcon(FontAwesomeType.EXCLAMATION_TRIANGLE);
fontIcon.getStyleClass().add("pad-notfound");
fontIcon.setSize(20);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment