LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-10 17:53:58 +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

10
CHANGELOG.md
View File

@@ -2,6 +2,13 @@
All notable changes to this project will be documented in this file.
## [Unreleased]
### Added
- [#1130], [#1220] Remembering last used screen (monitor),
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
## [19.1.2] - 2023-10-16
### Fixed
@@ -3182,6 +3189,9 @@ Major version of SWF to XML export changed to 2.
[alpha 9]: https://github.com/jindrapetrik/jpexs-decompiler/compare/alpha8...alpha9
[alpha 8]: https://github.com/jindrapetrik/jpexs-decompiler/compare/alpha7...alpha8
[alpha 7]: https://github.com/jindrapetrik/jpexs-decompiler/releases/tag/alpha7
[#1130]: https://www.free-decompiler.com/flash/issues/1130
[#1220]: https://www.free-decompiler.com/flash/issues/1220
[#1768]: https://www.free-decompiler.com/flash/issues/1768
[#2099]: https://www.free-decompiler.com/flash/issues/2099
[#2090]: https://www.free-decompiler.com/flash/issues/2090
[#2079]: https://www.free-decompiler.com/flash/issues/2079

24
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
View File

@@ -936,6 +936,30 @@ public final class Configuration {
@ConfigurationInternal
public static ConfigurationItem<Double> guiActionDocsSplitPaneDividerLocationPercent = null;
@ConfigurationDefaultBoolean(true)
@ConfigurationCategory("ui")
public static ConfigurationItem<Boolean> rememberLastScreen = null;
@ConfigurationDefaultInt(-1)
@ConfigurationInternal
public static ConfigurationItem<Integer> lastMainWindowScreenIndex = null;
@ConfigurationDefaultInt(-1)
@ConfigurationInternal
public static ConfigurationItem<Integer> lastMainWindowScreenX = null;
@ConfigurationDefaultInt(-1)
@ConfigurationInternal
public static ConfigurationItem<Integer> lastMainWindowScreenY = null;
@ConfigurationDefaultInt(-1)
@ConfigurationInternal
public static ConfigurationItem<Integer> lastMainWindowScreenWidth = null;
@ConfigurationDefaultInt(-1)
@ConfigurationInternal
public static ConfigurationItem<Integer> lastMainWindowScreenHeight = null;
private enum OSId {
WINDOWS, OSX, UNIX
}

2
src/com/jpexs/decompiler/flash/gui/ErrorLogFrame.java
View File

@@ -116,7 +116,7 @@ public class ErrorLogFrame extends AppFrame {
if (View.isOceanic()) {
setBackground(Color.white);
}
View.centerScreen(this);
View.centerScreenMain(this);
View.setWindowIcon(this);
setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
Container cnt = getContentPane();

2
src/com/jpexs/decompiler/flash/gui/LoadingDialog.java
View File

@@ -109,7 +109,7 @@ public class LoadingDialog extends AppDialog {
pack();
Dimension siz = getSize();
setSize(Math.max(300, 150 + getFontMetrics(new JLabel().getFont()).stringWidth(translate("loadingpleasewait"))), siz.height);
View.centerScreen(this);
View.centerScreenMain(this);
}
@Override

1
src/com/jpexs/decompiler/flash/gui/Main.java
View File

@@ -2935,6 +2935,7 @@ public class Main {
}
public static void exit() {
View.saveScreen();
if (mainFrame != null && mainFrame.getPanel() != null) {
mainFrame.getPanel().scrollPosStorage.saveScrollPos(mainFrame.getPanel().getCurrentTree().getCurrentTreeItem());
mainFrame.getPanel().savePins();

21
src/com/jpexs/decompiler/flash/gui/MainFrameClassic.java
View File

@@ -22,6 +22,10 @@ import com.jpexs.helpers.Helper;
import java.awt.BorderLayout;
import java.awt.Container;
import java.awt.Dimension;
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;
@@ -63,12 +67,17 @@ public final class MainFrameClassic extends AppFrame implements MainFrame {
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);
@@ -116,7 +125,7 @@ public final class MainFrameClassic extends AppFrame implements MainFrame {
cnt.setLayout(new BorderLayout());
cnt.add(panel);
View.centerScreen(this);
View.centerScreenMain(this);
}
@Override

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);

132
src/com/jpexs/decompiler/flash/gui/View.java
View File

@@ -46,6 +46,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -339,53 +340,132 @@ public class View {
}
}
public static void centerScreenMain(Window f) {
centerScreen(f, true);
}
/**
* Centers specified frame on the screen
*
* @param f Frame to center on the screen
*/
public static void centerScreen(Window f) {
centerScreen(f, 0); // todo, set screen to the currently active screen instead of the first screen in a multi screen setup, (maybe by using the screen where the main window is now classic or ribbon?)
centerScreen(f, false);
}
public static void centerScreen(Window f, int screen) {
GraphicsDevice[] allDevices = getEnv().getScreenDevices();
public static void centerScreen(Window f, boolean mainWindow) {
int topLeftX;
int topLeftY;
int screenX;
int screenY;
int windowPosX;
int windowPosY;
GraphicsDevice device;
if (screen < allDevices.length && screen > -1) {
topLeftX = allDevices[screen].getDefaultConfiguration().getBounds().x;
topLeftY = allDevices[screen].getDefaultConfiguration().getBounds().y;
screenX = allDevices[screen].getDefaultConfiguration().getBounds().width;
screenY = allDevices[screen].getDefaultConfiguration().getBounds().height;
Insets bounds = Toolkit.getDefaultToolkit().getScreenInsets(allDevices[screen].getDefaultConfiguration());
screenX = screenX - bounds.right;
screenY = screenY - bounds.bottom;
if (mainWindow || Main.getMainFrame() == null) {
device = getMainDefaultScreenDevice();
} else {
topLeftX = allDevices[0].getDefaultConfiguration().getBounds().x;
topLeftY = allDevices[0].getDefaultConfiguration().getBounds().y;
screenX = allDevices[0].getDefaultConfiguration().getBounds().width;
screenY = allDevices[0].getDefaultConfiguration().getBounds().height;
Insets bounds = Toolkit.getDefaultToolkit().getScreenInsets(allDevices[0].getDefaultConfiguration());
screenX = screenX - bounds.right;
screenY = screenY - bounds.bottom;
device = getWindowDevice(Main.getMainFrame().getWindow());
}
topLeftX = device.getDefaultConfiguration().getBounds().x;
topLeftY = device.getDefaultConfiguration().getBounds().y;
screenX = device.getDefaultConfiguration().getBounds().width;
screenY = device.getDefaultConfiguration().getBounds().height;
Insets bounds = Toolkit.getDefaultToolkit().getScreenInsets(device.getDefaultConfiguration());
screenX = screenX - bounds.right;
screenY = screenY - bounds.bottom;
windowPosX = ((screenX - f.getWidth()) / 2) + topLeftX;
windowPosY = ((screenY - f.getHeight()) / 2) + topLeftY;
f.setLocation(windowPosX, windowPosY);
}
public static void saveScreen() {
MainFrame mainFrame = Main.getMainFrame();
if (mainFrame == null) {
return;
}
Window w = mainFrame.getWindow();
if (w == null) {
return;
}
GraphicsDevice device = getWindowDevice(w);
GraphicsDevice[] allDevices = getEnv().getScreenDevices();
int deviceIndex = -1;
for (int i = 0; i < allDevices.length; i++) {
if (allDevices[i] == device) {
deviceIndex = i;
break;
}
}
if (deviceIndex != -1) {
Configuration.lastMainWindowScreenIndex.set(deviceIndex);
Rectangle bounds = device.getDefaultConfiguration().getBounds();
Configuration.lastMainWindowScreenX.set(bounds.x);
Configuration.lastMainWindowScreenY.set(bounds.y);
Configuration.lastMainWindowScreenWidth.set(bounds.width);
Configuration.lastMainWindowScreenHeight.set(bounds.height);
}
}
public static GraphicsDevice getMainDefaultScreenDevice() {
if (!Configuration.rememberLastScreen.get()) {
return getEnv().getDefaultScreenDevice();
}
int deviceIndex = Configuration.lastMainWindowScreenIndex.get();
GraphicsDevice[] allDevices = getEnv().getScreenDevices();
if (deviceIndex >= allDevices.length || deviceIndex == -1) {
return getEnv().getDefaultScreenDevice();
}
Rectangle expectedBounds = allDevices[deviceIndex].getDefaultConfiguration().getBounds();
if (Configuration.lastMainWindowScreenX.get() != expectedBounds.x
|| Configuration.lastMainWindowScreenY.get() != expectedBounds.y
|| Configuration.lastMainWindowScreenWidth.get() != expectedBounds.width
|| Configuration.lastMainWindowScreenHeight.get() != expectedBounds.height) {
return getEnv().getDefaultScreenDevice();
}
return allDevices[deviceIndex];
}
public static int getWindowDeviceIndex(Window window) {
GraphicsDevice device = getWindowDevice(window);
GraphicsDevice[] allDevices = getEnv().getScreenDevices();
for (int i = 0; i < allDevices.length; i++) {
if (allDevices[i] == device) {
return i;
}
}
return -1;
}
public static GraphicsDevice getWindowDevice(Window window) {
Rectangle bounds = window.getBounds();
return Arrays.asList(GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices()).stream()
// pick devices where window located
.filter(d -> d.getDefaultConfiguration().getBounds().intersects(bounds))
// sort by biggest intersection square
.sorted((f, s) -> Long.compare(//
square(f.getDefaultConfiguration().getBounds().intersection(bounds)),
square(s.getDefaultConfiguration().getBounds().intersection(bounds))))
// use one with the biggest part of the window
.reduce((f, s) -> s) //
// fallback to default device
.orElse(window.getGraphicsConfiguration().getDevice());
}
private static long square(Rectangle rec) {
return Math.abs(rec.width * rec.height);
}
public static ImageIcon getIcon(String name, int size) {
ImageIcon icon = getIcon(getPrefferedIconName(name, size));
if (icon.getIconWidth() == size && icon.getIconHeight() == size) {
@@ -512,8 +592,6 @@ public class View {
return expandedNodes;
}
private static TreePath expandTreeNode(JTree tree, List<String> pathAsStringList) {
TreePath tp = getTreePathByPathStrings(tree, pathAsStringList);
tree.expandPath(tp);
@@ -563,7 +641,7 @@ public class View {
TreePath tp = new TreePath(path.toArray(new Object[path.size()]));
return tp;
}
public static void expandTreeNodes(JTree tree, List<List<String>> pathsToExpand) {
for (List<String> pathAsStringList : pathsToExpand) {
expandTreeNode(tree, pathAsStringList);

19
src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties
View File

@@ -715,3 +715,22 @@ config.description.displayAs12PCodeDocsPanel = Show panel with documentation of
config.name.gui.action.splitPane.docs.dividerLocationPercent = (Internal) AS 1/2 splitPanedocsdividerLocationPercent
config.description.action.avm2.splitPane.docs.dividerLocationPercent = AS 1/2 splitPane docs divider Location Percent
#after 19.1.2
config.name.rememberLastScreen = Remember last used screen (on multiple monitors)
config.description.rememberLastScreen = Remember last used screen on configuration with multiple screen devices (monitors)
config.name.lastMainWindowScreenIndex = Last main window screen index
config.description.lastMainWindowScreenIndex = Last main window screen index
config.name.lastMainWindowScreenX = Last main window screen X
config.description.lastMainWindowScreenX = Last main window screen X coordinate
config.name.lastMainWindowScreenY = Last main window screen Y
config.description.lastMainWindowScreenY = Last main window screen Y coordinate
config.name.lastMainWindowScreenWidth = Last main window screen width
config.description.lastMainWindowScreenWidth = Last main window screen width
config.name.lastMainWindowScreenHeight = Last main window screen width
config.description.lastMainWindowScreenHeight = Last main window screen width

20
src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_cs.properties
View File

@@ -704,3 +704,23 @@ config.description.displayAs12PCodeDocsPanel = Zobraz\u00ed panel s dokumentac\u
config.name.gui.action.splitPane.docs.dividerLocationPercent = (Internal) AS 1/2 splitPanedocsdividerLocationPercent
config.description.gui.action.splitPane.docs.dividerLocationPercent = AS 1/2 pozice v procentech um\u00edst\u011bn\u00ed dokumenta\u010dn\u00edho splitPane
#after 19.1.2
config.name.rememberLastScreen = Pamatovat si naposledy pou\u017eitou obrazovku (p\u0159i v\u00edce monitorech)
config.description.rememberLastScreen = Pamatovat si naposledy pou\u017eitou obrazovku na konfigurac\u00edch s v\u00edce zobrazovac\u00edmi za\u0159\u00edzen\u00edmi (monitory)
config.name.lastMainWindowScreenIndex = Posledn\u00ed index obrazovky hlavn\u00edho okna
config.description.lastMainWindowScreenIndex = Posledn\u00ed index obrazovky hlavn\u00edho okna
config.name.lastMainWindowScreenX = Posledn\u00ed X obrazovky hlavn\u00edho okna
config.description.lastMainWindowScreenX = Posledn\u00ed Xov\u00e1 sou\u0159adn\u00edce obrazovky hlavn\u00edho okna
config.name.lastMainWindowScreenY = Posledn\u00ed Y obrazovky hlavn\u00edho okna
config.description.lastMainWindowScreenY = Posledn\u00ed Yov\u00e1 sou\u0159adn\u00edce obrazovky hlavn\u00edho okna
config.name.lastMainWindowScreenWidth = Posledn\u00ed \u0161\u00ed\u0159ka obrazovky hlavn\u00edho okna
config.description.lastMainWindowScreenWidth = Posledn\u00ed \u0161\u00ed\u0159ka obrazovky hlavn\u00edho okna
config.name.lastMainWindowScreenHeight = Posledn\u00ed v\u00fd\u0161ka obrazovky hlavn\u00edho okna
config.description.lastMainWindowScreenHeight = Posledn\u00ed v\u00fd\u0161ka obrazovky hlavn\u00edho okna