lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed outputing crash advice twice

Browse Source
This commit is contained in:
huangyuhui
2017-03-12 13:50:20 +08:00
parent fd2a5a07a1
commit 4f03ec503f
9 changed files with 104 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HMCLaF/src/main/java/org/jackhuang/hmcl/laf/button/BEButtonUI.java
View File

@@ -267,7 +267,7 @@ public class BEButtonUI extends BasicButtonUI implements Skin {
state = State.ROLLOVER;
else if (b instanceof JButton
&& ((JButton) b).isDefaultButton())
state = State.DEFAULTED;
state = State.DEFAULT;
break;
default:
state = State.NORMAL;

4
HMCLaF/src/main/java/org/jackhuang/hmcl/laf/utils/AnimationController.java
View File

@@ -98,7 +98,7 @@ public class AnimationController implements ActionListener, PropertyChangeListen
State oldState = controller.getState(c, part);
if (oldState != newState) {
controller.putState(c, part, newState);
if (newState == State.DEFAULTED)
if (newState == State.DEFAULT)
// it seems for DEFAULTED button state Vista does animation from
// HOT
oldState = State.ROLLOVER;
@@ -182,7 +182,7 @@ public class AnimationController implements ActionListener, PropertyChangeListen
State endState,
long millis) {
boolean isForwardAndReverse = false;
if (endState == State.DEFAULTED)
if (endState == State.DEFAULT)
isForwardAndReverse = true;
Map<Part, AnimationState> map = animationStateMap.get(component);
if (millis <= 0) {

4
HMCLaF/src/main/java/org/jackhuang/hmcl/laf/utils/TMSchema.java
View File

@@ -231,7 +231,7 @@ public class TMSchema {
BULLETNORMAL,
BULLETDISABLED,
CLOSED,
DEFAULTED,
DEFAULT,
DISABLED,
DISABLEDHOT,
DISABLEDPUSHED,
@@ -304,7 +304,7 @@ public class TMSchema {
});
stateMap.put(Part.BP_PUSHBUTTON,
new State[] { NORMAL, ROLLOVER, PRESSED, DISABLED, DEFAULTED });
new State[] { NORMAL, ROLLOVER, PRESSED, DISABLED, DEFAULT });
stateMap.put(Part.BP_RADIOBUTTON,
new State[] {