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

[#1470] Move component config dialog to center if outside parent's monitor

Browse Source
This commit is contained in:
SiboVG 2022-06-24 00:46:15 +02:00
parent c39003a842
commit 0b7b4d7bc7
2 changed files with 80 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
swing/src/net/sf/openrocket/gui/configdialog/ComponentConfigDialog.java
View File

@ -1,11 +1,15 @@
package net.sf.openrocket.gui.configdialog; package net.sf.openrocket.gui.configdialog;
import java.awt.GraphicsDevice;
import java.awt.GraphicsEnvironment;
import java.awt.Rectangle;
import java.awt.Window; import java.awt.Window;
import java.awt.event.WindowAdapter; import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent; import java.awt.event.WindowEvent;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.swing.JDialog; import javax.swing.JDialog;
@ -13,6 +17,7 @@ import javax.swing.JDialog;
import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.OpenRocketDocument;
import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.gui.util.GUIUtil;
import net.sf.openrocket.gui.util.SwingPreferences; import net.sf.openrocket.gui.util.SwingPreferences;
import net.sf.openrocket.gui.util.WindowLocationUtil;
import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.rocketcomponent.AxialStage; import net.sf.openrocket.rocketcomponent.AxialStage;
import net.sf.openrocket.rocketcomponent.ComponentChangeEvent; import net.sf.openrocket.rocketcomponent.ComponentChangeEvent;
@ -256,6 +261,7 @@ public class ComponentConfigDialog extends JDialog implements ComponentChangeLis
dialog = new ComponentConfigDialog(parent, document, component); dialog = new ComponentConfigDialog(parent, document, component);
dialog.setVisible(true); dialog.setVisible(true);
WindowLocationUtil.moveIfOutsideOfParentMonitor(dialog, parent);
////Modify ////Modify
if (component.getConfigListeners().size() == 0) { if (component.getConfigListeners().size() == 0) {

74
swing/src/net/sf/openrocket/gui/util/WindowLocationUtil.java Normal file
View File

@ -0,0 +1,74 @@
package net.sf.openrocket.gui.util;
import java.awt.GraphicsDevice;
import java.awt.Window;
/**
* Helper class for setting the location of a Swing window. E.g. to check when the window is outside the screen and
* recenter it if so.
*
* @author Sibo Van Gool <sibo.vangool@hotmail.com>
*/
public abstract class WindowLocationUtil {
/**
* Sets the location of the window, but don't go outside the screen.
* @param window the window to move
* @param x the target x position on the screen
* @param y the target y position on the screen
*/
public static void setLocationWithinScreen(Window window, int x, int y) {
java.awt.Dimension screenSize = java.awt.Toolkit.getDefaultToolkit().getScreenSize();
java.awt.Dimension windowSize = window.getSize();
int screenWidth = screenSize.width;
int screenHeight = screenSize.height;
int windowWidth = windowSize.width;
int windowHeight = windowSize.height;
int xPos = x;
int yPos = y;
if (xPos + windowWidth > screenWidth) {
xPos = screenWidth - windowWidth;
}
if (yPos + windowHeight > screenHeight) {
yPos = screenHeight - windowHeight;
}
window.setLocation(xPos, yPos);
}
/**
* Moves the window to the center of the screen if its location is outside the boundary of the screen.
* @param window window to move
*/
public static void moveIfOutsideOfMonitor(Window window) {
GraphicsDevice currentDevice = window.getGraphicsConfiguration().getDevice();
if (currentDevice != null && window.isVisible() &&
!currentDevice.getDefaultConfiguration().getBounds().contains(window.getLocationOnScreen())) {
int width = currentDevice.getDefaultConfiguration().getBounds().width;
int height = currentDevice.getDefaultConfiguration().getBounds().height;
window.setLocation(
((width / 2) - (window.getSize().width / 2)) + currentDevice.getDefaultConfiguration().getBounds().x,
((height / 2) - (window.getSize().height / 2)) + currentDevice.getDefaultConfiguration().getBounds().y
);
}
}
/**
* Moves the window to the center of the screen if it is on another monitor as the parent window, or if its location
* is outside the boundary of the parent's monitor screen.
* @param window window to move
* @param parent parent window
*/
public static void moveIfOutsideOfParentMonitor(Window window, Window parent) {
GraphicsDevice parentDevice = parent.getGraphicsConfiguration().getDevice();
GraphicsDevice currentDevice = window.getGraphicsConfiguration().getDevice();
if (parentDevice != null && (currentDevice == null || currentDevice != parentDevice ||
(window.isVisible() && !parentDevice.getDefaultConfiguration().getBounds().contains(
window.getLocationOnScreen())))) {
int width = parentDevice.getDefaultConfiguration().getBounds().width;
int height = parentDevice.getDefaultConfiguration().getBounds().height;
window.setLocation(
((width / 2) - (window.getSize().width / 2)) + parentDevice.getDefaultConfiguration().getBounds().x,
((height / 2) - (window.getSize().height / 2)) + parentDevice.getDefaultConfiguration().getBounds().y
);
}
}
}