From 534f68e2aa6ca5c9f049f438c2059f17ffea778b Mon Sep 17 00:00:00 2001 From: Doublestrike Date: Thu, 19 Jan 2012 13:23:11 +0000 Subject: [PATCH] Reverted green/red theme on phase labels. --- src/main/java/forge/view/match/ViewField.java | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/src/main/java/forge/view/match/ViewField.java b/src/main/java/forge/view/match/ViewField.java index 22680393946..c56f841a353 100644 --- a/src/main/java/forge/view/match/ViewField.java +++ b/src/main/java/forge/view/match/ViewField.java @@ -79,6 +79,7 @@ public class ViewField extends FRoundedPanel { private JLabel lblAvatar, lblLife; private final Image img; private final Color transparent = new Color(0, 0, 0, 0); + private final Color hoverBG = Singletons.getView().getSkin().getColor("hover"); /** * Assembles Swing components of player field instance. @@ -747,10 +748,6 @@ public class ViewField extends FRoundedPanel { private boolean enabled = true; private boolean active = false; private boolean hover = false; - private final Color defaultBG; - private final Color hoverBG; - private final Color pressedBG; - private final Color textColor; /** @@ -766,13 +763,6 @@ public class ViewField extends FRoundedPanel { this.setHorizontalTextPosition(SwingConstants.CENTER); this.setHorizontalAlignment(SwingConstants.CENTER); - defaultBG = ViewField.this.skin.getColor("active"); - hoverBG = ViewField.this.skin.getColor("hover"); - pressedBG = ViewField.this.skin.getColor("inactive"); - textColor = ViewField.this.skin.getColor("text"); - - this.setForeground(textColor); - this.addMouseListener(new MouseAdapter() { @Override public void mousePressed(final MouseEvent e) { @@ -849,11 +839,11 @@ public class ViewField extends FRoundedPanel { // Set color according to skip or active or hover state of label if (this.hover) { - c = PhaseLabel.this.hoverBG; + c = hoverBG; } else if (this.enabled) { - c = PhaseLabel.this.defaultBG; + c = Color.green; } else { - c = PhaseLabel.this.pressedBG; + c = Color.red; } if (!this.active && !this.hover) {