From 1e23122da1399bc6c9dd4e0f411ea4d62aa2c2d9 Mon Sep 17 00:00:00 2001
From: Romot <mail@romot.co>
Date: Wed, 20 Nov 2024 03:23:58 +0900
Subject: [PATCH 1/3] =?UTF-8?q?#2295=20=E3=83=AB=E3=83=BC=E3=83=A9?=
 =?UTF-8?q?=E3=83=BC=E3=82=AF=E3=83=AA=E3=83=83=E3=82=AF=E3=81=A7=E3=82=B9?=
 =?UTF-8?q?=E3=83=8A=E3=83=83=E3=83=97=E4=BD=8D=E7=BD=AE=E3=81=AB=E5=86=8D?=
 =?UTF-8?q?=E7=94=9F=E3=83=98=E3=83=83=E3=83=89=E3=82=92=E3=81=82=E3=82=8F?=
 =?UTF-8?q?=E3=81=9B=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sing/SequencerRuler/Container.vue         |  2 ++
 .../Sing/SequencerRuler/Presentation.vue      | 19 ++++++++++++++++---
 src/sing/domain.ts                            |  8 ++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/components/Sing/SequencerRuler/Container.vue b/src/components/Sing/SequencerRuler/Container.vue
index 94ebdc6c41..6824af1c48 100644
--- a/src/components/Sing/SequencerRuler/Container.vue
+++ b/src/components/Sing/SequencerRuler/Container.vue
@@ -6,6 +6,7 @@
     :sequencerZoomX
     :numMeasures
     :playheadTicks
+    :sequencerSnapType
     @update:playheadTicks="updatePlayheadTicks"
     @deselectAllNotes="deselectAllNotes"
   />
@@ -35,6 +36,7 @@ const store = useStore();
 const tpqn = computed(() => store.state.tpqn);
 const timeSignatures = computed(() => store.state.timeSignatures);
 const sequencerZoomX = computed(() => store.state.sequencerZoomX);
+const sequencerSnapType = computed(() => store.state.sequencerSnapType);
 
 const playheadTicks = computed(() => store.getters.PLAYHEAD_POSITION);
 
diff --git a/src/components/Sing/SequencerRuler/Presentation.vue b/src/components/Sing/SequencerRuler/Presentation.vue
index 8c078fb1c0..a21fe1b01f 100644
--- a/src/components/Sing/SequencerRuler/Presentation.vue
+++ b/src/components/Sing/SequencerRuler/Presentation.vue
@@ -62,7 +62,12 @@
 
 <script setup lang="ts">
 import { computed, ref, onMounted, onUnmounted } from "vue";
-import { getMeasureDuration, getTimeSignaturePositions } from "@/sing/domain";
+import {
+  getMeasureDuration,
+  getTimeSignaturePositions,
+  getNoteDuration,
+  snapTicksToGrid,
+} from "@/sing/domain";
 import { baseXToTick, tickToBaseX } from "@/sing/viewHelper";
 import { TimeSignature } from "@/store/type";
 
