Merge pull request DonaldHakeII#2 from tredfern1/master

CS320 Lab 2
jgross11 · Feb 17, 2021 · 45d3c18 · 45d3c18
2 parents 5b0c615 + 34ef5d9
commit 45d3c18
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
@@ -75,8 +75,11 @@ protected void paintComponent(Graphics g) {
 		// djh2-KEC110-21: changed from GREEN to RED
 		// djh2-YCPlaptop: change from RED to YELLOW
 
+		g.setColor(Color.GREEN);
+
+
 		// lbradley1: change from YELLOW to BLUE
-		g.setColor(Color.BLUE);
+		//setColor(Color.BLUE);
 
 		Square square = model.getSquare();
 
@@ -95,6 +98,10 @@ public void run() {
 				square.setX(300.0);
 				square.setY(220.0);
 
+				//uare.setWidth(60.0);
+				//uare.setHeight(25);
+=======
+
 				// lbradley1: change the size of the square to be smaller
 				square.setWidth(25.0);
 				square.setHeight(25.0);