Multiselect uses label/wav value when appropiate

zardoru · Jan 13, 2018 · a3a09c7 · a3a09c7
1 parent 06a3247
commit a3a09c7
Show file tree

Hide file tree

Showing 4 changed files with 92 additions and 76 deletions.
diff --git a/iBMSC/MainWindow.designer.vb b/iBMSC/MainWindow.designer.vb
diff --git a/iBMSC/MainWindow.resx b/iBMSC/MainWindow.resx
@@ -148,43 +148,43 @@
   <data name="TBWavIncrease.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
-        0zt+4qajqP8CY4Qm7Hs3MnIAAAAASUVORK5CYII=
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAhgSURBVFhHvZZ7UNNXFsd/PAK6bmvXrTuzXVuoWFBUBCSA
+        IEYQVMKC8pKHYqvdWndXx2pFrdVNq2B5yCPI+2XA8EoCCRBeARIDqEAtIkpZRRFrqyQ8dLXWP2j97v2F
+        FDYFO+DO9Mx85je5+d1zvufce8/9UbQJAikDBYdlqOBQhpqB39I4HEo/a7/lvLMcC9MCzlsLtcO/ndGZ
+        n+WYmMZ+tDQs5oD1GXHUykNNyZYhdV+8vqaCM+utjJUUQ/sq5dXwO4mHRO+5R7Ue3KsIlXpYV6GPdRJ9
+        uIkJpfpYXzanSvv69IwuO5157H7r5IRD9qjmOqMth9nfkmJZcjHN4sOWZEvrulirOfS7JPho/dMC1P/A
+        n5LGH4rgJmSAxTGZRV7Xo+dMywIpyqAshvlpTZILrosCcafi3dHbVUFDvZX+d66WuCuqoxZHCo6+Ye1R
+        pjda9/QcEkc+ROzwDh0ShndBRkS4lTDwyhvUHynWDPdTc5rV9vZsJ1Vv5Y7nI+0HoW7dhz5ZGC4XekIa
+        ZdXLP7w4gp0968eaxzycHt6JU0MhOsQOv6cR4FrMADWLMqEWUcZa19Oz+pg/uTelWFT11wQ9HGzfD1X7
+        XnRXhqEp96+oSlyL4qPM745/9ubzqm+Sfl1AIQPGr1JmRAK9DNO3Wo7xImXyO+F99f7f9Ct2olu6Hcpc
+        H5znsfFvZQiuybagku8KoZCUvNXvhQLWFrykgJIAaraSa+Z0vXTjhStCbzSdHQt+ReqLh727MHJjF3rP
+        h6I6fSMyBBsQ1eOLyIGgyQLOEQHGLyGAtpZoi1eqohYniSNWPKg544obTaGa4KrWbRi8uA2qi2G4pQhF
+        XYEnuGnO+OL65skC8oxeXgBtxZ/82Zl/aHFS0Wf2D7sbg/Do1m6oL2yDujEY6voQqBTb0FMegJq8jUgV
+        ueNUm5eOABZvTIAJS3MUp29smbGQVav3E91kAvNm48RJE9QWuaOvZRsGLoRBLQuGShyAofItUNWG4lZt
+        CCQprkjKZ+HUTT9Eq8Ige0oE5BphdZYhVmcYwjmdkMqAUzLhDAOruIQEBtYkvirVhp0w0mSe1TzJA33O
+        ax7mQno7HgL+VtSkuONOM1kCZRgGJYFQ8X2hLvTDQOkW3CS/a/meSMhwQsRlb4gec1FL5tM+XkT900I4
+        njYizUrTJyaalYdY75n0cS6iB3ciQhWqIVLhibR8VzTw2bghDSRVCIW6wA/qbB8M5m6GqiwIPcV+qEh3
+        Q5LIDZ+1eeLEQMj4/F8Spd6Bmu/z4RBrBBLyNZ1m5U4EVPwnG58/CMEn933G+ddX6xEfz4SMtwF3G7dC
+        RTJXZ2/CQJIXhtLJsygQt6RBEKe6IibDEce+9tSZ/79wHgSh6gkPDtEaAX8hTDQrWoDkUSaO3w9E+Lfs
+        Cfo24mibGxLzV6OCNKRblUFQi8mGTPWBOsFL8xwoDEBPiR+q+RsRm7MKR5pddH1o+fQ7f1SSKttHaQSY
+        ECY26jqx/rOyhxk4cs8X++6un0S4zBmn0xwgI2t+Q+gPFclcnTImYpAWIyQiBP4ojF+PKIEfDneG4qPb
+        bB0fh+5tQjmpsv0pjQBTgq4A0UgaPr7rjX/0uU7J/nYXRMXZQEp2fz85CapCIiKZVCCOjeE0L3ybH4zm
+        ogMoLohFgjAW4R1BuvP72SgjVWZGTiGA3OfPBMMp+PjOZuzp2zA1vSSTekfE5DmigrsWN0nWQ6ItGErx
+        wl2uHzqz9qJRkg25vA4yZT240igcbnlvfP6BOz4QjaSDedJ4CgFlRMBQKgTDv06m6gT+WctERNwK1JE1
+        v1kaiHu8YFzJ3At5HhfyegW+7LiGjo4rKC2TIK86B+d6UlCsGptfOpIJuxMaAbp7YH0ZaUQC/Z/Wlhhg
+        bZEBWAUEvgHW5BN4BnA5awiXHEMUDp7Bzm4W3m+xRQTXCkXRHrggOAB5eY4m+NXOq2hrbYe88TxaWi6h
+        WFiE8FO74RFhqsmcDm7xN4aShNQ9BbRpm8NcAv0nrZAu0zh2WYajfDUX7/Y4I/C6NXZKFuNznhdEBYlQ
+        Khvw1ZVutF5qQ0vzRSgUzZDK5BBn5kC0++/fZ7u68w7Oneuv9Uv7/wNh0keLnrY50Mro8oxBLhYTFjXL
+        LsNwNF+VgK3djvDtWqbh/SYvJBZyoWhqRtfVa2hsUKBRrkQDeRbk5EF69Dg6Q0Mhd3FRiZYty0ywsLBY
+        QFGziV/dTjgdW5luOJo3EI+ga0x4dy7R4HfZFh+c3wSu5DTKy6W4RMpf1SAHP4eHhkNH0BW2Hf2+vuhh
+        s3HRxaW/2NIym2dmtlLrcma2MpUxenYgDgFdtmB3mI/j/eVS7KkLBa8iF2USMUSZ2RCGH0aTfwA6PTzw
+        NaGLcIHFQsXy5feFy5d/wKEoI+JyZhWwTSYCHsTB/6oNPDve0SGgg4mMy/E4Fh2OnD37flR4+0Du5AQ5
+        kwmFoyPkhAaCjFBhaxudbGpqIiAfw1rX0zPbMy8W4Nu5Atl348CONEeWm5tIymQ+UTo5o87ODmTtIbaz
+        e15rbw+xjQ0EVlacjIUL55KzOLMK2HDHBIReWwW/TmsdgrscQC+PfeRsHJs/b7vIcqmgzsHhgZQIEBAB
+        5ba2EK9Y8axo2bLW/KVL6dMws+C02SQyRvMHEsEjG3EqzqmSYH9yNv1FtIi7aJFN0ZIlIrGl5aMqknkp
+        yZwEb8tbsmRThrn561qXMzPnhDkSxwij5/R9Tl+p9K1GXyx0b/9Fk1nAmj//9wXm5quFVlYHSdkzi62s
+        YkjmwWSMDj7z7H82bbN6jTBVs/q5ydD/a5pM1oIF89Lefts+xczsTYGlJb3z/2+j1U9uVhPQ4+NNhhw3
+        fTowveMnbzqK+i+0KibWP70jiwAAAABJRU5ErkJggg==
 </value>
   </data>
   <metadata name="FStatus2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

