Make Shift-Knife delete cut portion (whichever side is shorter)

regulus79 · Feb 16, 2025 · c9cff97 · c9cff97
1 parent f5e3823
commit c9cff97
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/include/MidiClip.h b/include/MidiClip.h
@@ -83,7 +83,7 @@ class LMMS_EXPORT MidiClip : public Clip
 	void splitNotes(const NoteVector& notes, TimePos pos);
 
 	// Split the list of notes along a line
-	void splitNotesAlongLine(TimePos pos1, int key1, TimePos pos2, int key2);
+	void splitNotesAlongLine(TimePos pos1, int key1, TimePos pos2, int key2, bool deleteShortEnds);
 
 	// clip-type stuff
 	inline Type type() const

diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp
@@ -2270,7 +2270,8 @@ void PianoRoll::mouseReleaseEvent( QMouseEvent * me )
 		}
 		else if (m_action == Action::Knife)
 		{
-			m_midiClip->splitNotesAlongLine(TimePos(m_knifeStartTickPos), m_knifeStartKey, TimePos(m_knifeEndTickPos), m_knifeEndKey);
+			bool deleteShortEnds = me->modifiers() & Qt::ShiftModifier;
+			m_midiClip->splitNotesAlongLine(TimePos(m_knifeStartTickPos), m_knifeStartKey, TimePos(m_knifeEndTickPos), m_knifeEndKey, deleteShortEnds);
 			m_knifeDown = false;
 		}
 

diff --git a/src/tracks/MidiClip.cpp b/src/tracks/MidiClip.cpp
@@ -344,7 +344,7 @@ void MidiClip::splitNotes(const NoteVector& notes, TimePos pos)
 	}
 }
 
-void MidiClip::splitNotesAlongLine(TimePos pos1, int key1, TimePos pos2, int key2)
+void MidiClip::splitNotesAlongLine(TimePos pos1, int key1, TimePos pos2, int key2, bool deleteShortEnds)
 {
 	if (m_notes.empty()) { return; }
 	// Don't split if the line is horitzontal
@@ -365,12 +365,21 @@ void MidiClip::splitNotesAlongLine(TimePos pos1, int key1, TimePos pos2, int key
 		{
 			Note newNote1 = Note(*note);
 			newNote1.setLength(keyIntercept - note->pos());
-			addNote(newNote1, false);
 
 			Note newNote2 = Note(*note);
 			newNote2.setPos(keyIntercept);
 			newNote2.setLength(note->endPos() - keyIntercept);
-			addNote(newNote2, false);
+
+			if (deleteShortEnds)
+			{
+				if (newNote1.length() >= newNote2.length()) { addNote(newNote1, false); }
+				else { addNote(newNote2, false); }
+			}
+			else
+			{
+				addNote(newNote1, false);
+				addNote(newNote2, false);
+			}
 
 			removeNote(note);
 		}