From 5d252cfc779cdffe4e4f79799c138023621faaed Mon Sep 17 00:00:00 2001 From: Brendan Robert Date: Wed, 20 May 2015 23:14:30 -0500 Subject: [PATCH 1/4] fixed incorrectly implemented debounce logic --- .../org/badvision/outlaweditor/apple/AppleTileEditor.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/apple/AppleTileEditor.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/apple/AppleTileEditor.java index 2e4ef1bb..943a0f00 100644 --- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/apple/AppleTileEditor.java +++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/apple/AppleTileEditor.java @@ -12,7 +12,6 @@ import javafx.scene.shape.Rectangle; import javafx.scene.shape.Shape; import org.badvision.outlaweditor.Platform; import org.badvision.outlaweditor.TileEditor; -import org.badvision.outlaweditor.data.DataObserver; import org.badvision.outlaweditor.data.xml.Tile; import org.badvision.outlaweditor.data.TileUtils; @@ -24,6 +23,7 @@ public class AppleTileEditor extends TileEditor { FillPattern currentPattern = FillPattern.DarkViolet1; DrawMode drawMode = DrawMode.Toggle; + public static final long SAFE_WAIT_TIME = 100; @Override public void setEntity(Tile t) { @@ -74,6 +74,7 @@ public class AppleTileEditor extends TileEditor { } int lastActionX = -1; int lastActionY = -1; + long debounceTime = 0; public void performDragAction(int x, int y) { performAction(false, x, y); @@ -82,9 +83,10 @@ public class AppleTileEditor extends TileEditor { private void performAction(boolean alt, int x, int y) { y = Math.min(Math.max(y, 0), 15); x = Math.min(Math.max(x, 0), 13); - if (lastActionX == x && lastActionY == y) { + if ((lastActionX == x && lastActionY == y) && (debounceTime > System.currentTimeMillis())) { return; } + debounceTime = System.currentTimeMillis() + SAFE_WAIT_TIME; lastActionX = x; lastActionY = y; switch (drawMode) { From 7541cf4a52bbd3936cf90f34917f4b01f0c4a68e Mon Sep 17 00:00:00 2001 From: Brendan Robert Date: Wed, 20 May 2015 23:15:15 -0500 Subject: [PATCH 2/4] Moved left arrow over so it doesn't overlap scripts pane --- OutlawEditor/src/main/resources/mapEditorTab.fxml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OutlawEditor/src/main/resources/mapEditorTab.fxml b/OutlawEditor/src/main/resources/mapEditorTab.fxml index 30031305..ff2252c1 100644 --- a/OutlawEditor/src/main/resources/mapEditorTab.fxml +++ b/OutlawEditor/src/main/resources/mapEditorTab.fxml @@ -68,7 +68,7 @@