BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-13 02:32:09 +10:00
Code Issues Packages Projects Releases Wiki Activity

orthogonal shift drag

Browse Source
This commit is contained in:
Bane Stojkovic
2026-10-10 12:57:35 +02:00
parent 33b614c7ff
commit 6e4cd6bf8c
6 changed files with 141 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/canvas/CanvasDragGestureListener.java
+2 -1
View File
@@ -54,7 +54,8 @@ class CanvasDragGestureListener implements DragGestureListener {
forceReSelection = me.getButton() != MouseEvent.BUTTON1;
}
canvasPanel.setClickInProgress(false);
presenter.dragStarted(dge.getDragOrigin(), dge.getDragAction(), forceReSelection);
presenter.dragStarted(dge.getDragOrigin(), dge.getDragAction(), forceReSelection,
e.isShiftDown());
// Get the appropriate cursor from the presenter (e.g., HAND_CURSOR over components)
// Preserve the cursor context (HAND_CURSOR, CROSSHAIR_CURSOR, etc.) for drag operations
// On Linux, DEFAULT_CURSOR during drag can show "No" cursor, so use MOVE_CURSOR as fallback
diylc/diylc-swing/src/test/java/org/diylc/PresenterTests.java
+55 -2
View File
@@ -1,6 +1,7 @@
package org.diylc;
import java.awt.Point;
import java.awt.geom.Point2D;
import java.io.IOException;
import java.util.ArrayList;
import java.util.EnumSet;
@@ -17,6 +18,7 @@ import org.diylc.common.ComponentType;
import org.diylc.common.EventType;
import org.diylc.common.IPlugIn;
import org.diylc.common.IPlugInPort;
import org.diylc.core.IDIYComponent;
import org.diylc.core.Template;
import org.diylc.presenter.Presenter;
import org.diylc.swing.ActionFactory;
@@ -101,7 +103,7 @@ public class PresenterTests extends TestBase {
Assert.assertNotNull(receivedTooltip[0]);
// Start drag - should hide tooltip
presenter.dragStarted(new Point(1000, 1000), java.awt.dnd.DnDConstants.ACTION_MOVE, false);
presenter.dragStarted(new Point(1000, 1000), java.awt.dnd.DnDConstants.ACTION_MOVE, false, false);
Assert.assertNull(receivedTooltip[0]);
// End drag
@@ -221,7 +223,58 @@ public class PresenterTests extends TestBase {
treeModel.refresh();
Assert.assertTrue(presenter.getVisibleComponentTypes().containsKey("Tubes"));
}
@Test
public void testShiftDragLocksAxis() {
instantiateTwoClick("Passive", "Resistor", new Point(1000, 1000), new Point(1200, 1000));
IDIYComponent<?> resistor = presenter.getCurrentProject().getComponents().get(0);
Point2D start = new Point2D.Double(resistor.getControlPoint(1).getX(), resistor.getControlPoint(1).getY());
// hovering a control point of the selected component arms it for dragging
presenter.mouseMoved(new Point(1200, 1000), false, false, false);
presenter.dragStarted(new Point(1200, 1000), java.awt.dnd.DnDConstants.ACTION_MOVE, false, true);
// mostly horizontal gesture locks the horizontal axis
presenter.dragOver(new Point(1300, 1030));
Assert.assertTrue(resistor.getControlPoint(1).getX() > start.getX());
Assert.assertEquals(start.getY(), resistor.getControlPoint(1).getY());
// the axis holds for the rest of the drag even when the cursor swings toward the vertical
presenter.dragOver(new Point(1300, 1200));
Assert.assertEquals(start.getY(), resistor.getControlPoint(1).getY());
presenter.dragEnded(new Point(1300, 1200));
}
@Test
public void testDragWithoutShiftIsFree() {
instantiateTwoClick("Passive", "Resistor", new Point(1000, 1000), new Point(1200, 1000));
IDIYComponent<?> resistor = presenter.getCurrentProject().getComponents().get(0);
Point2D start = new Point2D.Double(resistor.getControlPoint(1).getX(), resistor.getControlPoint(1).getY());
presenter.mouseMoved(new Point(1200, 1000), false, false, false);
presenter.dragStarted(new Point(1200, 1000), java.awt.dnd.DnDConstants.ACTION_MOVE, false, false);
presenter.dragOver(new Point(1300, 1100));
Assert.assertTrue(resistor.getControlPoint(1).getX() > start.getX());
Assert.assertTrue(resistor.getControlPoint(1).getY() > start.getY());
presenter.dragEnded(new Point(1300, 1100));
}
@Test
public void testShiftLocksAxisWhilePlacing() {
Map<String, List<ComponentType>> componentTypes = presenter.getComponentTypes();
ComponentType resistorType = componentTypes.get("Passive").stream()
.filter(x -> x.getName().equals("Resistor")).findFirst().get();
presenter.setNewComponentTypeSlot(resistorType, null, null, false);
presenter.mouseClicked(new Point(1000, 1000), IPlugInPort.BUTTON1, false, false, false, 1);
presenter.mouseMoved(new Point(1030, 1200), false, true, false);
presenter.mouseClicked(new Point(1030, 1200), IPlugInPort.BUTTON1, false, true, false, 1);
Assert.assertEquals(1, presenter.getCurrentProject().getComponents().size());
IDIYComponent<?> resistor = presenter.getCurrentProject().getComponents().get(0);
Assert.assertEquals(resistor.getControlPoint(0).getX(), resistor.getControlPoint(1).getX());
Assert.assertTrue(resistor.getControlPoint(1).getY() > resistor.getControlPoint(0).getY());
}
// @Test
// public void testLoadVariants() {
// try {