From 5679b2061644c4a959f1e0f6fbef612f0a752799 Mon Sep 17 00:00:00 2001 From: Daniel Date: Thu, 9 Jul 2015 11:24:42 +0200 Subject: [PATCH 1/2] Changed infopanel --- model/objects/InfoPanel.java | 44 +++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/model/objects/InfoPanel.java b/model/objects/InfoPanel.java index a8863d5..dd0e6a7 100644 --- a/model/objects/InfoPanel.java +++ b/model/objects/InfoPanel.java @@ -23,7 +23,7 @@ public class InfoPanel { private VolatileImage infoPanel; private SongHandler sh; private String time; - private int highscore; + private int highscore = 0; public InfoPanel(int x, int y, SongHandler sh){ this.x = x; @@ -59,9 +59,6 @@ public class InfoPanel { GradientPaint gp = new GradientPaint(0, 0, new Color(245,245,245), 256, 1024, Color.WHITE); g2.setPaint(gp); - Font scoreFont = new Font("OCR A Extended", Font.BOLD, 30); - g2.setFont(scoreFont); - g2.setColor(Color.GREEN); g2.fillRect(25, 900, (int)(2 * PlayState.lifePoints), 30); @@ -73,12 +70,27 @@ public class InfoPanel { g2.drawRect(25, 900, 200, 30); g2.drawRect(25, 950, 200, 30); - g2.drawString("Score: " + totalHighscore, 25, 75); - g2.drawString(sh.getCurrentSong().getTitle(), 25, 125); - g2.drawString(sh.getCurrentSong().getAuthor(), 25, 175); - g2.drawString("" + highscore, 25, 225); - g2.drawString(time, 25, 275); - + Font scoreFont = new Font("OCR A Extended", Font.BOLD, 35); + g2.setFont(scoreFont); + g2.drawString("Score: ", 25, 75); + + g2.drawString(sh.getCurrentSong().getTitle(), 25, 215); + g2.drawString(time, 25, 295); + g2.drawString("" + highscore, 25, 375); + + Font scoreFont2 = new Font("OCR A Extended", Font.BOLD, 25); + g2.setFont(scoreFont2); + g2.drawString("Title: ", 25, 185); + g2.drawString("Time: ", 25, 265); + g2.drawString("Best: ", 25, 345); + + + Font scoreFont3 = new Font("OCR A Extended", Font.BOLD, 45); + g2.setFont(scoreFont3); + g2.drawString("" + totalHighscore, 25, 115); + + + if(!Window.ON_RASP){ int width,height; @@ -86,27 +98,27 @@ public class InfoPanel { height = g2.getFontMetrics().getHeight(); - Ellipse2D oval1 = new Ellipse2D.Double(15, 700, 50, 50); + Ellipse2D oval1 = new Ellipse2D.Double(25, 700, 50, 50); g2.setColor(ButtonHandler.getButton(1).getColor()); g2.fill(oval1); - Ellipse2D oval2 = new Ellipse2D.Double(75, 700, 50, 50); + Ellipse2D oval2 = new Ellipse2D.Double(85, 700, 50, 50); g2.setColor(ButtonHandler.getButton(2).getColor()); g2.fill(oval2); - Ellipse2D oval3 = new Ellipse2D.Double(135, 700, 50, 50); + Ellipse2D oval3 = new Ellipse2D.Double(145, 700, 50, 50); g2.setColor(ButtonHandler.getButton(3).getColor()); g2.fill(oval3); - Ellipse2D oval4 = new Ellipse2D.Double(40, 760, 50, 50); + Ellipse2D oval4 = new Ellipse2D.Double(50, 760, 50, 50); g2.setColor(ButtonHandler.getButton(4).getColor()); g2.fill(oval4); - Ellipse2D oval5 = new Ellipse2D.Double(100, 760, 50, 50); + Ellipse2D oval5 = new Ellipse2D.Double(110, 760, 50, 50); g2.setColor(ButtonHandler.getButton(5).getColor()); g2.fill(oval5); - Ellipse2D oval6 = new Ellipse2D.Double(160, 760, 50, 50); + Ellipse2D oval6 = new Ellipse2D.Double(170, 760, 50, 50); g2.setColor(ButtonHandler.getButton(6).getColor()); g2.fill(oval6); } From 9380506d06db87fc7225877784e17f0055c1aff9 Mon Sep 17 00:00:00 2001 From: Dofensmirtsz Date: Thu, 9 Jul 2015 12:18:24 +0200 Subject: [PATCH 2/2] QWERTY --- model/objects/DifficultyButton.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/model/objects/DifficultyButton.java b/model/objects/DifficultyButton.java index 571ea9c..f9da372 100644 --- a/model/objects/DifficultyButton.java +++ b/model/objects/DifficultyButton.java @@ -27,9 +27,10 @@ public class DifficultyButton { button = Images.initVolatileImage(305, 80, Transparency.OPAQUE); Graphics2D g2 = button.createGraphics(); g2.setColor(Color.WHITE); - g2.fillRect(0, 0, 300, 75); + g2.fillRect(0, 0, 305, 80); g2.setColor(Color.ORANGE); - g2.drawRect(0, 0, 300, 75); + g2.drawRect(0, 0, 304, 79); + g2.drawRect(2, 2, 300, 75); //g2.drawRect(0-2, 0-2, 304, 79); g2.setColor(color);