diff --git a/iBMSC/PanelDraw.vb b/iBMSC/PanelDraw.vb
@@ -355,7 +355,7 @@ Partial Public Class MainWindow
 
         If ModifierMultiselectActive() Then
             For Each note In Notes
-                If IsNoteVisible(note, xTHeight, xVS) And note.Value = Notes(KMouseOver).Value Then
+                If IsNoteVisible(note, xTHeight, xVS) AndAlso IsLabelMatch(note, KMouseOver) Then
                     Dim nrect = GetNoteRectangle(note, xTHeight, xHS, xVS)
                     e1.Graphics.DrawRectangle(pen, nrect.X, nrect.Y, nrect.Width - 1, nrect.Height - 1)
                 End If

diff --git a/iBMSC/PanelEvents.vb b/iBMSC/PanelEvents.vb
@@ -234,12 +234,26 @@ Partial Public Class MainWindow
 
     Private Sub SelectAllWithHoveredNoteLabel()
         For xI1 = 0 To UBound(Notes)
-            If Notes(xI1).Value = Notes(KMouseOver).Value Then
-                Notes(xI1).Selected = True
-            End If
+            Notes(xI1).Selected = IIf(IsLabelMatch(Notes(xI1), KMouseOver), True, Notes(xI1).Selected)
         Next
     End Sub
 
+    Private Function IsLabelMatch(note As Note, index As Integer) As Boolean
+        If TBShowFileName.Checked Then
+            Dim wavidx = Notes(index).Value / 10000
+            Dim wav = hWAV(wavidx)
+            If hWAV(note.Value / 10000) = wav Then
+                Return True
+            End If
+        Else
+            If note.Value = Notes(index).Value Then
+                Return True
+            End If
+        End If
+
+        Return False
+    End Function
+
     Private Sub DecreaseCurrentWav()
         If LWAV.SelectedIndex = -1 Then
             LWAV.SelectedIndex = 0
@@ -726,8 +740,10 @@ Partial Public Class MainWindow
 
             ElseIf ModifierMultiselectActive() Then
                 For xI1 = 0 To UBound(Notes)
-                    If Notes(xI1).Value = Notes(NoteIndex).Value And IsNoteVisible(xI1, xTHeight, xVS) Then
-                        Notes(xI1).Selected = Not Notes(xI1).Selected
+                    If IsNoteVisible(xI1, xTHeight, xVS) Then
+                        If IsLabelMatch(Notes(xI1), NoteIndex) Then
+                            Notes(xI1).Selected = Not Notes(xI1).Selected
+                        End If
                     End If
                 Next
             Else