fix: remove Viewtify#size

teletha · Dec 7, 2023 · ea0ea70 · ea0ea70
1 parent 04860cf
commit ea0ea70
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 38 deletions.
diff --git a/src/main/java/viewtify/Viewtify.java b/src/main/java/viewtify/Viewtify.java
@@ -37,8 +37,6 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import com.sun.javafx.application.PlatformImpl;
-
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.binding.DoubleExpression;
@@ -62,11 +60,13 @@
 import javafx.scene.image.Image;
 import javafx.scene.input.KeyCode;
 import javafx.scene.text.Font;
-import javafx.stage.Screen;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.stage.Window;
 import javafx.stage.WindowEvent;
+
+import com.sun.javafx.application.PlatformImpl;
+
 import kiss.Decoder;
 import kiss.Disposable;
 import kiss.Encoder;
@@ -224,12 +224,6 @@ public Thread newThread(Runnable runnable) {
     /** The configurable setting. */
     private String title;
 
-    /** The configurable setting. */
-    private double width;
-
-    /** The configurable setting. */
-    private double height;
-
     /** We must continue to hold the lock object to avoid releasing by GC. */
     @SuppressWarnings("unused")
     private FileLock lock;
@@ -445,24 +439,6 @@ public Viewtify update(String archive) {
         return this;
     }
 
-    /**
-     * Configure application initial size
-     * 
-     * @param width
-     * @param height
-     * @return
-     */
-    public Viewtify size(double width, double height) {
-        if (0 < width) {
-            this.width = width;
-        }
-
-        if (0 < height) {
-            this.height = height;
-        }
-        return this;
-    }
-
     /**
      * Configure application splash screen.
      * 
@@ -532,20 +508,16 @@ public void activate(View application) {
      * 
      * @param application The application {@link View} to activate.
      */
-    private void activate(View application, boolean needOpener) {
+    private void activate(View application, boolean isOperner) {
         boolean canUpdate = I.env("UpdateOnStartup", updateArchive != null);
         boolean needUpdate = canUpdate && Update.isValid(updateArchive);
 
-        View actual = needUpdate ? new Empty() : needOpener ? I.make(opener) : application;
-        mainStage = new Stage(needOpener ? StageStyle.TRANSPARENT : stageStyle);
-        if (!needOpener) {
-            mainStage.setWidth(width != 0 ? width : Screen.getPrimary().getBounds().getWidth() / 2);
-            mainStage.setHeight(height != 0 ? height : Screen.getPrimary().getBounds().getHeight() / 2);
-        }
+        View actual = needUpdate ? new Empty() : isOperner ? I.make(opener) : application;
+        mainStage = new Stage(isOperner ? StageStyle.TRANSPARENT : stageStyle);
         if (needUpdate) mainStage.setOpacity(0);
 
         Scene scene = new Scene((Parent) actual.ui());
-        manage(actual.getClass().getName(), scene, mainStage, false);
+        manage(actual.getClass().getName(), scene, mainStage, true);
 
         // root stage management
         views.add(application);
@@ -558,7 +530,8 @@ private void activate(View application, boolean needOpener) {
             }
         });
 
-        if (needOpener) {
+        if (isOperner) {
+            scene.setFill(null);
             mainStage.setOnHidden(e -> {
                 if (!Terminator.isDisposed()) {
                     opener = null;
@@ -1015,7 +988,7 @@ private static void manage(String id, Scene scene, Stage stage, boolean untracka
         // ================================================================
         I.make(WindowLocator.class).locate(id, stage);
         if (untrackable) {
-            stage.addEventHandler(WindowEvent.WINDOW_CLOSE_REQUEST, e -> {
+            stage.addEventHandler(WindowEvent.WINDOW_HIDDEN, e -> {
                 WindowLocator locator = I.make(WindowLocator.class);
                 if (locator.remove(id) != null) {
                     locator.store();

diff --git a/src/main/java/viewtify/update/Updater.java b/src/main/java/viewtify/update/Updater.java
@@ -11,6 +11,7 @@
 
 import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.stage.WindowEvent;
+
 import kiss.I;
 import kiss.Variable;
 import psychopath.Progress;
@@ -140,6 +141,6 @@ protected void initialize() {
      * @param args
      */
     public static void main(String[] args) {
-        Viewtify.application().title("Updater").size(400, 180).activate(Updater.class);
+        Viewtify.application().title("Updater").activate(Updater.class);
     }
 }