github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Fixed visibility of buttons with empty text (fixes #6841).

Browse source
This commit is contained in:
LevelX2 2020-07-20 11:12:33 +02:00
parent 6fd304ec5f
commit 881f727ec7
2 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
View file

@ -1,6 +1,4 @@
/*
/*
* FeedbackPanel.java * FeedbackPanel.java
* *
* Created on 23-Dec-2009, 9:54:01 PM * Created on 23-Dec-2009, 9:54:01 PM
@ -87,13 +85,13 @@ public class FeedbackPanel extends javax.swing.JPanel {
String lblText = addAdditionalText(message, options); String lblText = addAdditionalText(message, options);
this.helper.setTextArea(lblText); this.helper.setTextArea(lblText);
//this.lblMessage.setText(lblText); //this.lblMessage.setText(lblText);
// Alert user when needing feedback if last dialog was informative, and it has been over 2 seconds since last input // Alert user when needing feedback if last dialog was informative, and it has been over 2 seconds since last input
if (this.mode == FeedbackMode.INFORM && mode != FeedbackMode.INFORM if (this.mode == FeedbackMode.INFORM && mode != FeedbackMode.INFORM
&& (this.lastResponse == null || this.lastResponse.isBefore(LocalDateTime.now().minusSeconds(2)))) { && (this.lastResponse == null || this.lastResponse.isBefore(LocalDateTime.now().minusSeconds(2)))) {
AudioManager.playFeedbackNeeded(); AudioManager.playFeedbackNeeded();
} }
this.mode = mode; this.mode = mode;
switch (this.mode) { switch (this.mode) {
case INFORM: case INFORM:
@ -187,12 +185,12 @@ public class FeedbackPanel extends javax.swing.JPanel {
if (options.containsKey("UI.left.btn.text")) { if (options.containsKey("UI.left.btn.text")) {
String text = (String) options.get("UI.left.btn.text"); String text = (String) options.get("UI.left.btn.text");
this.btnLeft.setText(text); this.btnLeft.setText(text);
this.helper.setLeft(text, true); this.helper.setLeft(text, !text.isEmpty());
} }
if (options.containsKey("UI.right.btn.text")) { if (options.containsKey("UI.right.btn.text")) {
String text = (String) options.get("UI.right.btn.text"); String text = (String) options.get("UI.right.btn.text");
this.btnRight.setText(text); this.btnRight.setText(text);
this.helper.setRight(text, true); this.helper.setRight(text, !text.isEmpty());
} }
if (options.containsKey("dialog")) { if (options.containsKey("dialog")) {
connectedDialog = (MageDialog) options.get("dialog"); connectedDialog = (MageDialog) options.get("dialog");
@ -253,8 +251,8 @@ public class FeedbackPanel extends javax.swing.JPanel {
} }
private void btnRightActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnRightActionPerformed private void btnRightActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnRightActionPerformed
setLastResponse(); setLastResponse();
if (connectedDialog != null) { if (connectedDialog != null) {
connectedDialog.removeDialog(); connectedDialog.removeDialog();
connectedDialog = null; connectedDialog = null;
} }
@ -272,18 +270,18 @@ public class FeedbackPanel extends javax.swing.JPanel {
}//GEN-LAST:event_btnRightActionPerformed }//GEN-LAST:event_btnRightActionPerformed
private void btnLeftActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnLeftActionPerformed private void btnLeftActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnLeftActionPerformed
setLastResponse(); setLastResponse();
SessionHandler.sendPlayerBoolean(gameId, true); SessionHandler.sendPlayerBoolean(gameId, true);
AudioManager.playButtonCancel(); AudioManager.playButtonCancel();
}//GEN-LAST:event_btnLeftActionPerformed }//GEN-LAST:event_btnLeftActionPerformed
private void btnSpecialActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnSpecialActionPerformed private void btnSpecialActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnSpecialActionPerformed
setLastResponse(); setLastResponse();
SessionHandler.sendPlayerString(gameId, "special"); SessionHandler.sendPlayerString(gameId, "special");
}//GEN-LAST:event_btnSpecialActionPerformed }//GEN-LAST:event_btnSpecialActionPerformed
private void btnUndoActionPerformed(java.awt.event.ActionEvent evt) { private void btnUndoActionPerformed(java.awt.event.ActionEvent evt) {
setLastResponse(); setLastResponse();
SessionHandler.sendPlayerAction(PlayerAction.UNDO, gameId, null); SessionHandler.sendPlayerAction(PlayerAction.UNDO, gameId, null);
} }
@ -314,9 +312,9 @@ public class FeedbackPanel extends javax.swing.JPanel {
public void disableUndo() { public void disableUndo() {
this.helper.setUndoEnabled(false); this.helper.setUndoEnabled(false);
} }
public void setLastResponse() { public void setLastResponse() {
this.lastResponse = LocalDateTime.now(); this.lastResponse = LocalDateTime.now();
} }
private javax.swing.JButton btnLeft; private javax.swing.JButton btnLeft;

9
Mage.Sets/src/mage/cards/s/SorcerousSpyglass.java
View file

@ -1,5 +1,7 @@
package mage.cards.s; package mage.cards.s;
import java.util.Optional;
import java.util.UUID;
import mage.MageObject; import mage.MageObject;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.common.AsEntersBattlefieldAbility;
@ -15,9 +17,6 @@ import mage.players.Player;
import mage.target.common.TargetOpponent; import mage.target.common.TargetOpponent;
import mage.util.CardUtil; import mage.util.CardUtil;
import java.util.Optional;
import java.util.UUID;
/** /**
* @author TheElk801 * @author TheElk801
*/ */
@ -69,7 +68,9 @@ class SorcerousSpyglassEntersEffect extends ChooseACardNameEffect {
if (opponent != null) { if (opponent != null) {
MageObject sourceObject = game.getObject(source.getSourceId()); MageObject sourceObject = game.getObject(source.getSourceId());
player.lookAtCards(sourceObject != null ? sourceObject.getIdName() : null, opponent.getHand(), game); player.lookAtCards(sourceObject != null ? sourceObject.getIdName() : null, opponent.getHand(), game);
player.chooseUse(Outcome.Benefit, "Press ok to name a card", "You won't be able to resize the window once you do", "Ok", " ", source, game); player.chooseUse(Outcome.Benefit, "Press Ok to name a card",
"You won't be able to resize the window showing opponents hand once you do",
"Ok", "", source, game);
} }
} }
} }