From a37cbc2d1458c5a6b8f64bf7f4b96a544bcb55cd Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Wed, 25 Jan 2017 14:38:54 +0000
Subject: [PATCH] - Some cleanup in targeting overlay code.

---
 .../main/java/forge/screens/match/TargetingOverlay.java   | 8 ++++----
 .../src/main/java/forge/view/arcane/CardArea.java         | 7 +------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/TargetingOverlay.java b/forge-gui-desktop/src/main/java/forge/screens/match/TargetingOverlay.java
index 1cfc4a40984..099e3dac459 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/match/TargetingOverlay.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/TargetingOverlay.java
@@ -124,8 +124,8 @@ public class TargetingOverlay {
             }
         }
 
-        if (!assembler.getIsListening() && matchUI != null && matchUI.getFieldViews() != null) {
-            assembler.setIsListening(true);
+        if (!assembler.isListening() && matchUI != null && matchUI.getFieldViews() != null) {
+            assembler.setListening(true);
             for (final VField f : matchUI.getFieldViews()) {
                 f.getTabletop().addLayoutListener(assembler);
                 f.getTabletop().addCardPanelMouseListener(assembler);
@@ -493,8 +493,8 @@ public class TargetingOverlay {
         // (because CardPanelContainers aren't ready at that point)
 	    private boolean isListening = false;
         private boolean isDragged = false;
-	    public boolean getIsListening() { return isListening; }
-	    public void setIsListening(boolean listening) { isListening = listening; }
+	    public boolean isListening() { return isListening; }
+	    public void setListening(boolean listening) { isListening = listening; }
 
         private void assembleAndRepaint() {
             if (isDragged) { return; }
diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/CardArea.java b/forge-gui-desktop/src/main/java/forge/view/arcane/CardArea.java
index 44b5861f87e..ae6daa21871 100644
--- a/forge-gui-desktop/src/main/java/forge/view/arcane/CardArea.java
+++ b/forge-gui-desktop/src/main/java/forge/view/arcane/CardArea.java
@@ -57,7 +57,6 @@ public class CardArea extends CardPanelContainer implements CardPanelMouseListen
     private int actualCardsPerRow;
     private int mouseDragStartX;
     private int mouseDragStartY;
-    private boolean isDragged;
     private boolean isVertical;
     private boolean hasScrollbars;
 
@@ -223,9 +222,7 @@ public class CardArea extends CardPanelContainer implements CardPanelMouseListen
             this.getParent().validate();
         }
 
-        if (!isDragged) {
-            super.doLayout();
-        }
+        super.doLayout();
     }
 
     @Override
@@ -240,7 +237,6 @@ public class CardArea extends CardPanelContainer implements CardPanelMouseListen
 
     @Override
     public final void mouseDragStart(final CardPanel dragPanel, final MouseEvent evt) {
-        this.isDragged = true;
         super.setDragged(true);
 
         super.mouseDragStart(dragPanel, evt);
@@ -290,7 +286,6 @@ public class CardArea extends CardPanelContainer implements CardPanelMouseListen
 
     @Override
     public final void mouseDragEnd(final CardPanel dragPanel, final MouseEvent evt) {
-        this.isDragged = false;
         super.setDragged(false);
 
         super.mouseDragEnd(dragPanel, evt);