philippe.lhardy/artloglaby
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

When drawing a path within maze, restart a newline after 200ms delay

Browse Source 
- 200 ms is hardcoded for gragTimeout
- when drawing a line and wanting to start a new line, it is enough to wait dragDelay wihout move
This commit is contained in:
philippe lhardy
2020-10-19 21:58:05 +02:00
parent c69d068caf
commit 1a7e64c139
1 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
java/org/artisanlogiciel/games/maze/gui/Display.java
View File

@@ -17,6 +17,7 @@ import java.awt.event.InputEvent;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.event.MouseMotionListener; import java.awt.event.MouseMotionListener;
import java.io.*; import java.io.*;
import java.util.Date;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.Locale; import java.util.Locale;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -821,6 +822,10 @@ public class Display extends JFrame {
int gX = -1; int gX = -1;
int gY = -1; int gY = -1;
Date lastDrag = null;
// FIXME HARCDODED delay after which a draging to draw a continous line is ended, a new line will then start.
long dragTimeout = 200;
// not set by default for debug, will show any path // not set by default for debug, will show any path
boolean showAll = false; boolean showAll = false;
@@ -833,14 +838,33 @@ public class Display extends JFrame {
@Override @Override
public void mouseDragged(MouseEvent e) { public void mouseDragged(MouseEvent e) {
boolean add = ((e.getModifiersEx() & InputEvent.BUTTON1_DOWN_MASK) != 0);
Position newPosition = getPosition(e.getX(), e.getY());
Date now = new Date(System.currentTimeMillis());
if (lastDrag == null )
{
drawingPath = null;
}
else
{
if ( now.getTime() - lastDrag.getTime() > dragTimeout )
{
drawingPath = null;
addStatus("move timeout");
}
}
lastDrag = now;
addPosition(newPosition,add);
}
public void addPosition(Position newPosition, boolean add ) {
// should find the cell ... // should find the cell ...
DirectionPosition last = null; DirectionPosition last = null;
short path = 0; short path = 0;
Position newPosition = getPosition(e.getX(), e.getY());
if (drawingPath == null) { if (drawingPath == null) {
drawingPath = new LinkedList<>(); drawingPath = new LinkedList<>();
last = new DirectionPosition((short) 0, newPosition); last = new DirectionPosition((short) 0, newPosition);
addStatus("Mouse dragged Cell " + newPosition + " Button " + e.getModifiersEx() + " " + InputEvent.BUTTON1_DOWN_MASK); addStatus("Mouse dragged Cell " + newPosition + " Button " + add );
drawingPath.addLast(last); drawingPath.addLast(last);
} else { } else {
// setShowAll(true); // setShowAll(true);
@@ -851,7 +875,7 @@ public class Display extends JFrame {
path = LabyModel.getDirection(last.getPosition(), newPosition); path = LabyModel.getDirection(last.getPosition(), newPosition);
last.setDirection(path); last.setDirection(path);
// button 1 : add direction; button 2 : replace with direction. // button 1 : add direction; button 2 : replace with direction.
if ((e.getModifiersEx() & InputEvent.BUTTON1_DOWN_MASK) != 0) { if (add) {
map.addDirection(last.getPosition().getX(), last.getPosition().getY(), path); map.addDirection(last.getPosition().getX(), last.getPosition().getY(), path);
} else { } else {
map.setDirection(last.getPosition().getX(), last.getPosition().getY(), path); map.setDirection(last.getPosition().getX(), last.getPosition().getY(), path);
@@ -859,7 +883,7 @@ public class Display extends JFrame {
last = last.moveToAdjacentDirection(); last = last.moveToAdjacentDirection();
drawingPath.addLast(last); drawingPath.addLast(last);
} }
addStatus("Mouse dragged from Cell " + first.getPosition() + "To" + newPosition + " Button " + e.getModifiersEx() + " " + InputEvent.BUTTON1_DOWN_MASK); addStatus("Mouse dragged from Cell " + first.getPosition() + "To" + newPosition + " Button " + add );
} }
changed(null, null, map); changed(null, null, map);
} }