From 881f727ec7a737b1432c07b2ff1c18bf300e6dbb Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Mon, 20 Jul 2020 11:12:33 +0200
Subject: [PATCH] * Fixed visibility of buttons with empty text (fixes #6841).

---
 .../java/mage/client/game/FeedbackPanel.java  | 30 +++++++++----------
 .../src/mage/cards/s/SorcerousSpyglass.java   |  9 +++---
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java b/Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
index b4bc6cdaaf8..7ee520d4ca9 100644
--- a/Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
@@ -1,6 +1,4 @@
-
-
- /*
+/*
  * FeedbackPanel.java
  *
  * 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);
         this.helper.setTextArea(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
         if (this.mode == FeedbackMode.INFORM && mode != FeedbackMode.INFORM
-        		&& (this.lastResponse == null || this.lastResponse.isBefore(LocalDateTime.now().minusSeconds(2)))) {
-        	AudioManager.playFeedbackNeeded();
+                && (this.lastResponse == null || this.lastResponse.isBefore(LocalDateTime.now().minusSeconds(2)))) {
+            AudioManager.playFeedbackNeeded();
         }
-        
+
         this.mode = mode;
         switch (this.mode) {
             case INFORM:
@@ -187,12 +185,12 @@ public class FeedbackPanel extends javax.swing.JPanel {
             if (options.containsKey("UI.left.btn.text")) {
                 String text = (String) options.get("UI.left.btn.text");
                 this.btnLeft.setText(text);
-                this.helper.setLeft(text, true);
+                this.helper.setLeft(text, !text.isEmpty());
             }
             if (options.containsKey("UI.right.btn.text")) {
                 String text = (String) options.get("UI.right.btn.text");
                 this.btnRight.setText(text);
-                this.helper.setRight(text, true);
+                this.helper.setRight(text, !text.isEmpty());
             }
             if (options.containsKey("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
-    	setLastResponse();
-    	if (connectedDialog != null) {
+        setLastResponse();
+        if (connectedDialog != null) {
             connectedDialog.removeDialog();
             connectedDialog = null;
         }
@@ -272,18 +270,18 @@ public class FeedbackPanel extends javax.swing.JPanel {
     }//GEN-LAST:event_btnRightActionPerformed
 
     private void btnLeftActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnLeftActionPerformed
-    	setLastResponse();
+        setLastResponse();
         SessionHandler.sendPlayerBoolean(gameId, true);
         AudioManager.playButtonCancel();
     }//GEN-LAST:event_btnLeftActionPerformed
 
     private void btnSpecialActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnSpecialActionPerformed
-    	setLastResponse();
+        setLastResponse();
         SessionHandler.sendPlayerString(gameId, "special");
     }//GEN-LAST:event_btnSpecialActionPerformed
 
     private void btnUndoActionPerformed(java.awt.event.ActionEvent evt) {
-    	setLastResponse();
+        setLastResponse();
         SessionHandler.sendPlayerAction(PlayerAction.UNDO, gameId, null);
     }
 
@@ -314,9 +312,9 @@ public class FeedbackPanel extends javax.swing.JPanel {
     public void disableUndo() {
         this.helper.setUndoEnabled(false);
     }
-    
+
     public void setLastResponse() {
-    	this.lastResponse = LocalDateTime.now();
+        this.lastResponse = LocalDateTime.now();
     }
 
     private javax.swing.JButton btnLeft;
diff --git a/Mage.Sets/src/mage/cards/s/SorcerousSpyglass.java b/Mage.Sets/src/mage/cards/s/SorcerousSpyglass.java
index 6db68ce6e59..3ec72f473fa 100644
--- a/Mage.Sets/src/mage/cards/s/SorcerousSpyglass.java
+++ b/Mage.Sets/src/mage/cards/s/SorcerousSpyglass.java
@@ -1,5 +1,7 @@
 package mage.cards.s;
 
+import java.util.Optional;
+import java.util.UUID;
 import mage.MageObject;
 import mage.abilities.Ability;
 import mage.abilities.common.AsEntersBattlefieldAbility;
@@ -15,9 +17,6 @@ import mage.players.Player;
 import mage.target.common.TargetOpponent;
 import mage.util.CardUtil;
 
-import java.util.Optional;
-import java.util.UUID;
-
 /**
  * @author TheElk801
  */
@@ -69,7 +68,9 @@ class SorcerousSpyglassEntersEffect extends ChooseACardNameEffect {
                 if (opponent != null) {
                     MageObject sourceObject = game.getObject(source.getSourceId());
                     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);
                 }
             }
         }