Ver Fonte

multiple ojbject drag fix

Kevin Trometer há 8 anos atrás
pai
commit
3826bb96c1
1 ficheiros alterados com 8 adições e 6 exclusões
  1. 8 6
      src/ui/view/MyCanvas.java

+ 8 - 6
src/ui/view/MyCanvas.java

@@ -381,11 +381,6 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 			}
 			}
 		}
 		}
 		
 		
-		if (!e.isControlDown() && dragged == false && tempCps != null) {
-			model.getSelectedCpsObjects().clear();
-			controller.addSelectedObject(tempCps);
-		}
-		
 		// Edge Selection
 		// Edge Selection
 		if (tempCps == null) {
 		if (tempCps == null) {
 			edgeHighlight = mousePositionOnEdge(x, y);
 			edgeHighlight = mousePositionOnEdge(x, y);
@@ -423,8 +418,15 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 				ex.printStackTrace();
 				ex.printStackTrace();
 			}
 			}
 		}
 		}
-		dragged = false;
+		
 
 
+		if (!e.isControlDown() && dragged == false && tempCps != null) {
+			model.getSelectedCpsObjects().clear();
+			controller.addSelectedObject(tempCps);
+		}
+		
+		dragged = false;
+		
 		// Rightclick List
 		// Rightclick List
 		if (e.getButton() == MouseEvent.BUTTON3) {
 		if (e.getButton() == MouseEvent.BUTTON3) {
 			if (e.getButton() == MouseEvent.BUTTON3 && tempCps != null) {
 			if (e.getButton() == MouseEvent.BUTTON3 && tempCps != null) {