From 6724e7bfb1cca3388b1e008a7fda3bf6a8f907be Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Wed, 22 Dec 2021 21:20:35 +0100
Subject: [PATCH] Do not add new mapping on cancel input dialog
---
.../profile/MappingTabViewController.java | 21 +++++++++++--------
1 file changed, 12 insertions(+), 9 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 e6453ef1..c783b375 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
@@ -337,18 +337,21 @@ public class MappingTabViewController extends ProfileSettingsTabViewController i
TextInputDialog dialog = new TextInputDialog();
dialog.initModality(Modality.WINDOW_MODAL);
dialog.initOwner(getContainingWindow());
- dialog.setHeaderText("Umbenennen");
+ dialog.setHeaderText("Name");
dialog.setContentText("Geben Sie einen Namen für das Mapping Profil ein."); // TODO Localize
- dialog.showAndWait().filter(s -> !s.isEmpty()).ifPresent(preset::setName);
+ dialog.showAndWait().filter(s -> !s.isEmpty()).ifPresent(name -> {
+ preset.setName(name);
- final MappingCollection mappings = Profile.currentProfile().getMappings();
- mappings.addMapping(preset);
- mappingComboBox.getItems().add(preset);
- mappingComboBox.getSelectionModel().select(preset);
+ final MappingCollection mappings = Profile.currentProfile().getMappings();
+ mappings.addMapping(preset);
+ mappingComboBox.getItems().add(preset);
+ mappingComboBox.getSelectionModel().select(preset);
+
+ if (mappings.count() > 1) {
+ mappingDeleteButton.setDisable(false);
+ }
+ });
- if (mappings.count() > 1) {
- mappingDeleteButton.setDisable(false);
- }
}
@SuppressWarnings("Duplicates")
--
GitLab