Browse Source

dnd canvas works again

Kevin Trometer 8 years ago
parent
commit
660bae8a6b

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


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


BIN
bin/ui/view/GUI.class


BIN
bin/ui/view/MyCanvas.class


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

@@ -162,7 +162,6 @@ public class GUI implements CategoryListener {
 		splitPane_2.setDividerLocation(200);
 
 		splitPane.setLeftComponent(scrollPane_1);
-		tree.setEditable(true);
 		
 		Icon icon = new ImageIcon(new ImageIcon(this.getClass().getResource("/Images/Dummy_House.png")).getImage().getScaledInstance(30, 30, java.awt.Image.SCALE_SMOOTH));
 		DefaultTreeCellRenderer renderer = (DefaultTreeCellRenderer)tree.getCellRenderer();

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

@@ -70,7 +70,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener
 		for (CpsObject cps : choords){
     		int cx = cps.getPos().x;
     		int cy = cps.getPos().y;
-    		if (x<=cx && y<=cy && x+30>=cx && y+30>= cy) {
+    		if (x-img.getWidth(null)<=cx && y-img.getHeight(null) <=cy&& x+img.getWidth(null)>=cx && y+img.getHeight(null)>= cy) {
 				tempCPS = cps;
 				dragging = true;
 			}