hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2170 from SiboVG/issue-2141

Browse Source 
[#2141] Reset window position if out-of-screen
This commit is contained in:
Sibo Van Gool 2023-04-12 22:06:21 +02:00 committed by GitHub
commit fda805038b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
swing/src/net/sf/openrocket/gui/util/SwingPreferences.java
View File

@ -2,7 +2,11 @@ package net.sf.openrocket.gui.util;
import java.awt.Color; import java.awt.Color;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.GraphicsConfiguration;
import java.awt.GraphicsDevice;
import java.awt.GraphicsEnvironment;
import java.awt.Point; import java.awt.Point;
import java.awt.Rectangle;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -462,7 +466,14 @@ public class SwingPreferences extends net.sf.openrocket.startup.Preferences {
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
return null; return null;
} }
return new Point(x, y);
// If position was on a screen that is not available anymore
Point p = new Point(x, y);
if (!isPointOnScreen(p)) {
return null;
}
return p;
} }
public void setWindowPosition(Class<?> c, Point p) { public void setWindowPosition(Class<?> c, Point p) {
@ -470,6 +481,25 @@ public class SwingPreferences extends net.sf.openrocket.startup.Preferences {
storeVersion(); storeVersion();
} }
/**
* Checks whether the point is present on any of the current monitor screens.
* Can return false if point was e.g. referenced on a secondary monitor that doesn't exist anymore.
* @param p point to check
* @return true if point is present on any of the current screens, false otherwise
*/
private boolean isPointOnScreen(Point p) {
GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
GraphicsDevice[] screens = ge.getScreenDevices();
for (GraphicsDevice screen : screens) {
GraphicsConfiguration gc = screen.getDefaultConfiguration();
Rectangle bounds = gc.getBounds();
if (bounds.contains(p)) {
return true;
}
}
return false;
}