Merge lp:~tapaal-contributor/tapaal/undo-redo-update-scrollbar-1875174 into lp:tapaal

[Peter Haahr Taankvist]

Now revalidates the drawingsurface after undoing movement of pnobjects.

[Jiri Srba (srba)]

Works fine and can be approved for merge to trunk. Please, prepare also a separate branch for merge to 3.6.

[Kenneth Yrke Jørgensen (yrke)]

review: Approve (code)

[Jiri Srba (srba)]

review: Approve

=== modified file 'src/pipe/gui/canvas/DrawingSurfaceImpl.java'
--- src/pipe/gui/canvas/DrawingSurfaceImpl.java	2020-04-18 13:18:51 +0000
+++ src/pipe/gui/canvas/DrawingSurfaceImpl.java	2020-05-02 15:34:44 +0000
@@ -675,7 +675,7 @@
 	public void translateSelection(ArrayList<PetriNetObject> objects, int transX, int transY) {
 		tabContent.getUndoManager().newEdit(); // new "transaction""
 		for (PetriNetObject pnobject : objects) {
-			tabContent.getUndoManager().addEdit(new TranslatePetriNetObjectEdit(pnobject, transX, transY));
+			tabContent.getUndoManager().addEdit(new TranslatePetriNetObjectEdit(pnobject, transX, transY, this));
 		}
 	}
 }
 
=== modified file 'src/pipe/gui/undo/TranslatePetriNetObjectEdit.java'
--- src/pipe/gui/undo/TranslatePetriNetObjectEdit.java	2011-09-22 13:02:33 +0000
+++ src/pipe/gui/undo/TranslatePetriNetObjectEdit.java	2020-05-02 15:34:44 +0000
@@ -4,6 +4,7 @@
 
 package pipe.gui.undo;
 
+import pipe.gui.canvas.DrawingSurfaceImpl;
 import pipe.gui.graphicElements.PetriNetObject;
 import dk.aau.cs.gui.undo.Command;
 
@@ -16,25 +17,29 @@
 	PetriNetObject pnObject;
 	Integer transX;
 	Integer transY;
+	DrawingSurfaceImpl ds;
 
 	/** Creates a new instance of */
 	public TranslatePetriNetObjectEdit(PetriNetObject _pnObject,
-			Integer _transX, Integer _transY) {
+                                       Integer _transX, Integer _transY, DrawingSurfaceImpl drawingSurface) {
 		pnObject = _pnObject;
 		transX = _transX;
 		transY = _transY;
+		ds = drawingSurface;
 	}
 
 	/** */
 	@Override
 	public void undo() {
 		pnObject.translate(-transX, -transY);
+        ds.updatePreferredSize();
 	}
 
 	/** */
 	@Override
 	public void redo() {
 		pnObject.translate(transX, transY);
+        ds.updatePreferredSize();
 	}
 
 	@Override