From 5bf190c1b3f68e1570077e889fab6e0b174c9951 Mon Sep 17 00:00:00 2001 From: ssl10003 Date: Fri, 17 Apr 2015 14:32:15 -0400 Subject: [PATCH] Window Resize --- src/Main.java | 31 ++++++++------------------- src/StatGui.java | 2 +- src/resources/images/Nexus Tower.png | Bin 0 -> 3301 bytes 3 files changed, 10 insertions(+), 23 deletions(-) create mode 100644 src/resources/images/Nexus Tower.png diff --git a/src/Main.java b/src/Main.java index 9e104b2..23bc90e 100644 --- a/src/Main.java +++ b/src/Main.java @@ -7,7 +7,7 @@ public class Main extends JFrame{ public static void main(String[] args) { JFrame frame = new JFrame("Tower Defense Refactor Mock GUI"); frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - frame.setSize(1340,640+23); + frame.setSize(640,640+23); int num = 6; int[][] nodes = new int[num][2]; nodes[0][0] = 1; @@ -31,18 +31,16 @@ public static void main(String[] args) { JPanel container = new JPanel(); - container.setLayout(new BoxLayout(container, BoxLayout.X_AXIS)); + //container.setLayout(new BoxLayout(container, BoxLayout.X_AXIS)); + container.setLayout(new BorderLayout(10,10)); MockGui mg = new MockGui(640,640,32, num, nodes); StatGui sg= new StatGui(0,0); - sg.setPreferredSize(new Dimension(1, 0)); //this keeps statgui from overlapping mockgui - - /** - JLabel health = new JLabel("Health"); - health.setSize(100,100); - jp2.add(health);*/ - - container.add(mg); - container.add(sg); + //sg.setPreferredSize(new Dimension(1, 0)); //this keeps statgui from overlapping mockgui + + //container.add(mg); + //container.add(sg); + container.add(mg, BorderLayout.CENTER); + container.add(sg, BorderLayout.PAGE_END); MapTowerDefense map = new MapTowerDefense(100, num, nodes, mg, sg); @@ -51,19 +49,8 @@ public static void main(String[] args) { sg.setup(); frame.add(container); - //frame.add(mg); frame.setVisible(true); - - - - //StatGui sg = new StatGui(100, 640); - //sg.setLocation(640, 0); - - //frame.add(sg); - - - //map.getTF().createBasicTower(14, 8); map.createMinion(MinionTypes.BASIC); mg.step(); diff --git a/src/StatGui.java b/src/StatGui.java index 5e07625..89c5344 100644 --- a/src/StatGui.java +++ b/src/StatGui.java @@ -93,7 +93,7 @@ public void actionPerformed(ActionEvent e){ } else if("select basic tower".equals(e.getActionCommand())){ BasicTowerbutton.setEnabled(true); - //set tower placer variable to place aoe tower + //set tower placer variable to place basic tower System.out.println("Basic b**ch tower selected!"); } } diff --git a/src/resources/images/Nexus Tower.png b/src/resources/images/Nexus Tower.png new file mode 100644 index 0000000000000000000000000000000000000000..d67ba15535cb7baf49e518da72eaadc0b9a60f1c GIT binary patch literal 3301 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