external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mouseover and click problem in hand area fixed.

Browse Source
This commit is contained in:
Doublestrike
2011-11-30 01:50:46 +00:00
parent acf376d3f7
commit 0431c91bf8
2 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/forge/control/match/ControlHand.java
View File

@@ -21,6 +21,9 @@ import java.awt.Point;
import java.awt.Rectangle;
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseMotionAdapter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -35,6 +38,7 @@ import arcane.ui.util.Animation;
import forge.AllZone;
import forge.Card;
import forge.GuiDisplay;
import forge.Constant.Zone;
import forge.PlayerZone;
import forge.view.match.ViewHand;
@@ -63,7 +67,7 @@ public class ControlHand {
/** Adds observers to hand panel. */
public void addObservers() {
final ViewTopLevel t = (ViewTopLevel) AllZone.getDisplay(); // asdf NECESSARY?
final ViewTopLevel t = (ViewTopLevel) AllZone.getDisplay();
AllZone.getHumanPlayer().getZone(Zone.Hand).addObserver(new Observer() {
@Override
@@ -124,14 +128,33 @@ public class ControlHand {
});
}
/** Adds listeners to hand panel: window resize, etc. */
/** Adds listeners to hand panel: clicks, mouseover, etc. */
public void addListeners() {
this.view.addComponentListener(new ComponentAdapter() {
final ViewTopLevel t = (ViewTopLevel) AllZone.getDisplay();
view.getHandArea().addMouseListener(new MouseAdapter() {
// Card click
@Override
public void componentResized(final ComponentEvent e) {
// Ensures cards in hand scale properly with parent.
//ControlHand.this.view.refreshLayout();
public void mousePressed(final MouseEvent e) {
if (e.getButton() != MouseEvent.BUTTON1) {
return;
}
final Card c = view.getHandArea().getCardFromMouseOverPanel();
if (c != null) {
t.getInputController().getInputControl().selectCard(c, AllZone.getHumanPlayer().getZone(Zone.Hand));
}
}
});
view.getHandArea().addMouseMotionListener(new MouseMotionAdapter() {
// Card mouseover
@Override
public void mouseMoved(final MouseEvent me) {
final Card c = view.getHandArea().getCardFromMouseOverPanel();
if (c != null) {
t.setCard(c);
}
} // mouseMoved
});
}

4
src/main/java/forge/view/match/ViewTopLevel.java
View File

@@ -514,9 +514,7 @@ public class ViewTopLevel extends FPanel implements Display {
* @return a {@link forge.Card} object.
*/
public final Card getCard() {
System.err.println("ViewTopLevel > getCard: Something should happen here!");
new Exception().printStackTrace();
return null; // new Card(); //detail.getCard();
return this.getCardviewerController().getCurrentCard();
}
/**