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

set button focus after match; this also gets the game log scrolling properly

Browse Source
This commit is contained in:
myk
2013-02-06 20:23:25 +00:00
parent 22859cec6c
commit 987af8ba4f
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/forge/gui/home/quest/DialogChooseSets.java
View File

@@ -112,7 +112,6 @@ public class DialogChooseSets {
p.add(southPanel, "dock south, gapBottom 10"); p.add(southPanel, "dock south, gapBottom 10");
overlay.add(p); overlay.add(p);
p.setFocusCycleRoot(true);
p.getRootPane().setDefaultButton(btnOk); p.getRootPane().setDefaultButton(btnOk);
SOverlayUtils.showOverlay(); SOverlayUtils.showOverlay();
} }

19
src/main/java/forge/gui/match/ViewWinLose.java
View File

@@ -8,6 +8,7 @@ import javax.swing.JLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JScrollPane; import javax.swing.JScrollPane;
import javax.swing.SwingConstants; import javax.swing.SwingConstants;
import javax.swing.SwingUtilities;
import net.miginfocom.swing.MigLayout; import net.miginfocom.swing.MigLayout;
import forge.Singletons; import forge.Singletons;
@@ -99,14 +100,7 @@ public class ViewWinLose {
btnQuit.setText(ForgeProps.getLocalized(WinLoseText.QUIT)); btnQuit.setText(ForgeProps.getLocalized(WinLoseText.QUIT));
btnQuit.setFont(FSkin.getFont(22)); btnQuit.setFont(FSkin.getFont(22));
if (match.isMatchOver()) {
this.getBtnContinue().setEnabled(false);
this.getBtnQuit().grabFocus();
}
// Show Wins and Loses // Show Wins and Loses
final int humanWins = match.getGamesWonBy(human); final int humanWins = match.getGamesWonBy(human);
final int humanLosses = match.getPlayedGames().size() - humanWins; final int humanLosses = match.getPlayedGames().size() - humanWins;
@@ -126,7 +120,6 @@ public class ViewWinLose {
txtLog.setFont(FSkin.getFont(14)); txtLog.setFont(FSkin.getFont(14));
// Add all components accordingly. // Add all components accordingly.
overlay.removeAll();
overlay.setLayout(new MigLayout("insets 0, w 100%!, h 100%!")); overlay.setLayout(new MigLayout("insets 0, w 100%!, h 100%!"));
pnlLeft.setLayout(new MigLayout("insets 0, wrap, align center")); pnlLeft.setLayout(new MigLayout("insets 0, wrap, align center"));
pnlRight.setLayout(new MigLayout("insets 0, wrap")); pnlRight.setLayout(new MigLayout("insets 0, wrap"));
@@ -168,6 +161,16 @@ public class ViewWinLose {
pnlLog.add(scrLog, "w 300px!, h 100px!, gap 0 0 10px 0"); pnlLog.add(scrLog, "w 300px!, h 100px!, gap 0 0 10px 0");
pnlLeft.add(pnlLog, "w 100%!"); pnlLeft.add(pnlLog, "w 100%!");
boolean matchIsOver = match.isMatchOver();
final FButton focusButton = matchIsOver ? btnQuit : btnContinue;
btnContinue.setEnabled(!matchIsOver);
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
focusButton.requestFocusInWindow();
}
});
SOverlayUtils.showOverlay(); SOverlayUtils.showOverlay();
} }

1
src/main/java/forge/gui/toolbox/FOverlay.java
View File

@@ -51,6 +51,7 @@ public enum FOverlay {
private FOverlay() { private FOverlay() {
pnl.setOpaque(false); pnl.setOpaque(false);
pnl.setVisible(false); pnl.setVisible(false);
pnl.setFocusCycleRoot(true);
btnClose.setForeground(Color.white); btnClose.setForeground(Color.white);
btnClose.setBorder(BorderFactory.createLineBorder(Color.white)); btnClose.setBorder(BorderFactory.createLineBorder(Color.white));