[OMPT-svn-commit] OpenMPT r22292 - trunk/OpenMPT/mptrack

[<sv...@op...>]

Author: sagamusix
Date: Sun Nov 24 21:31:56 2024
New Revision: 22292
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22292

Log:
[Fix] Pattern tab: Right-click record group assignment was kinda broken since r22264.

Modified:
   trunk/OpenMPT/mptrack/View_pat.cpp

Modified: trunk/OpenMPT/mptrack/View_pat.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp	Sun Nov 24 21:15:34 2024	(r22291)
+++ trunk/OpenMPT/mptrack/View_pat.cpp	Sun Nov 24 21:31:56 2024	(r22292)
@@ -1437,11 +1437,12 @@
 	}
 
 	const bool inChannelHeader = (pt.y < m_szHeader.cy);
-	if(/*(flags & MK_SHIFT) &&*/ inChannelHeader)
+	if(inChannelHeader)
 	{
 		// Drag-select record channels
 		StartRecordGroupDragging(GetDragItem(pt, m_rcDragItem));
 		m_Status.set(psShiftDragging, (flags & MK_SHIFT) != 0);
+		m_bInItemRect = true;
 	}
 }
 
@@ -1467,6 +1468,8 @@
 				modDoc->ToggleChannelRecordGroup(sourceChn, RecordGroup::Group2);
 				InvalidateChannelsHeaders(sourceChn);
 			}
+			m_Status.reset(psShiftDragging);
+			return;
 		}
 		break;
 	default:
@@ -1643,7 +1646,7 @@
 			InvalidateRect(&m_rcDragItem, FALSE);
 
 			// Drag-select record channels
-			if(isDraggingRecordGroup && m_nDropItem.Type() == DragItem::ChannelHeader)
+			if(isDraggingRecordGroup && m_nDropItem.Type() == DragItem::ChannelHeader && m_Status[psShiftDragging])
 			{
 				auto modDoc = GetDocument();
 				auto startChn = static_cast<CHANNELINDEX>(m_nDragItem.Value());