Fix window sizes

Ughhh.

Author: rcx

src/main/java/the/bytecode/club/jda/JDA.java

@@ -6,7 +6,6 @@
 import the.bytecode.club.jda.api.ExceptionUI;
 import the.bytecode.club.jda.gui.FileNavigationPane;
 import the.bytecode.club.jda.gui.MainViewerGUI;
-import the.bytecode.club.jda.gui.WorkPane;
 
 import javax.swing.*;
 import javax.swing.filechooser.FileFilter;
@@ -76,7 +75,7 @@ public static void main(String[] args)
             Settings.loadGUI();
             viewer = new MainViewerGUI();
             Boot.boot();
-            JDA.boot(args, false);
+            JDA.boot(args);
         }
         catch (Exception e)
         {
@@ -98,10 +97,8 @@ public void run()
 
     /**
      * Boot after all of the libraries have been loaded
-     *
-     * @param cli is it running CLI mode or not
      */
-    public static void boot(String[] args, boolean cli)
+    public static void boot(String[] args)
     {
         cleanup();
         Runtime.getRuntime().addShutdownHook(new Thread()
@@ -124,23 +121,22 @@ public void run()
             }
         });
 
-        viewer.calledAfterLoad();
         resetRecentFilesMenu();
 
         if (viewer.mntmUpdateCheck.isSelected())
             versionChecker.start();
 
-        if (!cli)
-            viewer.setVisible(true);
+        viewer.setVisible(true);
+
+        viewer.calledAfterLoad();
 
         System.out.println("Start up took " + ((System.currentTimeMillis() - start) / 1000) + " seconds");
 
