diff --git a/core/view/GameWindow.java b/core/view/GameWindow.java index 34ef2bc7dd9bd70a5e6ee1aa587e12b5c648bb9b..4b506e23f7dfc6c6276835142259896d0718a6f8 100644 --- a/core/view/GameWindow.java +++ b/core/view/GameWindow.java @@ -75,6 +75,7 @@ class GameWindow extends JFrame implements KeyListener { contentPane.add(mapPanel, c); // status bar at the bottom + c.weighty = 0.2; c.gridx = 0; c.gridy = 1; JPanel statusBarPanel = new JPanel(); // flowLayout contentPane.add(statusBarPanel, c); diff --git a/core/view/View.java b/core/view/View.java index ed3d76050d27c13a636e84387951514aadd40297..4646d7929c0143b4356bcf7616b52286d1207d14 100644 --- a/core/view/View.java +++ b/core/view/View.java @@ -170,7 +170,8 @@ public class View{ this.gameWindow = new GameWindow(this, width, height, colonelStartLives, jaffaStartLives, colonelZPM, jaffaZPM); - this.gameWindow.setSize(width*80 , height*80 + 20 ); + // TODO dynamic size + this.gameWindow.setSize(1024, 768 ); this.gameWindow.setVisible(true); this.isInGame = true; return true;