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

- Some cleanup in targeting overlay code.

Browse Source
This commit is contained in:
Agetian
2017-01-25 14:38:54 +00:00
parent b45ae80f6e
commit a37cbc2d14
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-gui-desktop/src/main/java/forge/screens/match/TargetingOverlay.java
View File

@@ -124,8 +124,8 @@ public class TargetingOverlay {
} }
} }
if (!assembler.getIsListening() && matchUI != null && matchUI.getFieldViews() != null) { if (!assembler.isListening() && matchUI != null && matchUI.getFieldViews() != null) {
assembler.setIsListening(true); assembler.setListening(true);
for (final VField f : matchUI.getFieldViews()) { for (final VField f : matchUI.getFieldViews()) {
f.getTabletop().addLayoutListener(assembler); f.getTabletop().addLayoutListener(assembler);
f.getTabletop().addCardPanelMouseListener(assembler); f.getTabletop().addCardPanelMouseListener(assembler);
@@ -493,8 +493,8 @@ public class TargetingOverlay {
// (because CardPanelContainers aren't ready at that point) // (because CardPanelContainers aren't ready at that point)
private boolean isListening = false; private boolean isListening = false;
private boolean isDragged = false; private boolean isDragged = false;
public boolean getIsListening() { return isListening; } public boolean isListening() { return isListening; }
public void setIsListening(boolean listening) { isListening = listening; } public void setListening(boolean listening) { isListening = listening; }
private void assembleAndRepaint() { private void assembleAndRepaint() {
if (isDragged) { return; } if (isDragged) { return; }

7
forge-gui-desktop/src/main/java/forge/view/arcane/CardArea.java
View File

@@ -57,7 +57,6 @@ public class CardArea extends CardPanelContainer implements CardPanelMouseListen
private int actualCardsPerRow; private int actualCardsPerRow;
private int mouseDragStartX; private int mouseDragStartX;
private int mouseDragStartY; private int mouseDragStartY;
private boolean isDragged;
private boolean isVertical; private boolean isVertical;
private boolean hasScrollbars; private boolean hasScrollbars;
@@ -223,9 +222,7 @@ public class CardArea extends CardPanelContainer implements CardPanelMouseListen
this.getParent().validate(); this.getParent().validate();
} }
if (!isDragged) { super.doLayout();
super.doLayout();
}
} }
@Override @Override
@@ -240,7 +237,6 @@ public class CardArea extends CardPanelContainer implements CardPanelMouseListen
@Override @Override
public final void mouseDragStart(final CardPanel dragPanel, final MouseEvent evt) { public final void mouseDragStart(final CardPanel dragPanel, final MouseEvent evt) {
this.isDragged = true;
super.setDragged(true); super.setDragged(true);
super.mouseDragStart(dragPanel, evt); super.mouseDragStart(dragPanel, evt);
@@ -290,7 +286,6 @@ public class CardArea extends CardPanelContainer implements CardPanelMouseListen
@Override @Override
public final void mouseDragEnd(final CardPanel dragPanel, final MouseEvent evt) { public final void mouseDragEnd(final CardPanel dragPanel, final MouseEvent evt) {
this.isDragged = false;
super.setDragged(false); super.setDragged(false);
super.mouseDragEnd(dragPanel, evt); super.mouseDragEnd(dragPanel, evt);