Browse Source

selection fix - select multiple objects with control

Kevin Trometer 8 years ago
parent
commit
16c4838a8f
2 changed files with 7 additions and 2 deletions
  1. 0 1
      src/ui/view/GUI.java
  2. 7 1
      src/ui/view/MyCanvas.java

+ 0 - 1
src/ui/view/GUI.java

@@ -1306,7 +1306,6 @@ public class GUI<E> implements CategoryListener {
 		canvas.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mousePressed(MouseEvent e) {
-				selectedElements.clear();
 				holonEleNamesDisplayed = Languages.getLanguage()[25];
 				// If any empty space is clicked
 				if (temp == null || temp.getID() != model.getSelectedObjectID()) {

+ 7 - 1
src/ui/view/MyCanvas.java

@@ -642,7 +642,13 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 				controller.addTextToConsole(", ID:", Color.BLACK, 12, false, false, false);
 				controller.addTextToConsole("" + cps.getID(), Color.RED, 12, true, false, true);
 				dragging = true;
-				controller.setSelectedObjectID(tempCps.getID());
+				if (e.isControlDown() && tempCps != null) {
+					if (model.getSelectedCpsObjects().contains(tempCps)) {
+						controller.deleteSelectedObject(tempCps);
+					} else {
+						controller.addSelectedObject(tempCps);
+					}
+				}
 				// If drawing an Edge (CTRL down)
 				if (tempCps.getClass() == HolonObject.class) {
 					HolonObject tempObj = ((HolonObject) tempCps);