External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 04:52:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed timing for displaying popups as it causes problems. Create corresponding task in Issue log for next release (0.6).

Browse source
This commit is contained in:
magenoxx 2010-12-01 09:06:08 +00:00
parent 7e95b78308
commit eff9aa95d5
1 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
View file

@ -1,7 +1,6 @@
package mage.client.plugins.adapters;
import java.awt.Color;
import java.awt.Component;
import java.awt.Image;
import java.awt.Point;
import java.awt.event.MouseEvent;
@ -9,9 +8,8 @@ import java.awt.image.BufferedImage;
import java.util.List;
import java.util.UUID;
import javax.swing.JDesktopPane;
import javax.swing.JLayeredPane;
import javax.swing.Popup;
import javax.swing.PopupFactory;
import javax.swing.SwingUtilities;
import mage.cards.MageCard;
@ -20,11 +18,9 @@ import mage.cards.action.ActionCallback;
import mage.cards.action.TransferData;
import mage.client.MageFrame;
import mage.client.cards.BigCard;
import mage.client.components.MageComponents;
import mage.client.game.PlayAreaPanel;
import mage.client.plugins.impl.Plugins;
import mage.client.remote.Session;
import mage.client.thread.DelayedViewerThread;
import mage.client.util.DefaultActionCallback;
import mage.client.util.ImageHelper;
import mage.client.util.gui.ArrowBuilder;
@ -67,6 +63,7 @@ public class MageActionCallback implements ActionCallback {
this.popupCard = data.card;
if (popup != null) {
//DelayedViewerThread.getInstance().hide(data.popupText);
popup.hide();
}
// Draw Arrows for targets
@ -112,26 +109,26 @@ public class MageActionCallback implements ActionCallback {
}
}
//showPopup(data);
showPopup(data);
}
private void showPopup(final TransferData data) {
try {
/*try {
((JDesktopPane)session.getUI().getComponent(MageComponents.DESKTOP_PANE)).add(data.popupText, JLayeredPane.POPUP_LAYER);
data.popupText.setBounds((int) data.locationOnScreen.getX() + data.popupOffsetX, (int) data.locationOnScreen.getY() + data.popupOffsetY + 40, 200, 200);
data.popupText.setText("Test");
DelayedViewerThread.getInstance().show((Component)data.popupText, 500);
} catch (InterruptedException ie) {
ie.printStackTrace();
}
}*/
//PopupFactory factory = PopupFactory.getSharedInstance();
//popup = factory.getPopup(data.component, data.popupText, (int) data.locationOnScreen.getX() + data.popupOffsetX, (int) data.locationOnScreen.getY() + data.popupOffsetY + 40);
//popup.show();
PopupFactory factory = PopupFactory.getSharedInstance();
popup = factory.getPopup(data.component, data.popupText, (int) data.locationOnScreen.getX() + data.popupOffsetX, (int) data.locationOnScreen.getY() + data.popupOffsetY + 40);
popup.show();
// hack to get popup to resize to fit text
//popup.hide();
//popup = factory.getPopup(data.component, data.popupText, (int) data.locationOnScreen.getX() + data.popupOffsetX, (int) data.locationOnScreen.getY() + data.popupOffsetY + 40);
//popup.show();
popup.hide();
popup = factory.getPopup(data.component, data.popupText, (int) data.locationOnScreen.getX() + data.popupOffsetX, (int) data.locationOnScreen.getY() + data.popupOffsetY + 40);
popup.show();
}
@Override
@ -169,7 +166,7 @@ public class MageActionCallback implements ActionCallback {
this.popupCard = null;
//DelayedViewerThread.getInstance().hide(data.popupText);
if (popup != null) {
//popup.hide();
popup.hide();
}
ArrowBuilder.removeAllArrows();
}