external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverted green/red theme on phase labels.

Browse Source
This commit is contained in:
Doublestrike
2012-01-19 13:23:11 +00:00
parent 1a6526332b
commit 534f68e2aa
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/forge/view/match/ViewField.java
View File

@@ -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) {