diff options
| author | 2023-08-30 16:47:29 +0200 | |
|---|---|---|
| committer | 2023-08-30 15:47:29 +0100 | |
| commit | 824e06a941ea37f43bb23b284969194890d4e4a6 (patch) | |
| tree | 397b363dae43cbc750291e4000e42f616df75b2b /enigma-swing | |
| parent | Update GuiController.java (#523) (diff) | |
| download | enigma-fork-824e06a941ea37f43bb23b284969194890d4e4a6.tar.gz enigma-fork-824e06a941ea37f43bb23b284969194890d4e4a6.tar.xz enigma-fork-824e06a941ea37f43bb23b284969194890d4e4a6.zip | |
Save if fullscreen in config (#528)
Diffstat (limited to 'enigma-swing')
| -rw-r--r-- | enigma-swing/src/main/java/cuchaz/enigma/gui/Gui.java | 2 | ||||
| -rw-r--r-- | enigma-swing/src/main/java/cuchaz/enigma/gui/config/UiConfig.java | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/Gui.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/Gui.java index b3117ce..4c108cd 100644 --- a/enigma-swing/src/main/java/cuchaz/enigma/gui/Gui.java +++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/Gui.java | |||
| @@ -217,6 +217,7 @@ public class Gui { | |||
| 217 | frame.addWindowListener(GuiUtil.onWindowClose(e -> this.close())); | 217 | frame.addWindowListener(GuiUtil.onWindowClose(e -> this.close())); |
| 218 | 218 | ||
| 219 | frame.setSize(UiConfig.getWindowSize("Main Window", ScaleUtil.getDimension(1024, 576))); | 219 | frame.setSize(UiConfig.getWindowSize("Main Window", ScaleUtil.getDimension(1024, 576))); |
| 220 | frame.setExtendedState(UiConfig.isFullscreen("Main Window") ? JFrame.MAXIMIZED_BOTH : JFrame.NORMAL); | ||
| 220 | frame.setMinimumSize(ScaleUtil.getDimension(640, 480)); | 221 | frame.setMinimumSize(ScaleUtil.getDimension(640, 480)); |
| 221 | frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); | 222 | frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); |
| 222 | 223 | ||
| @@ -464,6 +465,7 @@ public class Gui { | |||
| 464 | private void exit() { | 465 | private void exit() { |
| 465 | UiConfig.setWindowPos("Main Window", this.mainWindow.frame().getLocationOnScreen()); | 466 | UiConfig.setWindowPos("Main Window", this.mainWindow.frame().getLocationOnScreen()); |
| 466 | UiConfig.setWindowSize("Main Window", this.mainWindow.frame().getSize()); | 467 | UiConfig.setWindowSize("Main Window", this.mainWindow.frame().getSize()); |
| 468 | UiConfig.setFullscreen("Main Window", this.mainWindow.frame().getExtendedState() == JFrame.MAXIMIZED_BOTH); | ||
| 467 | UiConfig.setLayout(this.splitClasses.getDividerLocation(), this.splitCenter.getDividerLocation(), this.splitRight.getDividerLocation(), this.logSplit.getDividerLocation()); | 469 | UiConfig.setLayout(this.splitClasses.getDividerLocation(), this.splitCenter.getDividerLocation(), this.splitRight.getDividerLocation(), this.logSplit.getDividerLocation()); |
| 468 | UiConfig.save(); | 470 | UiConfig.save(); |
| 469 | 471 | ||
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/config/UiConfig.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/config/UiConfig.java index cdf27ca..0d18df7 100644 --- a/enigma-swing/src/main/java/cuchaz/enigma/gui/config/UiConfig.java +++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/config/UiConfig.java | |||
| @@ -333,6 +333,14 @@ public final class UiConfig { | |||
| 333 | section.setInt(String.format("Y %s", screenSize.height), rect.y); | 333 | section.setInt(String.format("Y %s", screenSize.height), rect.y); |
| 334 | } | 334 | } |
| 335 | 335 | ||
| 336 | public static boolean isFullscreen(String window) { | ||
| 337 | return swing.data().section(window).setIfAbsentBool("Fullscreen", false); | ||
| 338 | } | ||
| 339 | |||
| 340 | public static void setFullscreen(String window, boolean fullscreen) { | ||
| 341 | swing.data().section(window).setBool("Fullscreen", fullscreen); | ||
| 342 | } | ||
| 343 | |||
| 336 | public static String getLastSelectedDir() { | 344 | public static String getLastSelectedDir() { |
| 337 | return swing.data().section("File Dialog").getString("Selected").orElse(""); | 345 | return swing.data().section("File Dialog").getString("Selected").orElse(""); |
| 338 | } | 346 | } |