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

Fixed FButton toggle state.

Browse Source
This commit is contained in:
Doublestrike
2011-12-15 02:44:30 +00:00
parent 03a3dafe71
commit eb0e0d2f0a
1 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/java/forge/view/toolbox/FButton.java
View File

@@ -100,7 +100,9 @@ public class FButton extends JButton {
this.addMouseListener(new java.awt.event.MouseAdapter() { this.addMouseListener(new java.awt.event.MouseAdapter() {
@Override @Override
public void mouseEntered(final java.awt.event.MouseEvent evt) { public void mouseEntered(final java.awt.event.MouseEvent evt) {
if (FButton.this.isEnabled() && !isToggled()) { if (isToggled()) { return; }
if (FButton.this.isEnabled()) {
FButton.this.imgL = FButton.this.skin.getImage("button.overLEFT"); FButton.this.imgL = FButton.this.skin.getImage("button.overLEFT");
FButton.this.imgM = FButton.this.skin.getImage("button.overCENTER"); FButton.this.imgM = FButton.this.skin.getImage("button.overCENTER");
FButton.this.imgR = FButton.this.skin.getImage("button.overRIGHT"); FButton.this.imgR = FButton.this.skin.getImage("button.overRIGHT");
@@ -109,6 +111,8 @@ public class FButton extends JButton {
@Override @Override
public void mouseExited(final java.awt.event.MouseEvent evt) { public void mouseExited(final java.awt.event.MouseEvent evt) {
if (isToggled()) { return; }
if (FButton.this.isEnabled() && !FButton.this.isFocusOwner()) { if (FButton.this.isEnabled() && !FButton.this.isFocusOwner()) {
FButton.this.imgL = FButton.this.skin.getImage("button.upLEFT"); FButton.this.imgL = FButton.this.skin.getImage("button.upLEFT");
FButton.this.imgM = FButton.this.skin.getImage("button.upCENTER"); FButton.this.imgM = FButton.this.skin.getImage("button.upCENTER");
@@ -123,7 +127,9 @@ public class FButton extends JButton {
@Override @Override
public void mousePressed(final java.awt.event.MouseEvent evt) { public void mousePressed(final java.awt.event.MouseEvent evt) {
if (FButton.this.isEnabled() && !isToggled()) { if (isToggled()) { return; }
if (FButton.this.isEnabled()) {
FButton.this.imgL = FButton.this.skin.getImage("button.downLEFT"); FButton.this.imgL = FButton.this.skin.getImage("button.downLEFT");
FButton.this.imgM = FButton.this.skin.getImage("button.downCENTER"); FButton.this.imgM = FButton.this.skin.getImage("button.downCENTER");
FButton.this.imgR = FButton.this.skin.getImage("button.downRIGHT"); FButton.this.imgR = FButton.this.skin.getImage("button.downRIGHT");
@@ -132,7 +138,9 @@ public class FButton extends JButton {
@Override @Override
public void mouseReleased(final java.awt.event.MouseEvent evt) { public void mouseReleased(final java.awt.event.MouseEvent evt) {
if (FButton.this.isEnabled() && !isToggled()) { if (isToggled()) { return; }
if (FButton.this.isEnabled()) {
FButton.this.imgL = FButton.this.skin.getImage("button.downLEFT"); FButton.this.imgL = FButton.this.skin.getImage("button.downLEFT");
FButton.this.imgM = FButton.this.skin.getImage("button.downCENTER"); FButton.this.imgM = FButton.this.skin.getImage("button.downCENTER");
FButton.this.imgR = FButton.this.skin.getImage("button.downRIGHT"); FButton.this.imgR = FButton.this.skin.getImage("button.downRIGHT");
@@ -143,7 +151,9 @@ public class FButton extends JButton {
// Focus events // Focus events
this.addFocusListener(new FocusAdapter() { this.addFocusListener(new FocusAdapter() {
public void focusGained(FocusEvent e) { public void focusGained(FocusEvent e) {
if (FButton.this.isEnabled() && !isToggled()) { if (isToggled()) { return; }
if (FButton.this.isEnabled()) {
FButton.this.imgL = FButton.this.skin.getImage("button.focusLEFT"); FButton.this.imgL = FButton.this.skin.getImage("button.focusLEFT");
FButton.this.imgM = FButton.this.skin.getImage("button.focusCENTER"); FButton.this.imgM = FButton.this.skin.getImage("button.focusCENTER");
FButton.this.imgR = FButton.this.skin.getImage("button.focusRIGHT"); FButton.this.imgR = FButton.this.skin.getImage("button.focusRIGHT");
@@ -153,16 +163,13 @@ public class FButton extends JButton {
} }
public void focusLost(FocusEvent e) { public void focusLost(FocusEvent e) {
if (FButton.this.isEnabled() && !isToggled()) { if (isToggled()) { return; }
if (FButton.this.isEnabled()) {
FButton.this.imgL = FButton.this.skin.getImage("button.upLEFT"); FButton.this.imgL = FButton.this.skin.getImage("button.upLEFT");
FButton.this.imgM = FButton.this.skin.getImage("button.upCENTER"); FButton.this.imgM = FButton.this.skin.getImage("button.upCENTER");
FButton.this.imgR = FButton.this.skin.getImage("button.upRIGHT"); FButton.this.imgR = FButton.this.skin.getImage("button.upRIGHT");
} }
else if (isToggled()) {
FButton.this.imgL = FButton.this.skin.getImage("button.toggleLEFT");
FButton.this.imgM = FButton.this.skin.getImage("button.toggleCENTER");
FButton.this.imgR = FButton.this.skin.getImage("button.toggleRIGHT");
}
removeKeyListener(klEnter); removeKeyListener(klEnter);
} }
@@ -196,6 +203,23 @@ public class FButton extends JButton {
/** @param b0   boolean. */ /** @param b0   boolean. */
public void setToggled(boolean b0) { public void setToggled(boolean b0) {
if (b0) {
FButton.this.imgL = FButton.this.skin.getImage("button.toggleLEFT");
FButton.this.imgM = FButton.this.skin.getImage("button.toggleCENTER");
FButton.this.imgR = FButton.this.skin.getImage("button.toggleRIGHT");
}
else if (isEnabled()) {
FButton.this.imgL = FButton.this.skin.getImage("button.upLEFT");
FButton.this.imgM = FButton.this.skin.getImage("button.upCENTER");
FButton.this.imgR = FButton.this.skin.getImage("button.upRIGHT");
repaint();
}
else {
FButton.this.imgL = FButton.this.skin.getImage("button.disabledLEFT");
FButton.this.imgM = FButton.this.skin.getImage("button.disabledCENTER");
FButton.this.imgR = FButton.this.skin.getImage("button.disabledRIGHT");
repaint();
}
this.toggle = b0; this.toggle = b0;
} }