LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-21 05:15:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added [#1130], [#1220] Remembering last used screen (monitor),

Browse Source 
opening dialogs on same screen as the main window,
do not restore window size to larger value that actual screen size

Fixed [#1768], [#1768] Maximizing window on other than main monitor
This commit is contained in:
Jindra Petřík
2023-10-17 20:43:11 +02:00
parent b9a0f15e09
commit 65e612ed6f
10 changed files with 234 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/com/jpexs/decompiler/flash/gui/MainFrameRibbon.java
View File

@@ -25,6 +25,12 @@ import java.awt.Color;
import java.awt.Component;
import java.awt.Container;
import java.awt.Dimension;
import java.awt.Frame;
import java.awt.GraphicsConfiguration;
import java.awt.GraphicsDevice;
import java.awt.Insets;
import java.awt.Rectangle;
import java.awt.Toolkit;
import java.awt.Window;
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
@@ -77,12 +83,17 @@ public final class MainFrameRibbon extends AppRibbonFrame {
int w = Configuration.guiWindowWidth.get();
int h = Configuration.guiWindowHeight.get();
Dimension dim = java.awt.Toolkit.getDefaultToolkit().getScreenSize();
if (w > dim.width) {
w = dim.width;
GraphicsDevice device = View.getMainDefaultScreenDevice();
Rectangle bounds = device.getDefaultConfiguration().getBounds();
Insets insets = Toolkit.getDefaultToolkit().getScreenInsets(device.getDefaultConfiguration());
int maxWidth = bounds.width - (insets.left + insets.right);
int maxHeight = bounds.height - (insets.top + insets.bottom);
if (w > maxWidth) {
w = maxWidth;
}
if (h > dim.height) {
h = dim.height;
if (h > maxHeight) {
h = maxHeight;
}
setSize(w, h);
@@ -95,7 +106,7 @@ public final class MainFrameRibbon extends AppRibbonFrame {
}
if (maximizedVertical) {
state |= JFrame.MAXIMIZED_VERT;
}
}
setExtendedState(state);
View.setWindowIcon(this);
@@ -164,10 +175,30 @@ public final class MainFrameRibbon extends AppRibbonFrame {
}
});
View.centerScreen(this);
View.centerScreenMain(this);
}
@Override
public void setExtendedState(int state) {
if ((state & Frame.MAXIMIZED_BOTH) == Frame.MAXIMIZED_BOTH) {
GraphicsConfiguration gc = View.getWindowDevice(MainFrameRibbon.this.getWindow()).getDefaultConfiguration();
Insets screenInsets = Toolkit.getDefaultToolkit().getScreenInsets(gc);
Rectangle screenBounds = gc.getBounds();
Rectangle maxBounds = new Rectangle(
screenBounds.x + screenInsets.left,
screenBounds.y + screenInsets.top,
screenBounds.width - (screenInsets.left + screenInsets.right),
screenBounds.height - (screenInsets.top + screenInsets.bottom)
);
setMaximizedBounds(maxBounds);
}
super.setExtendedState(state);
}
private static void getApplicationMenuButtons(Component comp, List<JRibbonApplicationMenuButton> ret) {
if (comp instanceof JRibbonApplicationMenuButton) {
ret.add((JRibbonApplicationMenuButton) comp);