Merge branch 'master' into qt6

CMakeLists.txt

@@ -885,6 +885,7 @@ MESSAGE(
 "* Debug using UBSanitizer           : ${STATUS_DEBUG_UBSAN}\n"
 "* Debug packaging commands          : ${STATUS_DEBUG_CPACK}\n"
 "* Profile using GNU profiler        : ${STATUS_GPROF}\n"
+"* Debug assertions                  : ${STATUS_ASSERTIONS}\n"
 "* Experimental Qt6 support          : ${STATUS_QT6}\n"
 )
 

src/gui/editors/PianoRoll.cpp

@@ -2434,6 +2434,12 @@
 		updateKnifePos(me, false);
 	}
 
+	// Update Strum position if we are on knife mode
+	if (m_editMode == EditMode::Strum && m_strumEnabled)
+	{
+		updateStrumPos(me, false, me->modifiers() & Qt::ShiftModifier);
+	}
+
 	if( pos.y() > PR_TOP_MARGIN || m_action != Action::None )
 	{
 		bool edit_note = ( pos.y() > noteEditTop() )
@@ -2879,81 +2885,81 @@
  * Notes above the clicked note (relative to each chord) will be strummed down, notes below will be strummed up.
  * Holding shift raises the amount of movement to a power, causing the strum to be curved/warped.
 */
 void PianoRoll::updateStrumPos(QMouseEvent* me, bool initial, bool warp)
 {
 	if (!hasValidMidiClip()) { return; }
 	// Calculate the TimePos from the mouse
 	int mouseViewportPos = me->x() - m_whiteKeyWidth;
 	int mouseTickPos = mouseViewportPos * TimePos::ticksPerBar() / m_ppb + m_currentPosition;
 	// Should we add quantization? probably not?
 	if (initial)
 	{
 		m_strumStartTime = mouseTickPos;
 		m_strumStartVertical =  me->y();
 	}
 	m_strumCurrentTime = mouseTickPos;
 	m_strumCurrentVertical =  me->y();
 	int strumTicksHorizontal = m_strumCurrentTime - m_strumStartTime;
 	float strumPower = fastPow10f(0.01f * (m_strumCurrentVertical - m_strumStartVertical));
 
 	if (initial)
 	{
 		m_midiClip->addJournalCheckPoint();
 
 		Note* clickedNote = noteUnderMouse();
 		if (clickedNote == nullptr) { return; }
 
 		for (NoteVector chord: m_selectedChords)
 		{
 			for (Note* note: chord)
 			{
 				// Save the current note position
 				note->setOldPos(note->pos());
 				// if this is the clicked note, calculate it's ratio up the chord
 				if (note == clickedNote && chord.size() > 1)
 				{
 					m_strumHeightRatio = 1.f * std::distance(chord.begin(), std::find(chord.begin(), chord.end(), clickedNote)) / (chord.size() - 1);
 				}
 			}
 		}
 	}
 
 	for (NoteVector chord: m_selectedChords)
 	{
 		// Don't strum a chord with only one note
 		if (chord.size() <= 1) { continue; }
 		for (size_t i = 0; i < chord.size(); ++i)
 		{
 			float heightRatio = 1.f * i / (chord.size() - 1);
 			float ratio = 0.0f;
 
 			if (heightRatio == m_strumHeightRatio)
 			{
 				ratio = 1.f;
 			}
 			else if (heightRatio < m_strumHeightRatio)
 			{
 				ratio = heightRatio / m_strumHeightRatio;
 			}
 			else
 			{
 				ratio = (1.f - heightRatio) / (1.f - m_strumHeightRatio);
 			}
 
 			if (warp)
 			{
 				ratio = std::pow(ratio, strumPower);
 			}
 			chord.at(i)->setPos(std::max(0, static_cast<tick_t>(chord.at(i)->oldPos() + ratio * strumTicksHorizontal)));
 		}
 	}
 	m_midiClip->rearrangeAllNotes();
 	m_midiClip->updateLength();
 	m_midiClip->dataChanged();
 }
 
 
 
 void PianoRoll::dragNotes(int x, int y, bool alt, bool shift, bool ctrl)
 {
 	// dragging one or more notes around