da/HeatUp
1
0
Fork 0
mirror of https://github.com/jokerx3/HeatUp synced 2026-07-27 08:59:44 +02:00
Code Issues Releases Wiki Activity

fixed panel background when menu is displayed

Browse Source
This commit is contained in:
shebang
2015-01-13 13:19:47 +01:00
parent 6435ef52a7
commit 7d9c236214
3 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HeatUp/src/de/heatup/ui/Main.java
+14 -9
View File
@@ -100,30 +100,32 @@ public class Main extends JFrame implements Runnable {
MenuPanel.setMenuPanel(); MenuPanel.setMenuPanel();
menuPanel = MenuPanel.getMenuPanel(); menuPanel = MenuPanel.getMenuPanel();
outerPanel.add(statusPanel,BorderLayout.NORTH); outerPanel.add(statusPanel,BorderLayout.NORTH);
outerPanel.add(leftPanel, BorderLayout.WEST); outerPanel.add(leftPanel, BorderLayout.WEST);
outerPanel.add(rightPanel, BorderLayout.EAST); outerPanel.add(rightPanel, BorderLayout.EAST);
outerPanel.add(gamePanel,BorderLayout.CENTER); outerPanel.add(gamePanel,BorderLayout.CENTER);
outerPanel.add(actionPanel,BorderLayout.SOUTH); outerPanel.add(actionPanel,BorderLayout.SOUTH);
outerPanel.add(menuPanel, BorderLayout.CENTER);
outerPanel.add(menuPanel, BorderLayout.CENTER);
add(outerPanel); add(outerPanel);
pack(); pack();
setVisible(true); setVisible(true);
/* /*
* hier menue bauen * hier menue bauen
*/ */
PanelBuilder.setPanels(actionPanel, outerPanel, statusPanel, gamePanel); PanelBuilder.setPanels(actionPanel, outerPanel, statusPanel, gamePanel);
PanelBuilder.startMenu(); //PanelBuilder.startMenu();
PanelBuilder.actionPanel.setBackground(Color.BLACK);
PanelBuilder.statusPanel.setBackground(Color.BLACK);
/* /*
* entfernen wenn getter verwendet wird. * entfernen wenn getter verwendet wird.
*/ */
player01 = PanelBuilder.getPlayer(); player01 = PanelBuilder.getPlayer();
/* /*
* Wenn die Variable fullscreen gesetzt ist, wir er hier eingeschaltet. * Wenn die Variable fullscreen gesetzt ist, wir er hier eingeschaltet.
@@ -162,7 +164,7 @@ public class Main extends JFrame implements Runnable {
@Override @Override
public void run() { public void run() {
final Main frame = new Main(); final Main frame = new Main();
frame.repaint(); frame.repaint();
Thread ht= new Thread(){ Thread ht= new Thread(){
@Override @Override
@@ -280,6 +282,9 @@ public class Main extends JFrame implements Runnable {
PanelBuilder.tick(); PanelBuilder.tick();
} else if ( pause ) { } else if ( pause ) {
// Hier einfügen was passiert wenn ESC gedrückt wird // Hier einfügen was passiert wenn ESC gedrückt wird
outerPanel.setBackground(Color.BLACK);
gamePanel.setVisible(false); gamePanel.setVisible(false);
actionPanel.setVisible(false); actionPanel.setVisible(false);
statusPanel.setVisible(false); statusPanel.setVisible(false);
HeatUp/src/de/heatup/ui/PanelBuilder.java
+2 -2
View File
@@ -109,12 +109,12 @@ public class PanelBuilder {
//StatusPanelAdder.createPanel(); //StatusPanelAdder.createPanel();
// ActionPanel bauen // ActionPanel bauen
//ActionControl.setPanel(actionPanel); //ActionControl.setPanel(actionPanel);
//createGame(1); /* wird eigentlich vom menue aufgerufen */ //createGame(1); /* wird eigentlich vom menue aufgerufen */
} }
public static JPanel getGamePanel() { public static JPanel getGamePanel() {
return gamePanel; return gamePanel;
} }
HeatUp/src/de/heatup/ui/menu/MenuPanel.java
+4 -3
View File
@@ -39,7 +39,7 @@ public class MenuPanel {
} }
public static void setMenuPanel() { public static void setMenuPanel() {
menuPanel.setPreferredSize(new Dimension(800,600)); menuPanel.setPreferredSize(new Dimension(800,600));
menuPanel.setFocusable(false); menuPanel.setFocusable(false);
@@ -55,11 +55,11 @@ public class MenuPanel {
createHighscore(); createHighscore();
createCredits(); createCredits();
createTutorial(); createTutorial();
buildMenuPanel(); buildMenuPanel();
} }
public static JPanel getMenuPanel() { public static JPanel getMenuPanel() {
menuPanel.setVisible(true); menuPanel.setVisible(true);
return menuPanel; return menuPanel;
} }
@@ -203,5 +203,6 @@ public class MenuPanel {
menuPanel.add(highscore); menuPanel.add(highscore);
menuPanel.add(credits); menuPanel.add(credits);
menuPanel.add(tutorial); menuPanel.add(tutorial);
} }
} }