Button/text colours are now based on the BG colour

git-svn-id: http://chris.smith.name/svn/japoker/trunk@6 b8598caf-53df-4c1b-98b8-507a84a220

src/com/md87/cardgame/ui/Button.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Chris 'MD87' Smith, 2007. All rights reserved.
+ * Copyright (c) Chris 'MD87' Smith, 2007-2008. All rights reserved.
  *
  * This code may not be redistributed without prior permission from the
  * aforementioned copyright holder(s).
@@ -21,8 +21,8 @@ import java.awt.geom.Rectangle2D;
  */
 public class Button {
     
-    private final static Color BUTTON_ACTIVE = new Color(0, 200, 0);
-    private final static Color BUTTON_INACTIVE = new Color(0, 150, 0);    
+    private final Color activeColour;
+    private final Color inactiveColour;
     
     public static enum TYPE {
         SLOW {
@@ -97,9 +97,11 @@ public class Button {
     private String text;
     private Rectangle bounds;
     
-    public Button(final String text, final Rectangle bounds) {
+    public Button(final String text, final Rectangle bounds, final Color base) {
         this.text = text;
         this.bounds = bounds;
+        this.inactiveColour = base.brighter();
+        this.activeColour = this.inactiveColour.brighter();
     }
     
     public String getText() {
@@ -115,7 +117,7 @@ public class Button {
     }
     
     public void render(final Graphics2D g, final boolean enabled) {
-        g.setColor(enabled ? BUTTON_ACTIVE : BUTTON_INACTIVE);
+        g.setColor(enabled ? activeColour : inactiveColour);
         g.drawRoundRect(bounds.x, bounds.y, bounds.width, bounds.height, 5, 5);
 
         renderTextCentered(g);

src/com/md87/cardgame/ui/GameWindow.java

@@ -209,29 +209,29 @@ public class GameWindow extends JFrame implements GameObserver, MouseListener, K
 
         buttons.put(Button.TYPE.FAST, new Button("Fast",
                 new Rectangle(BUTTON_OFFSET, topButton + 0 * buttonOffset, BUTTON_WIDTH,
-                BUTTON_HEIGHT)));
+                BUTTON_HEIGHT), backgroundColour));
         buttons.put(Button.TYPE.NORMAL, new Button("Medium",
                 new Rectangle(BUTTON_OFFSET, topButton + 1 * buttonOffset, BUTTON_WIDTH,
-                BUTTON_HEIGHT)));
+                BUTTON_HEIGHT), backgroundColour));
         buttons.put(Button.TYPE.SLOW, new Button("Slow",
                 new Rectangle(BUTTON_OFFSET, topButton + 2 * buttonOffset, BUTTON_WIDTH,
-                BUTTON_HEIGHT)));
+                BUTTON_HEIGHT), backgroundColour));
         buttons.put(Button.TYPE.CONTINUE, new Button("Continue",
                 new Rectangle(BUTTON_OFFSET, topButton + 3 * buttonOffset, BUTTON_WIDTH,
-                BUTTON_HEIGHT)));
+                BUTTON_HEIGHT), backgroundColour));
 
         buttons.put(Button.TYPE.CHECK, new Button("Check / Call",
                 new Rectangle(rightButton, topButton + 0 * buttonOffset, BUTTON_WIDTH,
-                BUTTON_HEIGHT)));
+                BUTTON_HEIGHT), backgroundColour));
         buttons.put(Button.TYPE.OPEN, new Button("Open / Raise",
                 new Rectangle(rightButton, topButton + 1 * buttonOffset, BUTTON_WIDTH,
-                BUTTON_HEIGHT)));
+                BUTTON_HEIGHT), backgroundColour));
         buttons.put(Button.TYPE.FOLD, new Button("Fold",
                 new Rectangle(rightButton, topButton + 2 * buttonOffset, BUTTON_WIDTH,
-                BUTTON_HEIGHT)));
+                BUTTON_HEIGHT), backgroundColour));
         buttons.put(Button.TYPE.DISCARD, new Button("Discard",
                 new Rectangle(rightButton, topButton + 3 * buttonOffset, BUTTON_WIDTH,
-                BUTTON_HEIGHT)));
+                BUTTON_HEIGHT), backgroundColour));
     }
 
     /**
@@ -339,7 +339,7 @@ public class GameWindow extends JFrame implements GameObserver, MouseListener, K
                 nextCardPos.put(myPlayer, new Point(x + xOffset, yCardPosition));
 
                 if (inShowdown && !myPlayer.hasFolded() && myPlayer.getCards().size() > 0) {
-                    g.setColor(Color.GREEN);
+                    g.setColor(backgroundColour.brighter().brighter());
                     String[] hand = game.getHandText(myPlayer).split("\n");
                     int yo = 0;
                     for (String line : hand) {