mirror of
https://github.com/magefree/mage.git
synced 2025-12-20 10:40:06 -08:00
Replaced mouseClicked by mousePressed everywhere (works betters). Rebuild everything.
This commit is contained in:
parent
4c8344a8fd
commit
fe3903d825
8 changed files with 22 additions and 11 deletions
Binary file not shown.
|
|
@ -352,12 +352,12 @@ public class Card extends MagePermanent implements MouseMotionListener, MouseLis
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void mouseClicked(MouseEvent e) {
|
public void mouseClicked(MouseEvent e) {
|
||||||
requestFocusInWindow();
|
|
||||||
callback.mouseClicked(e, gameId, session, card);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void mousePressed(MouseEvent arg0) {
|
public void mousePressed(MouseEvent e) {
|
||||||
|
requestFocusInWindow();
|
||||||
|
callback.mouseClicked(e, gameId, session, card);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -54,6 +54,10 @@ public class MageActionCallback implements ActionCallback {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void mouseClicked(MouseEvent e, TransferData data) {
|
public void mouseClicked(MouseEvent e, TransferData data) {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void mousePressed(MouseEvent e, TransferData data) {
|
||||||
data.component.requestFocusInWindow();
|
data.component.requestFocusInWindow();
|
||||||
defaultCallback.mouseClicked(e, data.gameId, session, data.card);
|
defaultCallback.mouseClicked(e, data.gameId, session, data.card);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ import java.awt.event.MouseEvent;
|
||||||
|
|
||||||
public interface ActionCallback {
|
public interface ActionCallback {
|
||||||
void mouseClicked(MouseEvent e, TransferData data);
|
void mouseClicked(MouseEvent e, TransferData data);
|
||||||
|
void mousePressed(MouseEvent e, TransferData data);
|
||||||
void mouseMoved(MouseEvent e, TransferData data);
|
void mouseMoved(MouseEvent e, TransferData data);
|
||||||
void mouseEntered(MouseEvent e, TransferData data);
|
void mouseEntered(MouseEvent e, TransferData data);
|
||||||
void mouseExited(MouseEvent e, TransferData dat);
|
void mouseExited(MouseEvent e, TransferData dat);
|
||||||
|
|
|
||||||
|
|
@ -28,4 +28,8 @@ public class EmptyCallback implements ActionCallback {
|
||||||
public void mouseClicked(MouseEvent e, TransferData data) {
|
public void mouseClicked(MouseEvent e, TransferData data) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void mousePressed(MouseEvent e, TransferData data) {
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,6 @@ import org.apache.log4j.Logger;
|
||||||
import org.mage.card.arcane.ScaledImagePanel.MultipassType;
|
import org.mage.card.arcane.ScaledImagePanel.MultipassType;
|
||||||
import org.mage.card.arcane.ScaledImagePanel.ScalingType;
|
import org.mage.card.arcane.ScaledImagePanel.ScalingType;
|
||||||
import org.mage.plugins.card.images.ImageCache;
|
import org.mage.plugins.card.images.ImageCache;
|
||||||
import org.mage.plugins.card.utils.BufferedImageBuilder;
|
|
||||||
import org.mage.plugins.card.utils.ImagePanel;
|
import org.mage.plugins.card.utils.ImagePanel;
|
||||||
import org.mage.plugins.card.utils.impl.ImageManagerImpl;
|
import org.mage.plugins.card.utils.impl.ImageManagerImpl;
|
||||||
|
|
||||||
|
|
@ -558,10 +557,6 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void mouseClicked(MouseEvent e) {
|
public void mouseClicked(MouseEvent e) {
|
||||||
data.component = this;
|
|
||||||
data.card = this.gameCard;
|
|
||||||
data.gameId = this.gameId;
|
|
||||||
callback.mouseClicked(e, data);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
@ -602,7 +597,12 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void mousePressed(MouseEvent e) {}
|
public void mousePressed(MouseEvent e) {
|
||||||
|
data.component = this;
|
||||||
|
data.card = this.gameCard;
|
||||||
|
data.gameId = this.gameId;
|
||||||
|
callback.mousePressed(e, data);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void mouseReleased(MouseEvent e) {}
|
public void mouseReleased(MouseEvent e) {}
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,10 @@ public class RateCallback implements ActionCallback {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void mouseClicked(MouseEvent arg0, TransferData arg1) {
|
public void mouseClicked(MouseEvent arg0, TransferData arg1) {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void mousePressed(MouseEvent arg0, TransferData arg1) {
|
||||||
this.callback.reportResult(card1, card2);
|
this.callback.reportResult(card1, card2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -75,8 +75,6 @@ public class RateFrame extends JFrame {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
add(rate);
|
add(rate);
|
||||||
|
|
||||||
System.out.println("test");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void startRating() {
|
public void startRating() {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue