Browse Source

on Canvas operations verbessert

Kevin Trometer 8 years ago
parent
commit
f4fc0fe299

BIN
bin/ui/view/GUI$1.class


BIN
bin/ui/view/GUI$2.class


BIN
bin/ui/view/GUI$3.class


BIN
bin/ui/view/GUI$4.class


BIN
bin/ui/view/GUI$5.class


BIN
bin/ui/view/GUI$6.class


BIN
bin/ui/view/GUI.class


BIN
bin/ui/view/MyCanvas.class


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

@@ -223,6 +223,8 @@ public class GUI implements CategoryListener {
 							if (imgR != null) {
 								label.setIcon(new ImageIcon(imgR));
 							}
+						} else {
+							
 						}
 					}
 				}

+ 15 - 13
src/ui/view/MyCanvas.java

@@ -42,7 +42,6 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				model.getObjectsOnCanvas().remove(tempCps);
-				dropDelete = false;
 				repaint();
 			}
 		});
@@ -88,20 +87,21 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 		// TODO Auto-generated method stub
 		x = e.getX();
 		y = e.getY();
-		dropDelete = false;
+		tempCps = null;
 		for (CpsObject cps : model.getObjectsOnCanvas()) {
 			int cx = cps.getPos().x;
 			int cy = cps.getPos().y;
 			if (x - img.getWidth(null) <= cx && y - img.getHeight(null) <= cy && x + img.getWidth(null) >= cx
 					&& y + img.getHeight(null) >= cy) {
 				tempCps = cps;
-				if (e.getButton() == e.BUTTON1) {
-					dragging = true;
-				} else {
-					dropDelete = true;
-				}
 			}
 		}
+		if (e.getButton() == e.BUTTON3 && tempCps != null) {
+			itemDelete.setEnabled(true);
+		}else {
+			itemDelete.setEnabled(false);
+		}
+		
 	}
 
 	@Override
@@ -116,7 +116,6 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 		}
 		// Rechtsklick Liste
 		if (e.getButton() == e.BUTTON3) {
-			if (dropDelete)itemDelete.setEnabled(true);
 			popmenu.show(e.getComponent(), e.getX(), e.getY());
 
 		}
@@ -125,11 +124,14 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 	@Override
 	public void mouseDragged(MouseEvent e) {
 		// TODO Auto-generated method stub
-		if (dragging) {
-			tempCps.setPos(e.getX() - 15, e.getY() - 15);
-			repaint();
-			System.out.println("drag: " + e.getX() + " " + e.getY());
-		}
+			try {
+				tempCps.setPos(e.getX() - 15, e.getY() - 15);
+				dragging = true;
+				repaint();
+				System.out.println("drag: " + e.getX() + " " + e.getY());
+			} catch (Exception e2) {
+				// TODO: handle exception
+			}
 	}
 
 	@Override