diff --git a/HeatUp/src/de/heatup/ui/Main.java b/HeatUp/src/de/heatup/ui/Main.java index 0af34f2..5857ef4 100644 --- a/HeatUp/src/de/heatup/ui/Main.java +++ b/HeatUp/src/de/heatup/ui/Main.java @@ -54,6 +54,10 @@ public class Main extends JFrame implements Runnable { private static JPanel menuPanel; + public void repack() { + pack(); + } + public Main(){ setTitle("HeatUP!"); setDefaultCloseOperation(EXIT_ON_CLOSE); diff --git a/HeatUp/src/de/heatup/ui/PanelBuilder.java b/HeatUp/src/de/heatup/ui/PanelBuilder.java index c555f23..01265eb 100644 --- a/HeatUp/src/de/heatup/ui/PanelBuilder.java +++ b/HeatUp/src/de/heatup/ui/PanelBuilder.java @@ -49,7 +49,7 @@ public class PanelBuilder { public static void tick() { switch (MenuPanel.gameExists) { case 1: - Logger.write("Menu tick"); + //Logger.write("Menu tick"); break; case 2: EventQueue.invokeLater(new Runnable() { @@ -118,6 +118,11 @@ public class PanelBuilder { public static JPanel getGamePanel() { return gamePanel; } + + public static JPanel getOuterPanel() { + return outerPanel; + } + public static void createGame(int map) { instancedObjects = new InstancedObjects(); diff --git a/HeatUp/src/de/heatup/ui/menu/MenuPanel.java b/HeatUp/src/de/heatup/ui/menu/MenuPanel.java index 9f8f9ab..7b4fe10 100644 --- a/HeatUp/src/de/heatup/ui/menu/MenuPanel.java +++ b/HeatUp/src/de/heatup/ui/menu/MenuPanel.java @@ -93,8 +93,11 @@ public class MenuPanel { gameExists = 2; menuPanel.setVisible(false); - PanelBuilder.getGamePanel().setVisible(true); + PanelBuilder.getOuterPanel().add(PanelBuilder.getGamePanel(),BorderLayout.CENTER); +// PanelBuilder.getGamePanel().setSize(800, 600); +// PanelBuilder.getGamePanel().setVisible(true); + //** game, action, status panel redraw and check visibility */