From 6d0d511323de3650295842dd5aecd65d124c7968 Mon Sep 17 00:00:00 2001 From: magenoxx Date: Thu, 10 Jul 2014 11:00:18 +0400 Subject: [PATCH] [UI] Changing from card.mousePressed to card.mouseReleased. Shouldn't matter. --- .../plugins/adapters/MageActionCallback.java | 37 ++++++++++--------- .../java/org/mage/card/arcane/CardPanel.java | 36 +++++------------- .../src/mage/cards/action/ActionCallback.java | 1 + .../mage/cards/action/impl/EmptyCallback.java | 4 ++ 4 files changed, 34 insertions(+), 44 deletions(-) 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 79f11c2c584..fc148a0636b 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 @@ -1,23 +1,5 @@ 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; -import java.awt.event.MouseWheelEvent; -import java.awt.image.BufferedImage; -import java.util.List; -import java.util.UUID; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; -import javax.swing.JComponent; -import javax.swing.JPopupMenu; -import javax.swing.Popup; -import javax.swing.PopupFactory; -import javax.swing.SwingUtilities; import mage.cards.MageCard; import mage.cards.MagePermanent; import mage.cards.action.ActionCallback; @@ -45,6 +27,18 @@ import org.apache.log4j.Logger; import org.jdesktop.swingx.JXPanel; import org.mage.plugins.card.images.ImageCache; +import javax.swing.*; +import java.awt.*; +import java.awt.event.MouseEvent; +import java.awt.event.MouseWheelEvent; +import java.awt.image.BufferedImage; +import java.util.List; +import java.util.UUID; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; + /** * Class that handles the callbacks from the card panels to mage to display big card * images from the cards the mouse hovers on. Also handles tooltip text window. @@ -98,6 +92,13 @@ public class MageActionCallback implements ActionCallback { @Override public void mousePressed(MouseEvent e, TransferData data) { + data.component.requestFocusInWindow(); + // Closes popup & enlarged view if a card/Permanent is selected + hidePopup(); + } + + @Override + public void mouseReleased(MouseEvent e, TransferData data) { data.component.requestFocusInWindow(); defaultCallback.mouseClicked(e, data.gameId, session, data.card); // Closes popup & enlarged view if a card/Permanent is selected diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java index 8f3ecefadc4..7d145f27d4e 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java @@ -1,32 +1,6 @@ package org.mage.card.arcane; import de.schlichtherle.truezip.file.TFile; -import java.awt.AlphaComposite; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Font; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Image; -import java.awt.Point; -import java.awt.Rectangle; -import java.awt.RenderingHints; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; -import java.awt.event.MouseMotionListener; -import java.awt.event.MouseWheelEvent; -import java.awt.event.MouseWheelListener; -import java.awt.image.BufferedImage; -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; -import javax.swing.BorderFactory; -import javax.swing.ImageIcon; -import javax.swing.JButton; -import javax.swing.JPanel; import mage.cards.MagePermanent; import mage.cards.TextPopup; import mage.cards.action.ActionCallback; @@ -49,6 +23,15 @@ import org.mage.plugins.card.dl.sources.DirectLinksForDownload; import org.mage.plugins.card.images.ImageCache; import org.mage.plugins.card.utils.impl.ImageManagerImpl; +import javax.swing.*; +import java.awt.*; +import java.awt.event.*; +import java.awt.image.BufferedImage; +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * Main class for drawing Mage card object. * @@ -836,6 +819,7 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti @Override public void mouseReleased(MouseEvent e) { + callback.mouseReleased(e, data); } /** diff --git a/Mage.Common/src/mage/cards/action/ActionCallback.java b/Mage.Common/src/mage/cards/action/ActionCallback.java index da476c1319c..0e412fbedaa 100644 --- a/Mage.Common/src/mage/cards/action/ActionCallback.java +++ b/Mage.Common/src/mage/cards/action/ActionCallback.java @@ -6,6 +6,7 @@ import java.awt.event.MouseWheelEvent; public interface ActionCallback { void mouseClicked(MouseEvent e, TransferData data); void mousePressed(MouseEvent e, TransferData data); + void mouseReleased(MouseEvent e, TransferData data); void mouseMoved(MouseEvent e, TransferData data); void mouseEntered(MouseEvent e, TransferData data); void mouseExited(MouseEvent e, TransferData data); diff --git a/Mage.Common/src/mage/cards/action/impl/EmptyCallback.java b/Mage.Common/src/mage/cards/action/impl/EmptyCallback.java index 5fc96150683..b20d7e098d7 100644 --- a/Mage.Common/src/mage/cards/action/impl/EmptyCallback.java +++ b/Mage.Common/src/mage/cards/action/impl/EmptyCallback.java @@ -41,4 +41,8 @@ public class EmptyCallback implements ActionCallback { public void mousePressed(MouseEvent e, TransferData data) { } + @Override + public void mouseReleased(MouseEvent e, TransferData data) { + } + }