Add window controls to VisibleComponents, save their state too

Write the worst code in the history of mankind

Author: rcx

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

@@ -36,6 +36,9 @@ public class Resources
     public static ImageIcon decodedIcon = new ImageIcon(Resources.class.getClass().getResource("/decoded.png"));
     public static ImageIcon javaIcon = new ImageIcon(Resources.class.getClass().getResource("/java.png"));
 
+    public static ImageIcon fileNavigatorIcon = new ImageIcon(Resources.class.getClass().getResource("/icon.png"));
+    public static ImageIcon workPaneIcon = new ImageIcon(Resources.class.getClass().getResource("/icon.png"));
+
     public static ArrayList<BufferedImage> iconList;
     public static BufferedImage icon;
 

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

@@ -155,12 +155,12 @@ else if (ke.getKeyCode() == KeyEvent.VK_ESCAPE)
 
     public FileNavigationPane(final FileChangeNotifier fcn)
     {
-        super("ClassNavigation");
+        super("ClassNavigation", "File Navigator", Resources.fileNavigatorIcon);
+
         this.fcn = fcn;
         tree.setRootVisible(false);
         tree.setShowsRootHandles(true);
         quickSearch.setForeground(Color.gray);
-        setTitle("Files");
         setMinimumSize(new Dimension(200, 50));
 
         this.open.addActionListener(e -> {

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

@@ -5,6 +5,8 @@
 
 import javax.swing.*;
 import java.awt.*;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
 
 /**
  * Used to represent all the panes inside of Bytecode Viewer, this is temp code
@@ -18,12 +20,44 @@ public abstract class VisibleComponent extends JInternalFrame implements FileCha
 {
     private String windowId;
 
-    public VisibleComponent(final String title)
+    public Point unmaximizedPos;
+    public Dimension unmaximizedSize;
+
+    public VisibleComponent(final String id, final String title, final Icon icon)
     {
-        super(title, false, false, false, false);
-        windowId = title;
-        this.setFrameIcon(null);
-        setResizable(true);
+        super(title, true, true, true, true);
+        windowId = id;
+        setFrameIcon(icon);
+
+        unmaximizedPos = getLocation();
+        unmaximizedSize = getSize();
+
+        addComponentListener(new ComponentAdapter()
+        {
+            @Override
+            public void componentResized(ComponentEvent e)
+            {
+                if (!isMaximum())
+                    unmaximizedSize = getSize();
+                super.componentResized(e);
+            }
+
+            @Override
+            public void componentMoved(ComponentEvent e)
+            {
+                if (!isMaximum())
+                    unmaximizedPos = getLocation();
+                super.componentMoved(e);
+            }
+        });
+
+        addPropertyChangeListener(evt -> {
+            if (!isMaximum() && !isIcon())
+            {
+                setSize(unmaximizedSize);
+                setLocation(unmaximizedPos);
+            }
+        });
     }
 
     @Override

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

@@ -3,6 +3,7 @@
 import org.objectweb.asm.tree.ClassNode;
 import the.bytecode.club.jda.FileChangeNotifier;
 import the.bytecode.club.jda.JDA;
+import the.bytecode.club.jda.Resources;
 
 import javax.swing.*;
 import java.awt.*;
@@ -36,8 +37,7 @@ public class WorkPane extends VisibleComponent implements ActionListener
 
     public WorkPane(final FileChangeNotifier fcn)
     {
-        super("WorkPanel");
-        setTitle("Work Space");
+        super("WorkPanel", "Work Space", Resources.fileNavigatorIcon);
 
         this.tabs = new JTabbedPane();
         this.fcn = fcn;

src/main/java/the/bytecode/club/jda/settings/Settings.java

@@ -8,6 +8,7 @@
 
 import javax.swing.*;
 import java.awt.*;
+import java.beans.PropertyVetoException;
 import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.util.HashMap;
@@ -72,14 +73,25 @@ public static void saveFrame(JsonObject windowsSection, Component f, String name
 
         JsonObject windowSettings = windowsSection.get(name).asObject();
         boolean jda = name.equals("JDA");
-        Point pos = jda ? JDA.viewer.unmaximizedPos : f.getLocation();
-        Dimension size = jda ? JDA.viewer.unmaximizedSize : f.getSize();
+        Point pos = jda ? JDA.viewer.unmaximizedPos : ((VisibleComponent) f).unmaximizedPos;
+        Dimension size = jda ? JDA.viewer.unmaximizedSize : ((VisibleComponent) f).unmaximizedSize;
         windowSettings.add("x", pos.x);
         windowSettings.add("y", pos.y);
         windowSettings.add("width", size.width);
         windowSettings.add("height", size.height);
         if (jda)
-            windowSettings.add("state", JDA.viewer.getExtendedState());
+            windowSettings.add("state", ((JFrame) f).getExtendedState());
+        else if (f instanceof VisibleComponent)
+        {
+            int state = 0;
+            if (((VisibleComponent) f).isMaximum())
+                state |= 1;
+            if (((VisibleComponent) f).isIcon())
+                state |= 2;
+            if (((VisibleComponent) f).isVisible())
+                state |= 4;
+            windowSettings.add("state", state);
+        }
     }
 
     public static void loadGUI()
@@ -120,7 +132,6 @@ public static void loadWindows()
                 for (VisibleComponent f : MainViewerGUI.rfComps)
                 {
                     loadFrame(windowsSection, f, f.getWindowId());
-                    f.pack();;
                 }
                 loadFrame(windowsSection, JDA.viewer, "JDA");
             }
@@ -140,18 +151,36 @@ private static void loadFrame(JsonObject windowsSection, Component f, String nam
 
             Point pos = new Point(settings.get("x").asInt(), settings.get("y").asInt());
             Dimension size = new Dimension(settings.get("width").asInt(), settings.get("height").asInt());
-            if (jda)
+            if (jda) // fuck this shit make it an interfaceeeeeeeeeee
             {
                 JDA.viewer.setExtendedState(settings.get("state").asInt());
                 JDA.viewer.unmaximizedPos = pos;
                 JDA.viewer.unmaximizedSize = size;
+                if ((JDA.viewer.getExtendedState() & JFrame.MAXIMIZED_BOTH) != JFrame.MAXIMIZED_BOTH)
+                    JDA.viewer.pack();
             }
-            if (!jda || (JDA.viewer.getExtendedState() & JFrame.MAXIMIZED_BOTH) != JFrame.MAXIMIZED_BOTH)
+            else if (f instanceof VisibleComponent)
             {
-                f.setLocation(pos);
-                f.setPreferredSize(size);
-                if (jda)
-                    JDA.viewer.pack();
+                VisibleComponent comp = (VisibleComponent) f;
+                int state = settings.get("state").asInt();
+                try
+                {
+                    comp.setMaximum((state & 1) != 0);
+                    comp.setIcon((state & 2) != 0);
+                    comp.setVisible((state & 4) != 0);
+                }
+                catch (PropertyVetoException e)
+                {
+                    e.printStackTrace();
+                }
+                comp.unmaximizedPos = pos;
+                comp.unmaximizedSize = size;
+                if (!comp.isMaximum() && !comp.isIcon())
+                {
+                    comp.setLocation(pos);
+                    comp.setPreferredSize(size);
+                    comp.pack();
+                }
             }
         }
     }