ウィンドウのポジションがマイナスになることは普通にある

diff --git a/frontend/src/yukihane/inqubus/Config.java b/frontend/src/yukihane/inqubus/Config.java
index bbbf0bc..69bd093 100644 (file)
--- a/frontend/src/yukihane/inqubus/Config.java
+++ b/frontend/src/yukihane/inqubus/Config.java
@@ -516,7 +516,7 @@ public enum Config {
 
     private static final String SYSTEM_WINDOW_POS_X = "system.window.posx";
     public int getSystemWindowPosX() {
 
     private static final String SYSTEM_WINDOW_POS_X = "system.window.posx";
     public int getSystemWindowPosX() {

-       return config.getInt(SYSTEM_WINDOW_POS_X, -1);
+       return config.getInt(SYSTEM_WINDOW_POS_X, Integer.MIN_VALUE);

     }
 
     public void setSystemWindowPosX(int s) {
     }
 
     public void setSystemWindowPosX(int s) {


@@ -525,7 +525,7 @@ public enum Config {
 
     private static final String SYSTEM_WINDOW_POS_Y = "system.window.posy";
     public int getSystemWindowPosY() {
 
     private static final String SYSTEM_WINDOW_POS_Y = "system.window.posy";
     public int getSystemWindowPosY() {

-       return config.getInt(SYSTEM_WINDOW_POS_Y, -1);
+       return config.getInt(SYSTEM_WINDOW_POS_Y, Integer.MIN_VALUE);

     }
 
     public void setSystemWindowPosY(int s) {
     }
 
     public void setSystemWindowPosY(int s) {

diff --git a/frontend/src/yukihane/inqubus/gui/MainFrame.java b/frontend/src/yukihane/inqubus/gui/MainFrame.java
index 0ad9888..316b2d1 100644 (file)
--- a/frontend/src/yukihane/inqubus/gui/MainFrame.java
+++ b/frontend/src/yukihane/inqubus/gui/MainFrame.java
@@ -504,9 +504,10 @@ public class MainFrame extends JFrame {
             setSize(windowWidth, windowHeight);
         }
 
             setSize(windowWidth, windowHeight);
         }
 

+        // TODO 最大化した状態で終了した場合の考慮

         final int windowPosX = p.getSystemWindowPosX();
         final int windowPosY = p.getSystemWindowPosY();
         final int windowPosX = p.getSystemWindowPosX();
         final int windowPosY = p.getSystemWindowPosY();

-        if (windowPosX > 0 && windowPosY > 0) {
+        if (windowPosX > 1024 && windowPosY > 1024) {

             setLocation(windowPosX, windowPosY);
         } else {
             setLocationByPlatform(true);
             setLocation(windowPosX, windowPosY);
         } else {
             setLocationByPlatform(true);