From 91a0fe1cd90d4297997879fce496178b056a8a0a Mon Sep 17 00:00:00 2001 From: tobias <tobias@thecodedev.de> Date: Fri, 20 Sep 2019 20:13:51 +0200 Subject: [PATCH] Activate select midi mapping on settings close --- .../option/profile/MappingTabViewController.java | 8 +++++++- .../de/tobias/playpad/action/feedback/ColorAdjuster.java | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/profile/MappingTabViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/profile/MappingTabViewController.java index a5d3cc9e..80772711 100644 --- a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/profile/MappingTabViewController.java +++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/profile/MappingTabViewController.java @@ -105,6 +105,11 @@ public class MappingTabViewController extends ProfileSettingsTabViewController i mappingComboBox.getSelectionModel().selectedItemProperty().addListener((a, b, c) -> { Profile.currentProfile().getMappings().setActiveMapping(c); + Mapping.setCurrentMapping(c); + + Midi.getInstance().clearFeedback(); + Midi.getInstance().showFeedback(); + createTreeViewContent(); }); @@ -359,6 +364,7 @@ public class MappingTabViewController extends ProfileSettingsTabViewController i { mappingComboBox.getItems().add(preset); mappingComboBox.getSelectionModel().select(preset); + mappingDeleteButton.setDisable(mappingList.count() == 1); // Rename preset if name already esists @@ -403,13 +409,13 @@ public class MappingTabViewController extends ProfileSettingsTabViewController i profileSettings.setLightMode(lightModeComboBox.getValue()); // Adjust midi color - final MidiFeedbackTranscript transcript = Midi.getInstance().getFeedbackTranscript(); if (transcript == null) { return; } + // Change light mode Mapping.getCurrentMapping().getActions().forEach(action -> action.getKeysForType(MidiKey.class).forEach(key -> Stream.of(FeedbackType.values()).forEach(type -> { diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/action/feedback/ColorAdjuster.java b/PlayWallCore/src/main/java/de/tobias/playpad/action/feedback/ColorAdjuster.java index 5d1eded5..43b68616 100644 --- a/PlayWallCore/src/main/java/de/tobias/playpad/action/feedback/ColorAdjuster.java +++ b/PlayWallCore/src/main/java/de/tobias/playpad/action/feedback/ColorAdjuster.java @@ -73,7 +73,7 @@ public class ColorAdjuster { Color layoutEvColor = null; FeedbackDesignColorSuggester design; - if (pad.getPadSettings().isCustomDesign()) { + if (pad != null && pad.getPadSettings().isCustomDesign()) { design = pad.getPadSettings().getDesign(); } else { design = Profile.currentProfile().getProfileSettings().getDesign(); -- GitLab