From fc4410c160ad49a7d3a0856ba964dec07f7079fa Mon Sep 17 00:00:00 2001
From: Dofensmirtsz <dofensmirtsz@gmail.com>
Date: Thu, 11 Jun 2015 12:57:21 +0200
Subject: [PATCH] Buttons verbeterd

---
 model/gameState/MenuState.java | 31 +++++++++++--------------------
 model/objects/MenuButton.java  | 25 +++++++------------------
 2 files changed, 18 insertions(+), 38 deletions(-)

diff --git a/model/gameState/MenuState.java b/model/gameState/MenuState.java
index a73f1a5..8c5548c 100644
--- a/model/gameState/MenuState.java
+++ b/model/gameState/MenuState.java
@@ -57,12 +57,6 @@ public class MenuState extends GameState {
 		startanimation = true;
 		subscreen = false;
 		
-//		buttons.add(new MenuButton(400,150,GameModel.colors[kleurInt-2],selectedToSong(selected-2)));
-//		buttons.add(new MenuButton(400,250,GameModel.colors[kleurInt-1],selectedToSong(selected-1)));
-//		buttons.add(new MenuButton(400,350,GameModel.colors[kleurInt],selectedToSong(selected)));
-//		buttons.add(new MenuButton(400,450,GameModel.colors[kleurInt+1],selectedToSong(selected+1)));
-//		buttons.add(new MenuButton(400,550,GameModel.colors[kleurInt+2],selectedToSong(selected+2)));
-//		buttons.get(2).setSelected(true);
 		
 	}
 	@Override
@@ -107,11 +101,11 @@ public class MenuState extends GameState {
 	@Override
 	public void draw(Graphics2D g2) {
 		buttons.clear();		
-		buttons.add(new MenuButton(400,150,GameModel.colors[kleurButton1],selectedToSong(selected-2)));
-		buttons.add(new MenuButton(400,250,GameModel.colors[kleurButton2],selectedToSong(selected-1)));
-		buttons.add(new MenuButton(400,350,GameModel.colors[kleurButton3],selectedToSong(selected)));
-		buttons.add(new MenuButton(400,450,GameModel.colors[kleurButton4],selectedToSong(selected+1)));
-		buttons.add(new MenuButton(400,550,GameModel.colors[kleurButton5],selectedToSong(selected+2)));
+		buttons.add(new MenuButton(400,250,GameModel.colors[kleurButton1],selectedToSong(selected-2)));
+		buttons.add(new MenuButton(400,390,GameModel.colors[kleurButton2],selectedToSong(selected-1)));
+		buttons.add(new MenuButton(400,530,GameModel.colors[kleurButton3],selectedToSong(selected)));
+		buttons.add(new MenuButton(400,670,GameModel.colors[kleurButton4],selectedToSong(selected+1)));
+		buttons.add(new MenuButton(400,810,GameModel.colors[kleurButton5],selectedToSong(selected+2)));
 		buttons.get(2).setSelected(true);
 		
 		
@@ -239,10 +233,7 @@ public class MenuState extends GameState {
 		}else{										//Screen for selecting song
 			if(e.getJoystick().getPos() == Joystick.Position.DOWN){
 				selected++;
-//				if(kleurInt > GameModel.colors.length-1){
-//					kleurInt = 0;
-//				} else
-//					kleurInt++;
+				
 				kleurButton1++;
 				kleurButton1 %= 6;
 				
@@ -264,27 +255,27 @@ public class MenuState extends GameState {
 				selected--;
 				kleurButton1--;
 				if(kleurButton1 < 0){
-					kleurButton1 = 1;
+					kleurButton1 = 5;
 				}
 				
 				kleurButton2--;
 				if(kleurButton2 < 0){
-					kleurButton2 = 1;
+					kleurButton2 = 5;
 				}
 				
 				kleurButton3--;
 				if(kleurButton3 < 0){
-					kleurButton3 = 1;
+					kleurButton3 = 5;
 				}
 					
 				kleurButton4--;
 				if(kleurButton4 < 0){
-					kleurButton4 = 1;
+					kleurButton4 = 5;
 				}
 				
 				kleurButton5--;
 				if(kleurButton5 < 0){
-					kleurButton5 = 1;
+					kleurButton5 = 5;
 				}
 				
 
diff --git a/model/objects/MenuButton.java b/model/objects/MenuButton.java
index 9501b80..0e53bdc 100644
--- a/model/objects/MenuButton.java
+++ b/model/objects/MenuButton.java
@@ -28,36 +28,25 @@ public class MenuButton {
 	
 
 	public void draw(Graphics2D g2d){
+			g2d.setColor(color.darker().darker());
+			g2d.fillRect(x-5, y-5,890,80);
 			g2d.setColor(color);
-			g2d.fillRect(x,y,880,50);
+			g2d.fillRect(x,y,880,70);
 		
 		if(selected){
 			g2d.setColor(Color.BLACK);
-			g2d.drawRect(x, y, 880, 50);
+			g2d.drawRect(x-5, y-5, 890, 80);
+			g2d.drawRect(x, y, 880, 70);
+			
 		}
 
 		//draw text
 		g2d.setColor(Color.BLACK);
 		Font textFont = new Font("OCR A Extended", Font.BOLD,60);
 		g2d.setFont(textFont);
-		g2d.drawString(song.getTitle(),  x+50, y+50);
+		g2d.drawString(song.getTitle(),  x+50, y+57);
 	}
 	
-//	public void update(){
-//		if(selected && fadecounter < 5){
-//			x += 8;
-//			y -= 8;
-//			scalefactor += 0.04;
-//			fadecounter++;
-//			calculateButton();
-//		}else if(!selected && fadecounter >0){
-//			x += 8;
-//			y += 8;
-//			fadecounter--;
-//			scalefactor -= 0.04;
-//			calculateButton();
-//		}
-//	}
 	
 	public void setSelected(boolean selected) {
 		this.selected = selected;