[Performous-commit] Tapio Vierros : Just selecting a note doesn't make it non-floating anymore.

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

Module: editor
Branch: master
Commit: 7d6e6ff0a509f287e2754f7b14953083725bd63c

Author: Tapio Vierros <tap...@gm...>
Date:   Tue Jan 11 16:45:52 2011 +0200

Just selecting a note doesn't make it non-floating anymore.

---

 notegraphwidget.cc |    3 ---
 notelabel.cc       |    2 ++
 notelabel.hh       |    6 +++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/notegraphwidget.cc b/notegraphwidget.cc
index a2d131d..988c7b3 100644
--- a/notegraphwidget.cc
+++ b/notegraphwidget.cc
@@ -36,7 +36,6 @@ void NoteGraphWidget::selectNote(NoteLabel* note)
 	m_selectedNote = note;
 	if (m_selectedNote) {
 		m_selectedNote->setSelected();
-		m_selectedNote->setFloating(false);
 	} else m_selectedAction = NONE;
 
 	// Signal UI about the change
@@ -204,13 +203,11 @@ void NoteGraphWidget::mousePressEvent(QMouseEvent *event)
 			// Start a resize
 			m_selectedAction = RESIZE;
 			child->startResizing( (hotSpot.x() < NoteLabel::resize_margin) ? -1 : 1 );
-			child->setFloating(false);
 
 		} else {
 			// Start a drag
 			m_selectedAction = MOVE;
 			child->startDragging(hotSpot);
-			child->setFloating(false);
 		}
 		child->createPixmap(child->size());
 
diff --git a/notelabel.cc b/notelabel.cc
index e1c1369..e3b6980 100644
--- a/notelabel.cc
+++ b/notelabel.cc
@@ -99,12 +99,14 @@ void NoteLabel::mouseMoveEvent(QMouseEvent *event)
 		else
 			resize(event->pos().x(), height());
 		if (ngw) ngw->updateNotes();
+		setFloating(false);
 
 	} else if (!m_hotspot.isNull()) {
 		// Moving
 		QPoint newpos = pos() + event->pos() - m_hotspot;
 		move(newpos);
 		if (ngw) ngw->updateNotes();
+		setFloating(false);
 		// Check if we need a new hotspot, because the note was constrained
 		if (pos().x() != newpos.x()) m_hotspot.rx() = event->x();
 
diff --git a/notelabel.hh b/notelabel.hh
index 99aff0b..44c7eac 100644
--- a/notelabel.hh
+++ b/notelabel.hh
@@ -16,7 +16,11 @@ public:
 	QString lyric() const { return QString::fromStdString(m_note.syllable); }
 	void setLyric(const QString &text) { m_note.syllable = text.toStdString(); }
 
-	void setSelected(bool state = true) { m_selected = state; createPixmap(size()); }
+	void setSelected(bool state = true) {
+		if (m_selected != state) {
+			m_selected = state; createPixmap(size());
+		}
+	}
 
 	Note& note() { return m_note; }
 	Note note() const { return m_note; }