[Performous-commit] Tapio Vierros : Handle undoing the moving of multiple notes with mouse.

[Tapio V. <aa...@us...>]

Module: editor
Branch: master
Commit: 0680519c4724f0b730304612ec9945c024cb4b1a

Author: Tapio Vierros <tap...@gm...>
Date:   Wed Feb  2 14:14:43 2011 +0200

Handle undoing the moving of multiple notes with mouse.

---

 notegraphwidget.cc |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/notegraphwidget.cc b/notegraphwidget.cc
index d35c386..169c3c0 100644
--- a/notegraphwidget.cc
+++ b/notegraphwidget.cc
@@ -363,18 +363,22 @@ void NoteGraphWidget::mouseReleaseEvent(QMouseEvent *event)
 	(void)*event;
 	if (m_selectedAction != NONE) {
 		if (m_selectedNote) {
+			int movecount = 0;
 			for (NoteLabel *n = m_selectedNote; n; n = n->nextSelected) {
 				n->startResizing(0);
 				n->startDragging(QPoint());
+				if (m_actionHappened) {
+					// Operation for undo stack & saving
+					Operation op("SETGEOM");
+					op <<  getNoteLabelId(n)
+						<< n->x() << n->y() << n->width() << n->height();
+					doOperation(op, Operation::NO_EXEC);
+					++movecount;
+				}
 			}
-			if (m_actionHappened) {
-				// TODO: Undo multiple note move
-				// Operation for undo stack & saving
-				Operation op("SETGEOM");
-				op <<  getNoteLabelId(m_selectedNote)
-					<< m_selectedNote->x() << m_selectedNote->y()
-					<< m_selectedNote->width() << m_selectedNote->height();
-				doOperation(op, Operation::NO_EXEC);
+			// Combine to one undo operation
+			if (movecount > 1) {
+				Operation op("COMBINER"); op << movecount; doOperation(op);
 			}
 		}
 		m_selectedAction = NONE;