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

- Fix issue where End Turn is focused in certain cases (like using targeting through the dev controls)

Browse Source
This commit is contained in:
Sol
2015-05-15 14:42:03 +00:00
parent ff415ab90f
commit 4f5d2da2c2
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -556,15 +556,24 @@ public final class CMatchUI
final FButton btn1 = view.getBtnOK(), btn2 = view.getBtnCancel(); final FButton btn1 = view.getBtnOK(), btn2 = view.getBtnCancel();
btn1.setText(label1); btn1.setText(label1);
btn2.setText(label2); btn2.setText(label2);
// Remove focusable so the right button grabs focus properly
btn1.setFocusable(false);
btn2.setFocusable(false);
btn1.setEnabled(enable1); btn1.setEnabled(enable1);
btn2.setEnabled(enable2); btn2.setEnabled(enable2);
final FButton toFocus = enable1 && focus1 ? btn1 : (enable2 ? btn2 : null); final FButton toFocus = enable1 && focus1 ? btn1 : (enable2 ? btn2 : null);
// ensure we don't steal focus from an overlay // ensure we don't steal focus from an overlay
if (toFocus != null && !SOverlayUtils.overlayHasFocus()) { if (toFocus != null) {
FThreads.invokeInEdtLater(new Runnable() { FThreads.invokeInEdtLater(new Runnable() {
@Override public final void run() { @Override public final void run() {
toFocus.requestFocusInWindow(); btn1.setFocusable(true);
btn2.setFocusable(true);
if (!SOverlayUtils.overlayHasFocus()) {
toFocus.requestFocus();
}
} }
}); });
} }