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

- Code formatting.

Browse Source
This commit is contained in:
Agetian
2017-02-08 06:28:57 +00:00
parent 14275d518b
commit 4be29c4df0
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
View File

@@ -567,28 +567,29 @@ public final class CMatchUI
final FButton toFocus = enable1 && focus1 ? btn1 : (enable2 ? btn2 : null); final FButton toFocus = enable1 && focus1 ? btn1 : (enable2 ? btn2 : null);
// Remove focusable so the right button grabs focus properly // Remove focusable so the right button grabs focus properly
//pfps This seems wrong so I've commented it out for now and replaced it //pfps This seems wrong so I've commented it out for now and replaced it
//if (toFocus == btn2) //if (toFocus == btn2)
//btn1.setFocusable(false); //btn1.setFocusable(false);
//else if (toFocus == btn1) //else if (toFocus == btn1)
//btn2.setFocusable(false); //btn2.setFocusable(false);
btn2.setFocusable(enable2); // order may matter here btn2.setFocusable(enable2); // order may matter here
btn1.setFocusable(enable1); btn1.setFocusable(enable1);
btn2.setEnabled(enable2); btn2.setEnabled(enable2);
btn1.setEnabled(enable1); btn1.setEnabled(enable1);
// ensure we don't steal focus from an overlay // ensure we don't steal focus from an overlay
if (toFocus != null) { if (toFocus != null) {
final Runnable focusRoutine = new Runnable() { final Runnable focusRoutine = new Runnable() {
@Override public final void run() { @Override
toFocus.requestFocus(); // focus here even if another window has focus - shouldn't have to do it this way but some popups grab window focus public final void run() {
} toFocus.requestFocus(); // focus here even if another window has focus - shouldn't have to do it this way but some popups grab window focus
}; }
if ( FThreads.isGuiThread() ) { // run this now whether in EDT or not so that it doesn't clobber later stuff };
FThreads.invokeInEdtNowOrLater(focusRoutine); if (FThreads.isGuiThread()) { // run this now whether in EDT or not so that it doesn't clobber later stuff
} else { FThreads.invokeInEdtNowOrLater(focusRoutine);
FThreads.invokeInEdtAndWait(focusRoutine); } else {
}; FThreads.invokeInEdtAndWait(focusRoutine);
};
} }
} }