From d951df41ecd71c5417752eb27896440aad615505 Mon Sep 17 00:00:00 2001 From: magenoxx Date: Mon, 7 Jan 2013 16:02:47 +0400 Subject: [PATCH] Fixed Issue#75: tooltip textbox stays sometimes undesired --- .../main/java/mage/client/game/GamePanel.java | 26 +++++++++++-------- .../plugins/adapters/MageActionCallback.java | 4 +++ 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/game/GamePanel.java b/Mage.Client/src/main/java/mage/client/game/GamePanel.java index 18c6f1cb1e0..ff11f49c0dd 100644 --- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java +++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java @@ -33,17 +33,6 @@ */ package mage.client.game; -import javax.swing.*; -import javax.swing.GroupLayout.Alignment; -import javax.swing.border.LineBorder; -import javax.swing.plaf.basic.BasicSplitPaneDivider; -import javax.swing.plaf.basic.BasicSplitPaneUI; -import java.awt.*; -import java.awt.event.*; -import java.io.Serializable; -import java.util.*; -import java.util.concurrent.CancellationException; -import java.util.concurrent.ExecutionException; import mage.Constants; import mage.cards.action.ActionCallback; import mage.client.MageFrame; @@ -66,6 +55,18 @@ import mage.view.*; import org.apache.log4j.Logger; import org.mage.plugins.card.utils.impl.ImageManagerImpl; +import javax.swing.*; +import javax.swing.GroupLayout.Alignment; +import javax.swing.border.LineBorder; +import javax.swing.plaf.basic.BasicSplitPaneDivider; +import javax.swing.plaf.basic.BasicSplitPaneUI; +import java.awt.*; +import java.awt.event.*; +import java.io.Serializable; +import java.util.*; +import java.util.concurrent.CancellationException; +import java.util.concurrent.ExecutionException; + /** @@ -433,6 +434,9 @@ public class GamePanel extends javax.swing.JPanel { } handContainer.loadCards(handCards.get(chosenHandKey), bigCard, gameId); + ActionCallback callback = Plugins.getInstance().getActionCallback(); + ((MageActionCallback)callback).hideAll(); + // set visible only if we have any other hand visible than ours boolean previous = btnSwitchHands.isVisible(); boolean visible = handCards.size() > 1; diff --git a/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java b/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java index 480ad18f986..962e9b6cfc5 100644 --- a/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java +++ b/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java @@ -276,6 +276,10 @@ public class MageActionCallback implements ActionCallback { @Override public void mouseExited(MouseEvent e, final TransferData data) { + hideAll(); + } + + public void hideAll() { hidePopup(); startHideTimeout(); this.state = false;