|
@@ -34,6 +34,8 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
|
|
|
private int y = 0;
|
|
|
private Model model;
|
|
|
private final Control controller;
|
|
|
+ private int cx;
|
|
|
+ private int cy;
|
|
|
|
|
|
boolean dragging = false;
|
|
|
boolean dropDelete = false;
|
|
@@ -112,8 +114,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
|
|
|
// TODO Auto-generated method stub
|
|
|
x = e.getX();
|
|
|
y = e.getY();
|
|
|
- int cx;
|
|
|
- int cy;
|
|
|
+
|
|
|
tempCps = null;
|
|
|
//Object Selection
|
|
|
for (CpsObject cps : model.getObjectsOnCanvas()) {
|
|
@@ -123,7 +124,8 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
|
|
|
tempCps = cps;
|
|
|
}
|
|
|
}
|
|
|
- //Object Selection Highlighting ( selectRect)
|
|
|
+
|
|
|
+ //Object Selection Highlighting (selectRect)
|
|
|
objectSelectionHighlighting();
|
|
|
|
|
|
repaint();
|
|
@@ -134,6 +136,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
|
|
|
if (dragging) {
|
|
|
x = e.getX();
|
|
|
y = e.getY();
|
|
|
+
|
|
|
dragging = false;
|
|
|
tempCps.setPos(e.getX() - GlobalVariables.SCALE/2, e.getY() - GlobalVariables.SCALE/2);
|
|
|
tempCps = null;
|
|
@@ -169,8 +172,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
|
|
|
public void mouseMoved(MouseEvent e) {
|
|
|
x = e.getX();
|
|
|
y = e.getY();
|
|
|
- int cx;
|
|
|
- int cy;
|
|
|
+
|
|
|
boolean on = false;
|
|
|
for (CpsObject cps : model.getObjectsOnCanvas()) {
|
|
|
cx = cps.getPos().x;
|