Merge pull request #6103 from SJuliez/gui-scaling-fixes

GUI scaling fixes
MegaMek · Oct 15, 2024 · ec3a30f · ec3a30f
2 parents dc04080 + e60ebde
commit ec3a30f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/megamek/src/megamek/client/ui/swing/MegaMekGUI.java b/megamek/src/megamek/client/ui/swing/MegaMekGUI.java
@@ -44,7 +44,6 @@
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
-import javax.swing.SwingUtilities;
 import javax.swing.ToolTipManager;
 import javax.swing.UIManager;
 import javax.swing.filechooser.FileFilter;
@@ -1202,22 +1201,9 @@ public static void updateGuiScaling() {
  private static void setLookAndFeel() {
  try {
  UIManager.setLookAndFeel(GUIPreferences.getInstance().getUITheme());
- updateAfterUiChange();
+ UIUtil.updateAfterUiChange();
  } catch (Exception ex) {
  logger.error("setLookAndFeel() Exception", ex);
  }
  }
-
- /**
- * Updates all existing windows and frames. Use after a gui scale change or look-and-feel change.
- */
- public static void updateAfterUiChange() {
- for (Window window : Window.getWindows()) {
- SwingUtilities.updateComponentTreeUI(window);
- window.invalidate();
- window.validate();
- window.pack();
- window.repaint();
- }
- }
 }
diff --git a/megamek/src/megamek/client/ui/swing/util/UIUtil.java b/megamek/src/megamek/client/ui/swing/util/UIUtil.java
@@ -647,6 +647,18 @@ public static void setHighQualityRendering(Graphics graph) {
  }
  }
 
+ /**
+ * Updates all existing windows and frames. Use after a gui scale change or look-and-feel change.
+ */
+ public static void updateAfterUiChange() {
+ for (Window window : Window.getWindows()) {
+ SwingUtilities.updateComponentTreeUI(window);
+ window.invalidate();
+ window.validate();
+ window.repaint();
+ }
+ }
+
  /** A specialized panel for the header of a section. */
  public static class Header extends JPanel {
  private static final long serialVersionUID = -6235772150005269143L;