From d604f04b79ec2913e04a33dcda970624e3dcc60f Mon Sep 17 00:00:00 2001 From: sprangg Date: Mon, 26 Dec 2022 18:09:41 +0200 Subject: [PATCH] Button focus adjustments for yes/no dialogs (#9828) * UserRequestDialog buttons can't be pressed with spacebar anymore * Pressing spacebar when drafting no longer brings up the quit menu * Revert DraftPanel and TournamentPanel quit dialog buttons to their original positions Co-authored-by: sprangg --- .../src/main/java/mage/client/dialog/UserRequestDialog.java | 3 +++ Mage.Client/src/main/java/mage/client/draft/DraftPanel.java | 5 +++-- .../main/java/mage/client/tournament/TournamentPanel.java | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/dialog/UserRequestDialog.java b/Mage.Client/src/main/java/mage/client/dialog/UserRequestDialog.java index f04af5dfd62..dfb7acc1a6d 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/UserRequestDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/UserRequestDialog.java @@ -58,16 +58,19 @@ public class UserRequestDialog extends MageDialog { this.lblText.setText(text); if (userRequestMessage.getButton1Text() != null) { this.btn1.setText(userRequestMessage.getButton1Text()); + this.btn1.setFocusable(false); } else { this.btn1.setVisible(false); } if (userRequestMessage.getButton2Text() != null) { this.btn2.setText(userRequestMessage.getButton2Text()); + this.btn2.setFocusable(false); } else { this.btn2.setVisible(false); } if (userRequestMessage.getButton3Text() != null) { this.btn3.setText(userRequestMessage.getButton3Text()); + this.btn3.setFocusable(false); } else { this.btn3.setVisible(false); } diff --git a/Mage.Client/src/main/java/mage/client/draft/DraftPanel.java b/Mage.Client/src/main/java/mage/client/draft/DraftPanel.java index ab9e2014653..71d7aba6bc0 100644 --- a/Mage.Client/src/main/java/mage/client/draft/DraftPanel.java +++ b/Mage.Client/src/main/java/mage/client/draft/DraftPanel.java @@ -526,6 +526,7 @@ draftLeftPane.setVerifyInputWhenFocusTarget(false); btnQuitTournament.setText("Quit Tournament"); + btnQuitTournament.setFocusable(false); btnQuitTournament.addActionListener(evt -> btnQuitTournamentActionPerformed(evt)); lblPack1.setText("Pack 1:"); @@ -825,8 +826,8 @@ private void btnQuitTournamentActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnQuitTournamentActionPerformed UserRequestMessage message = new UserRequestMessage("Confirm quit tournament", "Are you sure you want to quit the draft tournament?"); - message.setButton1("Yes", PlayerAction.CLIENT_QUIT_DRAFT_TOURNAMENT); - message.setButton2("No", null); + message.setButton1("No", null); + message.setButton2("Yes", PlayerAction.CLIENT_QUIT_DRAFT_TOURNAMENT); message.setTournamentId(draftId); MageFrame.getInstance().showUserRequestDialog(message); }//GEN-LAST:event_btnQuitTournamentActionPerformed diff --git a/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java b/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java index ee3fe1e9565..d2112da2dee 100644 --- a/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java +++ b/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java @@ -490,8 +490,8 @@ public class TournamentPanel extends javax.swing.JPanel { private void btnQuitTournamentActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnQuitTournamentActionPerformed UserRequestMessage message = new UserRequestMessage("Confirm quit tournament", "Are you sure you want to quit the tournament?"); - message.setButton1("Yes", PlayerAction.CLIENT_QUIT_TOURNAMENT); - message.setButton2("No", null); + message.setButton1("No", null); + message.setButton2("Yes", PlayerAction.CLIENT_QUIT_TOURNAMENT); message.setTournamentId(tournamentId); MageFrame.getInstance().showUserRequestDialog(message); }//GEN-LAST:event_btnQuitTournamentActionPerformed