-        if (!cli)
-            if (args.length >= 1)
-                for (String s : args)
-                {
-                    openFiles(new File[] { new File(s) }, true);
-                }
+        if (args.length >= 1)
+            for (String s : args)
+            {
+                openFiles(new File[] { new File(s) }, true);
+            }
     }
 
     /**
@@ -437,8 +433,7 @@ public static void resetWorkSpace(boolean ask)
         if (!ask)
         {
             files.clear();
-            MainViewerGUI.getComponent(FileNavigationPane.class).resetWorkspace();
-            MainViewerGUI.getComponent(WorkPane.class).resetWorkspace();
+            viewer.resetWorkspace();
             the.bytecode.club.jda.api.BytecodeViewer.getClassNodeLoader().clear();
         }
         else
@@ -457,8 +452,7 @@ public static void resetWorkSpace(boolean ask)
             if (result == 0)
             {
                 files.clear();
-                MainViewerGUI.getComponent(FileNavigationPane.class).resetWorkspace();
-                MainViewerGUI.getComponent(WorkPane.class).resetWorkspace();
+                viewer.resetWorkspace();
                 the.bytecode.club.jda.api.BytecodeViewer.getClassNodeLoader().clear();
             }
         }

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

@@ -37,6 +37,7 @@ public class FileNavigationPane extends VisibleComponent implements FileDrop.Lis
     MyTreeNode treeRoot = new MyTreeNode("Loaded Files:");
     MyTree tree = new MyTree(treeRoot);
     final JTextField quickSearch = new JTextField(quickSearchText);
+
     public transient KeyAdapter search = new KeyAdapter()
     {
         @Override
@@ -160,6 +161,7 @@ public FileNavigationPane(final FileChangeNotifier fcn)
         tree.setShowsRootHandles(true);
         quickSearch.setForeground(Color.gray);
         setTitle("Files");
+        setMinimumSize(new Dimension(200, 50));
 
         this.open.addActionListener(e -> {
             final TreeNode root = (TreeNode) tree.getModel().getRoot();
@@ -253,6 +255,30 @@ public void focusLost(final FocusEvent arg0)
         new FileDrop(this, this);
     }
 
+    @Override
+    public void openClassFile(String name, String container, ClassNode cn)
+    {
+    }
+
+    @Override
+    public void openFile(String name, String container, byte[] contents)
+    {
+    }
+
+    public static Dimension defaultDimension = new Dimension(200, -1);
+    public static Point defaultPosition = new Point(0, 0);
+    @Override
+    public Dimension getDefaultDimensions()
+    {
+        return defaultDimension;
+    }
+
+    @Override
+    public Point getDefaultPosition()
+    {
+        return defaultPosition;
+    }
+
     public void openClassFileToWorkSpace(final String name, final String container, final ClassNode node)
     {
         fcn.openClassFile(name, container, node);

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

@@ -25,11 +25,6 @@
  */
 public class MainViewerGUI extends JFrame implements FileChangeNotifier
 {
-    public void java()
-    {
-        new FileChooser(Settings.JAVA_LOCATION, "Java Executable (Requires JRE/JDK 'C:/Program Files/Java/jre_xx/bin/java.exe')").run();
-    }
-
     public void setOptionalLibrary()
     {
         final JTextField text = new JTextField();
@@ -115,6 +110,13 @@ private JMenu generatePane(int id)
         return menu;
     }
 
+    public void resetWorkspace()
+    {
+        navigator.resetWorkspace();
+        workPane.resetWorkspace();
+        resetWindows();
+    }
+
     public class Test implements KeyEventDispatcher
     {
         @Override
@@ -129,7 +131,7 @@ public boolean dispatchKeyEvent(KeyEvent e)
 
     public JDesktopPane desktop;
     static ArrayList<VisibleComponent> rfComps = new ArrayList<>();
-    public FileNavigationPane cn;
+    public FileNavigationPane navigator;
     public WorkPane workPane;
 
     public AboutWindow aboutWindow = new AboutWindow();
@@ -160,6 +162,8 @@ public boolean dispatchKeyEvent(KeyEvent e)
 
     public MainViewerGUI()
     {
+        initializeWindows();
+
         Decompiler.ensureInitted();
         allDecompilers.put(panelGroup1, new HashMap<>());
         allDecompilers.put(panelGroup2, new HashMap<>());
@@ -312,37 +316,11 @@ else if ((oldState & Frame.MAXIMIZED_BOTH) != 0 && (newState & Frame.MAXIMIZED_B
 
         menuBar.add(spinnerMenu);
 
-        // TODO: save window location and maximized/not maximized
-        Dimension size = Toolkit.getDefaultToolkit().getScreenSize();
-        size = new Dimension(size.width * 3 / 4, size.height * 2 / 3);
-        setPreferredSize(size);
-        pack();
-        size = getContentPane().getSize();
-
         if (JDA.previewCopy)
             setTitle("JDA v" + JDA.version + " Preview");
         else
             setTitle("JDA v" + JDA.version);
 
-        cn = new FileNavigationPane(this);
-        cn.setMinimumSize(new Dimension(200, 50));
-        cn.setMaximumSize(new Dimension(200, Integer.MAX_VALUE));
-        cn.setPreferredSize(new Dimension(200, size.height));
-        cn.pack();
-
-        workPane = new WorkPane(this);
-        workPane.setPreferredSize(new Dimension(size.width - 200, size.height));
-        workPane.setLocation(200, 0);
-        workPane.pack();
-
-        desktop = new JDesktopPane();
-        setContentPane(desktop);
-        desktop.add(cn);
-        desktop.add(workPane);
-
-        rfComps.add(cn);
-        rfComps.add(workPane);
-
         fontSpinner.setPreferredSize(new Dimension(42, 20));
         fontSpinner.setSize(new Dimension(42, 20));
         fontSpinner.setModel(new SpinnerNumberModel(12, 1, null, 1));
@@ -374,6 +352,44 @@ else if ((oldState & Frame.MAXIMIZED_BOTH) != 0 && (newState & Frame.MAXIMIZED_B
         this.setLocationRelativeTo(null);
     }
 
+    private void initializeWindows()
+    {
+        // TODO: save window location and maximized/not maximized
+        Dimension size = Toolkit.getDefaultToolkit().getScreenSize();
+        setPreferredSize(new Dimension(size.width * 3 / 4, size.height * 2 / 3));
+
+        navigator = new FileNavigationPane(this);
+        workPane = new WorkPane(this);
+
+        desktop = new JDesktopPane();
+        setContentPane(desktop);
+        desktop.add(navigator);
+        desktop.add(workPane);
+        desktop.setDesktopManager(new WorkspaceDesktopManager());
+        pack();
+
+        rfComps.add(navigator);
+        rfComps.add(workPane);
+    }
+
+    public void resetWindows()
+    {
+        Dimension clientSize = desktop.getSize();
+
+        for (VisibleComponent f : rfComps)
+        {
+            Dimension size = f.getDefaultDimensions();
+            if (size.width < 0 || size.height < 0)
+                size = new Dimension(
+                        size.width < 0 ? clientSize.width + size.width : size.width,
+                        size.height < 0 ? clientSize.height + size.height : size.height);
+            f.setPreferredSize(size);
+            f.pack();
+            Point pos = f.getDefaultPosition();
+            desktop.getDesktopManager().resizeFrame(f, pos.x, pos.y, size.width, size.height);
+        }
+    }
+
     public JSpinner fontSpinner = new JSpinner();
     private JMenuItem spinnerMenu = new JMenuItem("");
 
@@ -399,6 +415,7 @@ public void setIcon(final boolean busy)
 
     public void calledAfterLoad()
     {
+        resetWindows();
     }
 
     @Override

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

@@ -4,6 +4,7 @@
 import the.bytecode.club.jda.FileChangeNotifier;
 
 import javax.swing.*;
+import java.awt.*;
 
 /**
  * Used to represent all the panes inside of Bytecode Viewer, this is temp code
@@ -15,13 +16,13 @@
 
 public abstract class VisibleComponent extends JInternalFrame implements FileChangeNotifier
 {
-
     private static final long serialVersionUID = -6453413772343643526L;
 
     public VisibleComponent(final String title)
     {
         super(title, false, false, false, false);
         this.setFrameIcon(null);
+        setResizable(true);
     }
 
     @SuppressWarnings("unused")
@@ -32,13 +33,14 @@ private VisibleComponent()
     }
 
     @Override
-    public void openClassFile(final String name, String container, final ClassNode cn)
-    {
-    }
+    public abstract void openClassFile(final String name, String container, final ClassNode cn);
 
     @Override
-    public void openFile(final String name, String container, byte[] contents)
-    {
-    }
+    public abstract void openFile(final String name, String container, byte[] contents);
+
+    protected static Dimension defaultDimensions;
+    protected static Point defaultPosition;
 
+    public abstract Dimension getDefaultDimensions();
+    public abstract Point getDefaultPosition();
 }

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

@@ -87,6 +87,20 @@ public void componentRemoved(final ContainerEvent e)
 
     }
 
+    public static Dimension defaultDimension = new Dimension(-FileNavigationPane.defaultDimension.width, -1);
+    public static Point defaultPosition = new Point(FileNavigationPane.defaultDimension.width, 0);
+    @Override
+    public Dimension getDefaultDimensions()
+    {
+        return defaultDimension;
+    }
+
+    @Override
+    public Point getDefaultPosition()
+    {
+        return defaultPosition;
+    }
+
     int tabCount = 0;
 
     public void addWorkingFile(final String name, String container, final ClassNode cn)

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

@@ -0,0 +1,25 @@
+package the.bytecode.club.jda.gui;
+
+import javax.swing.*;
+import java.awt.*;
+
+public class WorkspaceDesktopManager extends DefaultDesktopManager
+{
+    @Override
+    public void dragFrame(JComponent f, int x, int y)
+    {
+        if (f instanceof VisibleComponent)
+        {
+            VisibleComponent frame = (VisibleComponent) f;
+            JDesktopPane desk = frame.getDesktopPane();
+            Dimension d = desk.getSize();
+            if (x < 5)
+                x = 0;
+            else if (x + frame.getWidth() > d.width - 5)
+                x = d.width - frame.getWidth();
+            if (y < 5)
+                y = 0;
+        }
+        super.dragFrame(f, x, y);
+    }
+}