xavi
/
speed-dreams
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

trackeditor: delete object with Shift + left mouse button press 

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9243 30fe4595-0a0c-4342-8851-515496e4dcbd
This commit is contained in:
iobyte 2024-01-13 18:21:36 +00:00
parent 2be6983966
commit 3b40c6c2f4
2 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/tools/trackeditor/gui/view/CircuitView.java
View File

@ -713,7 +713,7 @@ public class CircuitView extends JComponent implements KeyListener, MouseListene
objectDragging = true;
objectShape = (ObjShapeObject) obj;
Undo.add(new UndoEditObject(findObjectMap(objectShape), objectShape));
Point2D.Double real = new Point2D.Double(0, 0);
screenToReal(e, real);
objectOffset.setLocation(objectShape.getTrackLocation().x - real.x, objectShape.getTrackLocation().y - real.y);
@ -727,7 +727,7 @@ public class CircuitView extends JComponent implements KeyListener, MouseListene
if (graphicObject.getShape() == objectShape)
{
Undo.add(new UndoEditGraphicObject(editorFrame.getGraphicObjects(), graphicObject));
Point2D.Double real = new Point2D.Double(0, 0);
screenToReal(e, real);
objectOffset.setLocation(objectShape.getTrackLocation().x - real.x, objectShape.getTrackLocation().y - real.y);
@ -774,9 +774,43 @@ public class CircuitView extends JComponent implements KeyListener, MouseListene
if (selectedShape != null)
{
if (showObjects && (selectedShape.getType().equals("str") || selectedShape.getType().equals("lft") || selectedShape.getType().equals("rgt")))
if (showObjects &&
(selectedShape.getType().equals("str") || selectedShape.getType().equals("lft") || selectedShape.getType().equals("rgt")) ||
(e.isShiftDown() && (selectedShape.getType().equals("object") || selectedShape.getType().equals("graphic object"))))
{
noObjectSelected(e);
if (selectedShape.getType().equals("str") || selectedShape.getType().equals("lft") || selectedShape.getType().equals("rgt"))
{
noObjectSelected(e);
}
else if (selectedShape.getType().equals("object"))
{
objectDragging = false;
objectShape = (ObjShapeObject) selectedShape;
Undo.add(new UndoDeleteObject(findObjectMap(objectShape), objectShape));
findObjectMap(objectShape).removeObject(objectShape);
selectedShape = null;
objectShape = null;
invalidate();
repaint();
editorFrame.documentIsModified = true;
}
else if (selectedShape.getType().equals("graphic object"))
{
for (GraphicObject graphicObject : editorFrame.getGraphicObjects())
{
if (graphicObject.getShape() == selectedShape)
{
objectDragging = false;
Undo.add(new UndoDeleteGraphicObject(editorFrame.getGraphicObjects(), graphicObject));
editorFrame.getGraphicObjects().remove(graphicObject);
selectedShape = null;
invalidate();
repaint();
editorFrame.documentIsModified = true;
break;
}
}
}
}
else
{

2
src/tools/trackeditor/utils/Properties.java
View File

@ -34,7 +34,7 @@ public class Properties
private static Properties instance = new Properties();
private Vector<ActionListener> propertiesListeners = new Vector<ActionListener>();
public final String title = "sd2-trackeditor";
public final String version = "1.3.34";
public final String version = "1.3.35";
private String path;
private double imageScale = 1;