[Performous-commit] Tapio Vierros : Notes become non-floating as soon as started to move/resize .

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

Module: editor
Branch: master
Commit: 12732218441d457e6794711b6ae1a2b8acf57aec

Author: Tapio Vierros <tap...@gm...>
Date:   Wed Jan 19 15:26:48 2011 +0200

Notes become non-floating as soon as started to move/resize.

Fixes issue with not being able to resize floating note.

---

 notegraphwidget.cc |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/notegraphwidget.cc b/notegraphwidget.cc
index 5636842..6f0ddb4 100644
--- a/notegraphwidget.cc
+++ b/notegraphwidget.cc
@@ -252,19 +252,11 @@ void NoteGraphWidget::mouseReleaseEvent(QMouseEvent *event)
 			m_selectedNote->move(m_selectedNote->pos().x(), n2px(px2n(m_selectedNote->pos().y())));
 			if (m_actionHappened) {
 				// Operation for undo stack & saving
-				int notelabelid = getNoteLabelId(m_selectedNote);
 				Operation op("SETGEOM");
-				op << notelabelid
+				op <<  getNoteLabelId(m_selectedNote)
 					<< m_selectedNote->x() << m_selectedNote->y()
 					<< m_selectedNote->width() << m_selectedNote->height();
 				doOperation(op, Operation::NO_EXEC);
-				// See if it needs to be unfloated
-				if (m_selectedNote->isFloating()) {
-					Operation fop("FLOATING"); fop << notelabelid << false;
-					Operation combiner("COMBINER"); combiner << 2;
-					doOperation(fop);
-					doOperation(combiner);
-				}
 			}
 		}
 		m_selectedAction = NONE;
@@ -301,7 +293,14 @@ void NoteGraphWidget::mouseDoubleClickEvent(QMouseEvent *event)
 
 void NoteGraphWidget::mouseMoveEvent(QMouseEvent *event)
 {
-	m_actionHappened = true; // We have movement, so resize/move can be accepted
+	if (!m_actionHappened) {
+		m_actionHappened = true; // We have movement, so resize/move can be accepted
+		// See if the note needs to be unfloated
+		if (m_selectedAction != NONE && m_selectedNote && m_selectedNote->isFloating()) {
+			Operation op("FLOATING"); op << getNoteLabelId(m_selectedNote) << false;
+			doOperation(op);
+		}
+	}
 
 	// Pan
 	if (!m_panHotSpot.isNull()) {