X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.diagram%2Fsrc%2Forg%2Fsimantics%2Fdiagram%2Fparticipant%2FConnectTool2.java;h=09adef2c8088ebb9f6527627c228d4544244c660;hb=8ded56d0a440f78cbf649b1e59b8a464e8650fdc;hp=b77a2894714b72512c5925ea7b6379fc6e17c382;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/participant/ConnectTool2.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/participant/ConnectTool2.java
index b77a28947..09adef2c8 100644
--- a/bundles/org.simantics.diagram/src/org/simantics/diagram/participant/ConnectTool2.java
+++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/participant/ConnectTool2.java
@@ -37,7 +37,6 @@ import org.simantics.db.common.request.WriteRequest;
 import org.simantics.db.common.utils.NameUtils;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.diagram.connection.RouteGraph;
-import org.simantics.diagram.connection.RouteGraphConnectionClass;
 import org.simantics.diagram.connection.RouteLine;
 import org.simantics.diagram.connection.RouteTerminal;
 import org.simantics.diagram.connection.delta.RouteGraphDelta;
@@ -79,6 +78,7 @@ import org.simantics.g2d.elementclass.BranchPoint;
 import org.simantics.g2d.elementclass.BranchPoint.Direction;
 import org.simantics.g2d.elementclass.FlagClass;
 import org.simantics.g2d.elementclass.FlagHandler;
+import org.simantics.g2d.elementclass.RouteGraphConnectionClass;
 import org.simantics.g2d.participant.RenderingQualityInteractor;
 import org.simantics.g2d.participant.TransformUtil;
 import org.simantics.g2d.utils.geom.DirectionSet;
@@ -90,6 +90,7 @@ import org.simantics.scenegraph.g2d.events.KeyEvent.KeyPressedEvent;
 import org.simantics.scenegraph.g2d.events.MouseEvent;
 import org.simantics.scenegraph.g2d.events.MouseEvent.MouseButtonEvent;
 import org.simantics.scenegraph.g2d.events.MouseEvent.MouseButtonPressedEvent;
+import org.simantics.scenegraph.g2d.events.MouseEvent.MouseButtonReleasedEvent;
 import org.simantics.scenegraph.g2d.events.MouseEvent.MouseMovedEvent;
 import org.simantics.scenegraph.g2d.events.command.CommandEvent;
 import org.simantics.scenegraph.g2d.events.command.Commands;
@@ -520,6 +521,10 @@ public class ConnectTool2 extends AbstractMode {
         if (me instanceof MouseButtonPressedEvent)
             return processMouseButtonPress((MouseButtonPressedEvent) me);
 
+        // #7653: Support creating connections between terminals without lifting mouse button in between.
+        if (me instanceof MouseButtonReleasedEvent)
+            return processMouseButtonRelease((MouseButtonReleasedEvent) me);
+
         return false;
     }
 
@@ -572,6 +577,7 @@ public class ConnectTool2 extends AbstractMode {
             }
         } else {
             RouteGraphTarget cp = RouteGraphConnectTool.pickRouteGraphConnection(
+                    getContext(),
                     diagram,
                     pi.getCanvasPickShape(me.controlPosition),
                     pi.getPickDistance());
@@ -596,6 +602,7 @@ public class ConnectTool2 extends AbstractMode {
                     attachToConnectionJudgement = canConnect.first;
                     controlPoints.getLast().setPosition(ti.posDia).setAttachedToTerminal(ti);
                     endTerminal = ti;
+                    startTerminal = canConnect.second;
                     cp.getNode().showBranchPoint(isectPos);
                     if (!endWithoutTerminal(lastMouseCanvasPos, shouldEndWithFlag(me)))
                         updateSG();
@@ -662,15 +669,7 @@ public class ConnectTool2 extends AbstractMode {
             if (snapAdvisor != null)
                 snapAdvisor.snap(mouseCanvasPos);
 
-            if (isEndTerminalDefined() && connectionJudgment != null) {
-                // Clicked on an allowed end terminal. End connection & end mode.
-                createConnection();
-                remove();
-                return true;
-            } else if (lastRouteGraphTarget != null && attachToConnectionJudgement != null) {
-                lastRouteGraphTarget.getNode().showBranchPoint(null);
-                attachToConnection();
-                remove();
+            if (tryEndConnection()) {
                 return true;
             } else {
                 // Finish connection in thin air only if the
@@ -710,6 +709,33 @@ public class ConnectTool2 extends AbstractMode {
         return false;
     }
 
+    private int mouseLeftReleaseCount = 0;
+
+    protected boolean processMouseButtonRelease(MouseButtonReleasedEvent me) {
+        if (me.button == MouseEvent.LEFT_BUTTON
+                && ++mouseLeftReleaseCount == 1) {
+            return tryEndConnection();
+        }
+        return false;
+    }
+
+    /**
+     * @return <code>true</code> if connection was successfully ended
+     */
+    private boolean tryEndConnection() {
+        if (isEndTerminalDefined() && connectionJudgment != null) {
+            createConnection();
+            remove();
+            return true;
+        } else if (lastRouteGraphTarget != null && attachToConnectionJudgement != null) {
+            lastRouteGraphTarget.getNode().showBranchPoint(null);
+            attachToConnection();
+            remove();
+            return true;
+        }
+        return false;
+    }
+
     private void attachToConnection() {
         ConnectionJudgement judgment = this.attachToConnectionJudgement;
         if (judgment == null) {