Fix window scaling when JDA is resized

Author: rcx

src/main/java/the/bytecode/club/jda/gui/FileNavigationPane.java

@@ -157,7 +157,7 @@ else if (ke.getKeyCode() == KeyEvent.VK_ESCAPE)
 
     public FileNavigationPane(final FileChangeNotifier fcn)
     {
-        super("ClassNavigation", "File Navigator", Resources.fileNavigatorIcon);
+        super("ClassNavigation", "File Navigator", Resources.fileNavigatorIcon, (MainViewerGUI) fcn);
 
         this.fcn = fcn;
         tree.setRootVisible(false);

src/main/java/the/bytecode/club/jda/gui/JDAWindow.java

@@ -23,26 +23,36 @@ public abstract class JDAWindow extends JInternalFrame implements FileChangeNoti
     private String windowId;
 
     public Point unmaximizedPos;
-    public Dimension unmaximizedSize;
+    public Dimension unmaximizedSize; // unmaximized size for when JDA is maximized
+    public Dimension smallUnmaxSize; // unmaximized size for when JDA is unmaximized
 
-    public JDAWindow(final String id, final String title, final Icon icon)
+    protected final MainViewerGUI viewer;
+
+    public JDAWindow(final String id, final String title, final Icon icon, final MainViewerGUI viewer)
     {
         super(title, true, true, true, true);
         windowId = id;
         setName(title);
         setFrameIcon(icon);
         setDefaultCloseOperation(JInternalFrame.HIDE_ON_CLOSE);
+        this.viewer = viewer;
 
         unmaximizedPos = getDefaultPosition();
         unmaximizedSize = getDefaultSize();
+        smallUnmaxSize = unmaximizedSize;
 
         addComponentListener(new ComponentAdapter()
         {
             @Override
             public void componentResized(ComponentEvent e)
             {
                 if (!isMaximum())
-                    unmaximizedSize = getSize();
+                {
+                    if (viewer.isMaximized)
+                        unmaximizedSize = getSize();
+                    else
+                        smallUnmaxSize = getSize();
+                }
                 super.componentResized(e);
             }
 
@@ -58,12 +68,28 @@ public void componentMoved(ComponentEvent e)
         addPropertyChangeListener(evt -> {
             if (isNormalState())
             {
-                setSize(unmaximizedSize);
+                setSize(viewer.isMaximized? unmaximizedSize : smallUnmaxSize);
                 setLocation(unmaximizedPos);
             }
         });
     }
 
+    public void onJDAResized() {
+        smallUnmaxSize = new Dimension(unmaximizedSize);
+        Dimension d = getDesktopPane().getSize();
+        if (unmaximizedPos.getX() + smallUnmaxSize.width > d.width)
+            smallUnmaxSize.width = d.width - (int) unmaximizedPos.getX();
+        if (unmaximizedPos.getY() + smallUnmaxSize.height > d.height)
+            smallUnmaxSize.height = d.height - (int) unmaximizedPos.getY();
+        if (isNormalState())
+            setSize(smallUnmaxSize);
+    }
+
+    public void onJDAMaximized() {
+        if (isNormalState())
+            setSize(unmaximizedSize);
+    }
+
     @Override
     public abstract void openClassFile(final String name, String container, final ClassNode cn);
 
@@ -139,6 +165,7 @@ public Dimension getPersistentSize()
     public void restoreSize(Dimension size)
     {
         unmaximizedSize = size;
+        smallUnmaxSize = size;
         if (isNormalState())
         {
             setPreferredSize(size);

src/main/java/the/bytecode/club/jda/gui/MainViewerGUI.java

@@ -109,11 +109,14 @@ else if ((oldState & Frame.ICONIFIED) != 0 && (newState & Frame.ICONIFIED) == 0)
                 if ((oldState & Frame.MAXIMIZED_BOTH) == 0 && (newState & Frame.MAXIMIZED_BOTH) != 0)
                 {
                     isMaximized = true;
+                    for (JDAWindow window : windows)
+                        window.onJDAMaximized();
                 }
                 else if ((oldState & Frame.MAXIMIZED_BOTH) != 0 && (newState & Frame.MAXIMIZED_BOTH) == 0)
                 {
                     setSize(unmaximizedSize);
                     setLocation(unmaximizedPos);
+                    isMaximized = false;
                 }
             }
         });
@@ -124,6 +127,8 @@ public void componentResized(ComponentEvent e)
             {
                 if ((getExtendedState() & Frame.MAXIMIZED_BOTH) != Frame.MAXIMIZED_BOTH)
                     unmaximizedSize = getSize();
+                for (JDAWindow window : windows)
+                    window.onJDAResized();
                 super.componentResized(e);
             }
 

src/main/java/the/bytecode/club/jda/gui/WorkPane.java

@@ -37,7 +37,7 @@ public class WorkPane extends JDAWindow implements ActionListener
 
     public WorkPane(final FileChangeNotifier fcn)
     {
-        super("WorkPanel", "Work Space", Resources.fileNavigatorIcon);
+        super("WorkPanel", "Work Space", Resources.fileNavigatorIcon, (MainViewerGUI) fcn);
 
         this.tabs = new JTabbedPane();
         this.fcn = fcn;