diff --git a/HeatUp/src/de/heatup/ui/StatusPanelAdder.java b/HeatUp/src/de/heatup/ui/StatusPanelAdder.java index 6e51d1e..4e51176 100644 --- a/HeatUp/src/de/heatup/ui/StatusPanelAdder.java +++ b/HeatUp/src/de/heatup/ui/StatusPanelAdder.java @@ -39,7 +39,7 @@ public class StatusPanelAdder{ private static JProgressBar tempBar; private static JLabel labelScore= new JLabel("score"); private static JLabel scoreLabel= new JLabel(" "); - private static JLabel labelPowerUp = new JLabel("!P o w e r U p!"); + private static JLabel labelPowerUp = new JLabel("! P o w e r U p !"); private static JLabel powerUpLabel = new JLabel(" "); private static JLabel labelTime=new JLabel("Time"); private static JLabel timeLabel = new JLabel("0"); @@ -103,7 +103,7 @@ public class StatusPanelAdder{ public static void tick() { Timer.tickTimer(); timeLabel.setText(Timer.getMinuteS() + ":" + Timer.getSecondsS()); - scoreLabel.setText(Score.endScore() + ""); + scoreLabel.setText(Score.getScoreS()); /** * Temperaturaktualisierung @@ -176,7 +176,7 @@ public class StatusPanelAdder{ scoreLabel.setFont(emulogictext); scoreLabel.setForeground(Color.YELLOW); scoreLabel.setHorizontalAlignment(SwingConstants.CENTER); - scorePanel.setLayout(new BorderLayout(0,vgap)); + scorePanel.setLayout(new BorderLayout(0,vgap+2)); scorePanel.add(labelScore, BorderLayout.NORTH); scorePanel.add(scoreLabel, BorderLayout.SOUTH); scorePanel.setBackground(Color.BLACK); @@ -188,7 +188,7 @@ public class StatusPanelAdder{ powerUpLabel.setFont(emulogictextsmall); powerUpLabel.setForeground(Color.YELLOW); powerUpLabel.setHorizontalAlignment(SwingConstants.CENTER); - powerUpPanel.setLayout(new BorderLayout(0,vgap)); + powerUpPanel.setLayout(new BorderLayout(0,vgap+2)); powerUpPanel.add(labelPowerUp, BorderLayout.NORTH); powerUpPanel.add(powerUpLabel, BorderLayout.SOUTH); powerUpPanel.setBackground(Color.BLACK); @@ -202,7 +202,7 @@ public class StatusPanelAdder{ timeLabel.setFont(emulogictext); timeLabel.setForeground(Color.YELLOW); timeLabel.setHorizontalAlignment(SwingConstants.CENTER); - timePanel.setLayout(new BorderLayout(0,vgap)); + timePanel.setLayout(new BorderLayout(0,vgap+2)); timePanel.add(labelTime, BorderLayout.NORTH); timePanel.add(timeLabel, BorderLayout.SOUTH); timePanel.setBackground(Color.BLACK);