targetAreaを修正

VOICEVOX · Feb 10, 2025 · 472da41 · 472da41
1 parent a64fb0c
commit 472da41
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 10 deletions.
diff --git a/src/sing/sequencerStateMachine/common.ts b/src/sing/sequencerStateMachine/common.ts
@@ -18,9 +18,15 @@ export type PositionOnSequencer = {
 export type Input =
   | {
       readonly type: "keyboardEvent";
-      readonly targetArea: "SequencerBody";
+      readonly targetArea: "Document";
       readonly keyboardEvent: KeyboardEvent;
     }
+  | {
+      readonly type: "mouseEvent";
+      readonly targetArea: "Window";
+      readonly mouseEvent: MouseEvent;
+      readonly cursorPos: PositionOnSequencer;
+    }
   | {
       readonly type: "mouseEvent";
       readonly targetArea: "SequencerBody";

diff --git a/src/sing/sequencerStateMachine/states/addNoteState.ts b/src/sing/sequencerStateMachine/states/addNoteState.ts
@@ -125,7 +125,7 @@ export class AddNoteState
     if (input.type === "mouseEvent") {
       const mouseButton = getButton(input.mouseEvent);
 
-      if (input.targetArea === "SequencerBody") {
+      if (input.targetArea === "Window") {
         if (input.mouseEvent.type === "mousemove") {
           this.currentCursorPos = input.cursorPos;
           this.innerContext.executePreviewProcess = true;

diff --git a/src/sing/sequencerStateMachine/states/drawPitchState.ts b/src/sing/sequencerStateMachine/states/drawPitchState.ts
@@ -168,7 +168,7 @@ export class DrawPitchState
     if (input.type === "mouseEvent") {
       const mouseButton = getButton(input.mouseEvent);
 
-      if (input.targetArea === "SequencerBody") {
+      if (input.targetArea === "Window") {
         if (input.mouseEvent.type === "mousemove") {
           this.currentCursorPos = input.cursorPos;
           this.innerContext.executePreviewProcess = true;

diff --git a/src/sing/sequencerStateMachine/states/editNotesToolIdleState.ts b/src/sing/sequencerStateMachine/states/editNotesToolIdleState.ts
@@ -44,7 +44,10 @@ export class EditNotesToolIdleState
       const mouseButton = getButton(input.mouseEvent);
       const selectedTrackId = context.selectedTrackId.value;
 
-      if (input.targetArea === "SequencerBody") {
+      if (
+        input.targetArea === "Window" &&
+        input.mouseEvent.type === "mousemove"
+      ) {
         context.guideLineTicks.value = getGuideLineTicks(
           input.cursorPos,
           context,

diff --git a/src/sing/sequencerStateMachine/states/erasePitchState.ts b/src/sing/sequencerStateMachine/states/erasePitchState.ts
@@ -109,7 +109,7 @@ export class ErasePitchState
     if (input.type === "mouseEvent") {
       const mouseButton = getButton(input.mouseEvent);
 
-      if (input.targetArea === "SequencerBody") {
+      if (input.targetArea === "Window") {
         if (input.mouseEvent.type === "mousemove") {
           this.currentCursorPos = input.cursorPos;
           this.innerContext.executePreviewProcess = true;

diff --git a/src/sing/sequencerStateMachine/states/moveNoteState.ts b/src/sing/sequencerStateMachine/states/moveNoteState.ts
@@ -150,7 +150,7 @@ export class MoveNoteState
     if (input.type === "mouseEvent") {
       const mouseButton = getButton(input.mouseEvent);
 
-      if (input.targetArea === "SequencerBody") {
+      if (input.targetArea === "Window") {
         if (input.mouseEvent.type === "mousemove") {
           this.currentCursorPos = input.cursorPos;
           this.innerContext.executePreviewProcess = true;

diff --git a/src/sing/sequencerStateMachine/states/resizeNoteLeftState.ts b/src/sing/sequencerStateMachine/states/resizeNoteLeftState.ts
@@ -146,7 +146,7 @@ export class ResizeNoteLeftState
     if (input.type === "mouseEvent") {
       const mouseButton = getButton(input.mouseEvent);
 
-      if (input.targetArea === "SequencerBody") {
+      if (input.targetArea === "Window") {
         if (input.mouseEvent.type === "mousemove") {
           this.currentCursorPos = input.cursorPos;
           this.innerContext.executePreviewProcess = true;

diff --git a/src/sing/sequencerStateMachine/states/resizeNoteRightState.ts b/src/sing/sequencerStateMachine/states/resizeNoteRightState.ts
@@ -145,7 +145,7 @@ export class ResizeNoteRightState
     if (input.type === "mouseEvent") {
       const mouseButton = getButton(input.mouseEvent);
 
-      if (input.targetArea === "SequencerBody") {
+      if (input.targetArea === "Window") {
         if (input.mouseEvent.type === "mousemove") {
           this.currentCursorPos = input.cursorPos;
           this.innerContext.executePreviewProcess = true;

diff --git a/src/sing/sequencerStateMachine/states/selectNotesToolIdleState.ts b/src/sing/sequencerStateMachine/states/selectNotesToolIdleState.ts
@@ -36,7 +36,10 @@ export class SelectNotesToolIdleState
       const mouseButton = getButton(input.mouseEvent);
       const selectedTrackId = context.selectedTrackId.value;
 
-      if (input.targetArea === "SequencerBody") {
+      if (
+        input.targetArea === "Window" &&
+        input.mouseEvent.type === "mousemove"
+      ) {
         context.guideLineTicks.value = getGuideLineTicks(
           input.cursorPos,
           context,

diff --git a/src/sing/sequencerStateMachine/states/selectNotesWithRectState.ts b/src/sing/sequencerStateMachine/states/selectNotesWithRectState.ts
@@ -68,7 +68,7 @@ export class SelectNotesWithRectState
     if (input.type === "mouseEvent") {
       const mouseButton = getButton(input.mouseEvent);
 
-      if (input.targetArea === "SequencerBody") {
+      if (input.targetArea === "Window") {
         if (input.mouseEvent.type === "mousemove") {
           this.currentCursorPos = input.cursorPos;
           this.updatePreviewRect(context);