diff --git a/Dogename/src/main/java/me/lensferno/dogename/controllers/MainInterfaceController.java b/Dogename/src/main/java/me/lensferno/dogename/controllers/MainInterfaceController.java index 0b545fd..6cb3b42 100644 --- a/Dogename/src/main/java/me/lensferno/dogename/controllers/MainInterfaceController.java +++ b/Dogename/src/main/java/me/lensferno/dogename/controllers/MainInterfaceController.java @@ -144,6 +144,7 @@ public final class MainInterfaceController { miniPaneController.setCurrentScene(miniScene); miniPaneController.setListeners(); + miniPaneController.setOldTextProperties(upperLabel.textProperty(), downLabel.textProperty()); miniStage.show(); currentStage.hide(); diff --git a/Dogename/src/main/java/me/lensferno/dogename/controllers/MiniPaneController.java b/Dogename/src/main/java/me/lensferno/dogename/controllers/MiniPaneController.java index c9e40c6..d314289 100644 --- a/Dogename/src/main/java/me/lensferno/dogename/controllers/MiniPaneController.java +++ b/Dogename/src/main/java/me/lensferno/dogename/controllers/MiniPaneController.java @@ -53,9 +53,12 @@ public class MiniPaneController { this.selector.setLabelTexts(chosenNameLabel.textProperty()); } + public void setOldTextProperties(StringProperty ...stringProperty) { + this.oldTextProperties = stringProperty; + } + @FXML void recoverMode(ActionEvent event) { - // todo: 待修复:界面恢复后label无法正常显示名字 this.oldStage.setOnShown((e) -> selector.setLabelTexts(oldTextProperties)); this.oldStage.show(); diff --git a/Dogename/src/main/java/me/lensferno/dogename/select/Selector.java b/Dogename/src/main/java/me/lensferno/dogename/select/Selector.java index b72c91b..6e3788c 100644 --- a/Dogename/src/main/java/me/lensferno/dogename/select/Selector.java +++ b/Dogename/src/main/java/me/lensferno/dogename/select/Selector.java @@ -97,9 +97,7 @@ public final class Selector { } public void setNumberRange() { - int minNumber = Integer.parseInt(GlobalConfig.mainConfig.getMinNumber()); - int maxNumber = Integer.parseInt(GlobalConfig.mainConfig.getMaxNumber()); - coreWorker.setNumberRange(minNumber, maxNumber); + coreWorker.setNumberRange(); } } } diff --git a/Dogename/src/main/java/me/lensferno/dogename/select/core/Worker.java b/Dogename/src/main/java/me/lensferno/dogename/select/core/Worker.java index a5dea72..67d45c2 100644 --- a/Dogename/src/main/java/me/lensferno/dogename/select/core/Worker.java +++ b/Dogename/src/main/java/me/lensferno/dogename/select/core/Worker.java @@ -144,9 +144,9 @@ public final class Worker { return stoppedIndicator; } - public void setNumberRange(int minNumber, int maxNumber) { - this.numberRange[MIN_NUMBER] = minNumber; - this.numberRange[MAX_NUMBER] = maxNumber; + public void setNumberRange() { + this.numberRange[MIN_NUMBER] = Integer.parseInt(GlobalConfig.mainConfig.getMinNumber()); + this.numberRange[MAX_NUMBER] = Integer.parseInt(GlobalConfig.mainConfig.getMaxNumber()); } public void setForceStop(boolean forceStop) {