fixed problem with only accidental save because of 1px moving bug, now saved explicitly on enabeling of position save

Author: Jan Schraff

src/main/java/de/doubleslash/keeptime/Main.java

@@ -33,7 +33,6 @@
 import de.doubleslash.keeptime.common.FontProvider;
 import de.doubleslash.keeptime.common.Resources;
 import de.doubleslash.keeptime.common.Resources.RESOURCE;
-import de.doubleslash.keeptime.common.ScreenPosHelper;
 import de.doubleslash.keeptime.controller.Controller;
 import de.doubleslash.keeptime.model.Model;
 import de.doubleslash.keeptime.model.Project;
@@ -43,8 +42,6 @@
 import de.doubleslash.keeptime.viewpopup.GlobalScreenListener;
 import de.doubleslash.keeptime.viewpopup.ViewControllerPopup;
 import javafx.application.Application;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
@@ -244,8 +241,6 @@ private void initialisePopupUI(final Stage primaryStage) throws IOException {
    private void initialiseUI(final Stage primaryStage) throws IOException {
       LOG.debug("Initialising main UI.");
 
-      setupStagePositioning(primaryStage);
-
       // Load root layout from fxml file.
       final FXMLLoader loader = new FXMLLoader();
       loader.setLocation(Resources.getResource(RESOURCE.FXML_VIEW_LAYOUT));
@@ -272,43 +267,6 @@ private void initialiseUI(final Stage primaryStage) throws IOException {
 
    }
 
-   private void setupStagePositioning(final Stage stage) {
-      final ScreenPosHelper positionHelper = new ScreenPosHelper(model.screenSettings.screenHash.get(),
-            model.screenSettings.proportionalX.get(), model.screenSettings.proportionalY.get());
-      positionHelper.resetPositionIfInvalid();
-
-      // set stage to saved Position
-      if (model.screenSettings.saveWindowPosition.get()) {
-         stage.setX(positionHelper.getAbsoluteX());
-         stage.setY(positionHelper.getAbsoluteY());
-      }
-
-      // TODO when activating autoSave while app is running, the current position is only updated by accident -
-      // as when clicking x the stage moves by 1px on x and the listener is triggered. not working when rightclick->exit
-
-      // add listeners to record Windowpositionchange
-      final ChangeListener<Number> positionChangeListener = (final ObservableValue<? extends Number> observable,
-            final Number oldValue, final Number newValue) -> {
-         // don't save if option disabled
-         if (!model.screenSettings.saveWindowPosition.get()) {
-            return;
-         }
-
-         LOG.debug("Stage position changed '{}'/'{}'.", stage.xProperty().doubleValue(),
-               stage.yProperty().doubleValue());
-
-         positionHelper.setAbsoluteX(stage.xProperty().doubleValue());
-         positionHelper.setAbsoluteY(stage.yProperty().doubleValue());
-
-         model.screenSettings.screenHash.set(positionHelper.getScreenHash());
-         model.screenSettings.proportionalX.set(positionHelper.getProportionalX());
-         model.screenSettings.proportionalY.set(positionHelper.getProportionalY());
-      };
-
-      stage.xProperty().addListener(positionChangeListener);
-      stage.yProperty().addListener(positionChangeListener);
-   }
-
    private void registerMinimizeEventlistener(final Scene mainScene, final Stage primaryStage) {
       final KeyCombination keyComb = new KeyCodeCombination(KeyCode.DOWN, KeyCombination.META_DOWN);
       mainScene.addEventFilter(KeyEvent.KEY_RELEASED, keyEvent -> {

src/main/java/de/doubleslash/keeptime/common/ScreenPosHelper.java

@@ -31,6 +31,12 @@ public ScreenPosHelper(final int screenhash, final double proportionalX, final d
       calcAbsolutePosition();
    }
 
+   public ScreenPosHelper(final double absoluteX, final double absoluteY) {
+      this.absoluteX = absoluteX;
+      this.absoluteY = absoluteY;
+      calcProportionalPosition();
+   }
+
    public double getAbsoluteX() {
       return absoluteX;
    }

src/main/java/de/doubleslash/keeptime/view/SettingsController.java

@@ -111,6 +111,9 @@ public class SettingsController {
 
    private Stage aboutStage;
 
+   @Autowired
+   ViewController mainscreen;
+
    @Autowired
    public SettingsController(final Model model, final Controller controller) {
       this.model = model;
@@ -176,6 +179,11 @@ private void initialize() {
             }
          }
 
+         if (saveWindowPositionCheckBox.isSelected()) {
+            // UPDATE POSITION
+            mainscreen.savePosition();
+         }
+
          controller.updateSettings(new Settings(hoverBackgroundColor.getValue(), hoverFontColor.getValue(),
                defaultBackgroundColor.getValue(), defaultFontColor.getValue(), taskBarColor.getValue(),
                useHotkeyCheckBox.isSelected(), displayProjectsRightCheckBox.isSelected(),
@@ -187,7 +195,9 @@ private void initialize() {
       });
 
       LOG.debug("cancelButton.setOnAction");
-      cancelButton.setOnAction(ae -> {
+      cancelButton.setOnAction(ae ->
+
+      {
          LOG.info("Cancel clicked");
          thisStage.close();
       });

src/main/java/de/doubleslash/keeptime/view/ViewController.java

@@ -31,6 +31,7 @@
 import de.doubleslash.keeptime.common.DateFormatter;
 import de.doubleslash.keeptime.common.Resources;
 import de.doubleslash.keeptime.common.Resources.RESOURCE;
+import de.doubleslash.keeptime.common.ScreenPosHelper;
 import de.doubleslash.keeptime.common.StyleUtils;
 import de.doubleslash.keeptime.controller.Controller;
 import de.doubleslash.keeptime.exceptions.FXMLLoaderException;
@@ -46,6 +47,8 @@
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleLongProperty;
 import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
 import javafx.collections.ObservableList;
 import javafx.embed.swing.SwingFXUtils;
 import javafx.event.ActionEvent;
@@ -512,6 +515,7 @@ public void setStage(final Stage primaryStage) {
       this.mainStage = primaryStage;
       this.projectsListViewController = new ProjectsListViewController(model, controller, mainStage,
             availableProjectsListView, searchTextField, false);
+      setupStagePositioning();
    }
 
    @FXML
@@ -527,4 +531,45 @@ public void addNewProject(final ActionEvent ae) {
       result.ifPresent(project -> controller.addNewProject(project));
    }
 
+   private void setupStagePositioning() {
+      final ScreenPosHelper positionHelper = new ScreenPosHelper(model.screenSettings.screenHash.get(),
+            model.screenSettings.proportionalX.get(), model.screenSettings.proportionalY.get());
+      positionHelper.resetPositionIfInvalid();
+
+      // set stage to saved Position
+      if (model.screenSettings.saveWindowPosition.get()) {
+         mainStage.setX(positionHelper.getAbsoluteX());
+         mainStage.setY(positionHelper.getAbsoluteY());
+      }
+
+      // TODO when activating autoSave while app is running, the current position is only updated by accident -
+      // as when clicking x the stage moves by 1px on x and the listener is triggered. not working when rightclick->exit
+
+      // add listeners to record Windowpositionchange
+      final ChangeListener<Number> positionChangeListener = (final ObservableValue<? extends Number> observable,
+            final Number oldValue, final Number newValue) -> {
+         savePosition();
+      };
+
+      mainStage.xProperty().addListener(positionChangeListener);
+      mainStage.yProperty().addListener(positionChangeListener);
+   }
+
+   public void savePosition() {
+      // don't save if option disabled
+      if (!model.screenSettings.saveWindowPosition.get()) {
+         return;
+      }
+
+      LOG.debug("Stage position changed '{}'/'{}'.", mainStage.xProperty().doubleValue(),
+            mainStage.yProperty().doubleValue());
+
+      final ScreenPosHelper positionHelper = new ScreenPosHelper(mainStage.xProperty().doubleValue(),
+            mainStage.yProperty().doubleValue());
+      model.screenSettings.screenHash.set(positionHelper.getScreenHash());
+      model.screenSettings.proportionalX.set(positionHelper.getProportionalX());
+      model.screenSettings.proportionalY.set(positionHelper.getProportionalY());
+
+   }
+
 }