skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Java Client: Fix window restore after close to background in Windows

Browse Source
This commit is contained in:
Michael Ziminsky (Z) 2018-10-29 13:27:20 -07:00
parent e9ad781ebe
commit 8300d48b66
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/MasterPassword.java
View File

@ -91,9 +91,9 @@ public final class MasterPassword {
frame.setAlwaysOnTop( true );
frame.setVisible( true );
frame.setExtendedState( Frame.NORMAL );
Platform.get().requestForeground();
frame.setAlwaysOnTop( false );
frame.restore();
} );
}

6
platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/util/platform/JDK9Platform.java
View File

@ -65,8 +65,10 @@ public class JDK9Platform implements IPlatform {
@Override
public boolean requestForeground() {
desktop.requestForeground( true );
return true;
final boolean supported = desktop.isSupported(Desktop.Action.APP_REQUEST_FOREGROUND);
if (supported)
desktop.requestForeground( true );
return supported;
}
@Override

18
platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/view/MasterPasswordFrame.java
View File

@ -38,6 +38,17 @@ public class MasterPasswordFrame extends JFrame {
userPanel.add( userContent.getUserToolbar(), BorderLayout.LINE_START );
userPanel.add( userContent.getSiteToolbar(), BorderLayout.LINE_END );
restore();
final WindowHandler windowHandler = new WindowHandler();
addWindowListener(windowHandler);
addWindowStateListener(windowHandler);
KeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventDispatcher(windowHandler);
addComponentListener(new ResizeHandler());
setDefaultCloseOperation(DISPOSE_ON_CLOSE);
}
public void restore() {
final MPGuiConfig config = MPGuiConfig.get();
if (config.getWindowSize() != null) {
@ -58,13 +69,6 @@ public class MasterPasswordFrame extends JFrame {
if (config.getWindowMaximized())
setExtendedState(MAXIMIZED_BOTH);
final WindowHandler windowHandler = new WindowHandler();
addWindowListener(windowHandler);
addWindowStateListener(windowHandler);
KeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventDispatcher(windowHandler);
addComponentListener(new ResizeHandler());
setDefaultCloseOperation(DISPOSE_ON_CLOSE);
}