Merge pull request #353 from robertnhart/select-c-minus1

Fix #201 - Allow selection rectangle to reach minimum note c-1
ryohey · May 23, 2024 · f54a083 · f54a083
2 parents 2c5c79f + 16a2be6
commit f54a083
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/src/common/selection/Selection.ts b/src/common/selection/Selection.ts
@@ -51,17 +51,11 @@ export const regularizedSelection = (
 ): Selection => ({
   from: {
     tick: Math.max(0, Math.min(fromTick, toTick)),
-    noteNumber: Math.min(
-      MaxNoteNumber,
-      Math.max(0, Math.max(fromNoteNumber, toNoteNumber)),
-    ),
+    noteNumber: Math.min(MaxNoteNumber, Math.max(fromNoteNumber, toNoteNumber)),
   },
   to: {
     tick: Math.max(fromTick, toTick),
-    noteNumber: Math.min(
-      MaxNoteNumber,
-      Math.max(0, Math.min(fromNoteNumber, toNoteNumber)),
-    ),
+    noteNumber: Math.min(MaxNoteNumber, Math.min(fromNoteNumber, toNoteNumber)),
   },
 })
 

diff --git a/src/main/actions/selection.ts b/src/main/actions/selection.ts
@@ -42,7 +42,7 @@ function eventsInSelection(events: TrackEvent[], selection: Selection) {
 export const resizeSelection =
   ({ pianoRollStore }: RootStore) =>
   (start: NotePoint, end: NotePoint) => {
-    const selection = regularizedSelection(
+    let selection = regularizedSelection(
       start.tick,
       start.noteNumber,
       end.tick,
@@ -53,7 +53,11 @@ export const resizeSelection =
     selection.from.noteNumber = Math.ceil(selection.from.noteNumber)
     selection.to.noteNumber = Math.floor(selection.to.noteNumber)
 
-    pianoRollStore.selection = clampSelection(selection)
+    ++selection.to.noteNumber
+    selection = clampSelection(selection)
+    --selection.to.noteNumber
+
+    pianoRollStore.selection = selection
   }
 
 export const fixSelection =