corrections, comments

MegaMek · Dec 28, 2023 · ab178ac · ab178ac
1 parent 1528ef0
commit ab178ac
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/megameklab/src/megameklab/ui/MegaMekLabMainUI.java b/megameklab/src/megameklab/ui/MegaMekLabMainUI.java
@@ -50,9 +50,9 @@ protected void finishSetup() {
     protected void setSizeAndLocation() {
         pack();
         restrictToScrenSize();
+        setLocationRelativeTo(null);
         CConfig.getMainUiWindowSize(this).ifPresent(this::setSize);
         CConfig.getMainUiWindowPosition(this).ifPresent(this::setLocation);
-        setLocationRelativeTo(null);
     }
 
     private void restrictToScrenSize() {

diff --git a/megameklab/src/megameklab/ui/MenuBarOwner.java b/megameklab/src/megameklab/ui/MenuBarOwner.java
@@ -22,6 +22,7 @@
 import megamek.common.annotations.Nullable;
 import megameklab.ui.dialog.UiLoader;
 import megameklab.ui.util.AppCloser;
+import megameklab.util.CConfig;
 
 import javax.swing.*;
 
@@ -91,6 +92,11 @@ default void newUnit(long type, boolean primitive) {
         if (safetyPrompt()) {
             getFrame().setVisible(false);
             getFrame().dispose();
+            CConfig.setParam(CConfig.GUI_FULLSCREEN, Integer.toString(getFrame().getExtendedState()));
+            if (this instanceof MegaMekLabMainUI) {
+                CConfig.writeMainUiWindowSettings((MegaMekLabMainUI) this);
+            }
+            CConfig.saveConfig();
             UiLoader.loadUi(type, primitive, false);
         }
     }

diff --git a/megameklab/src/megameklab/ui/StartupGUI.java b/megameklab/src/megameklab/ui/StartupGUI.java
@@ -260,7 +260,6 @@ public static void selectAndLoadUnitFromCache(MenuBarOwner previousFrame) {
         viewer.setVisible(false);
         viewer.dispose();
 
-
         if ((newUnit == null) || !previousFrame.safetyPrompt()) {
             return;
         }
-Original file line number
+Diff line change
@@ Expand Up @@
             viewer.setVisible(false);
             viewer.dispose();
             if ((newUnit == null) || !previousFrame.safetyPrompt()) {
                 return;
             }
@@ Expand Down @@