@@ -73,6 +78,7 @@ const props = defineProps<{
   tpqn: number;
   timeSignatures: TimeSignature[];
   sequencerZoomX: number;
+  sequencerSnapType: number;
 }>();
 const playheadTicks = defineModel<number>("playheadTicks", { required: true });
 const emit = defineEmits<{
@@ -134,6 +140,10 @@ const playheadX = computed(() => {
   return Math.floor(baseX * props.sequencerZoomX);
 });
 
+const snapTicks = computed(() => {
+  return getNoteDuration(props.sequencerSnapType, props.tpqn);
+});
+
 const onClick = (event: MouseEvent) => {
   emit("deselectAllNotes");
 
@@ -142,7 +152,10 @@ const onClick = (event: MouseEvent) => {
     throw new Error("sequencerRulerElement is null.");
   }
   const baseX = (props.offset + event.offsetX) / props.sequencerZoomX;
-  const ticks = baseXToTick(baseX, props.tpqn);
+  const ticks = snapTicksToGrid(
+    baseXToTick(baseX, props.tpqn),
+    snapTicks.value,
+  );
   playheadTicks.value = ticks;
 };
 
@@ -193,7 +206,7 @@ onUnmounted(() => {
   background: var(--scheme-color-inverse-surface);
   pointer-events: none;
   will-change: transform;
-  z-index: vars.$z-index-sing-playhead;
+  z-index: 10000;
 }
 
 .sequencer-ruler-measure-number {
diff --git a/src/sing/domain.ts b/src/sing/domain.ts
index faf7230042..e7505bc3d2 100644
--- a/src/sing/domain.ts
+++ b/src/sing/domain.ts
@@ -591,3 +591,11 @@ export const shouldPlayTracks = (tracks: Map<TrackId, Track>): Set<TrackId> => {
       .map(([trackId]) => trackId),
   );
 };
+
+/**
+ * 指定されたティックをグリッドに合わせて丸める。
+ * グリッドはsnapTicksの倍数になる。
+ */
+export function snapTicksToGrid(ticks: number, snapTicks: number): number {
+  return Math.round(ticks / snapTicks) * snapTicks;
+}

From d15f3a8fc3e13b746f560d6fa7a3cb87d37afe3a Mon Sep 17 00:00:00 2001
From: Romot <mail@romot.co>
Date: Wed, 20 Nov 2024 12:53:36 +0900
Subject: [PATCH 2/3] =?UTF-8?q?#2295=20=E3=83=86=E3=82=B9=E3=83=88?=
 =?UTF-8?q?=E3=81=AB=E3=81=8A=E3=81=84=E3=81=A6SequencerSnapTicks=E3=82=92?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Sing/SequencerRuler/index.stories.ts | 1 +
 src/sing/domain.ts                                  | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Sing/SequencerRuler/index.stories.ts b/src/components/Sing/SequencerRuler/index.stories.ts
index 345415e841..48eb5e002d 100644
--- a/src/components/Sing/SequencerRuler/index.stories.ts
+++ b/src/components/Sing/SequencerRuler/index.stories.ts
@@ -19,6 +19,7 @@ const meta: Meta<typeof Presentation> = {
     tpqn: 480,
     offset: 0,
     numMeasures: 32,
+    sequencerSnapType: 4,
     "onUpdate:playheadTicks": fn<(value: number) => void>(),
     onDeselectAllNotes: fn(),
   },
diff --git a/src/sing/domain.ts b/src/sing/domain.ts
index e7505bc3d2..0d0d1a0f5b 100644
--- a/src/sing/domain.ts
+++ b/src/sing/domain.ts
@@ -593,8 +593,7 @@ export const shouldPlayTracks = (tracks: Map<TrackId, Track>): Set<TrackId> => {
 };
 
 /**
- * 指定されたティックをグリッドに合わせて丸める。
- * グリッドはsnapTicksの倍数になる。
+ * 指定されたティックを直近のグリッドに合わせる
  */
 export function snapTicksToGrid(ticks: number, snapTicks: number): number {
   return Math.round(ticks / snapTicks) * snapTicks;

From e7956f38d979c2c1ad06ecd02f693d6613d62040 Mon Sep 17 00:00:00 2001
From: Romot <mail@romot.co>
Date: Sat, 23 Nov 2024 02:51:15 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E7=94=A8?=
 =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=89=E3=81=AEz-index=E3=81=8C=E6=AE=8B?=
 =?UTF-8?q?=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE=E3=82=92=E5=85=83?=
 =?UTF-8?q?=E3=81=AE=E5=A4=89=E6=95=B0=E3=81=AB=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Sing/SequencerRuler/Presentation.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Sing/SequencerRuler/Presentation.vue b/src/components/Sing/SequencerRuler/Presentation.vue
index a21fe1b01f..9cb4c75916 100644
--- a/src/components/Sing/SequencerRuler/Presentation.vue
+++ b/src/components/Sing/SequencerRuler/Presentation.vue
@@ -206,7 +206,7 @@ onUnmounted(() => {
   background: var(--scheme-color-inverse-surface);
   pointer-events: none;
   will-change: transform;
-  z-index: 10000;
+  z-index: vars.$z-index-sing-playhead;
 }
 
 .sequencer-ruler-measure-number {