hlassiege/daryl · 46136b1

modified web/src/lib/composables.ts +16 -0 Viewed

@@ -25,3 +25,19 @@ export function usePolling(tick: () => Promise<number>) {
25	25	onMounted(loop);
26	26	onUnmounted(() => { stopped = true; clearTimeout(timer); });
27	27	}
	28	+
	29	+/**
	30	+ * Sous Windows, relâcher Alt donne le focus au menu de Chrome (et Espace l'ouvre ensuite). Après un
	31	+ * Alt+molette, on annule ce relâchement : appeler la fonction renvoyée à chaque molette avec Alt.
	32	+ */
	33	+export function useAltWheel(): () => void {
	34	+ let used = false;
	35	+ const onKeyUp = (e: KeyboardEvent) => {
	36	+ if (e.key !== "Alt") return;
	37	+ if (used) e.preventDefault();
	38	+ used = false;
	39	+ };
	40	+ onMounted(() => window.addEventListener("keyup", onKeyUp));
	41	+ onUnmounted(() => window.removeEventListener("keyup", onKeyUp));
	42	+ return () => { used = true; };
	43	+}

    onMounted(loop);
    onUnmounted(() => { stopped = true; clearTimeout(timer); });
  }
++
++/**
++ * Sous Windows, relâcher Alt donne le focus au menu de Chrome (et Espace l'ouvre ensuite). Après un
++ * Alt+molette, on annule ce relâchement : appeler la fonction renvoyée à chaque molette avec Alt.
++ */
++export function useAltWheel(): () => void {
++  let used = false;
++  const onKeyUp = (e: KeyboardEvent) => {
++    if (e.key !== "Alt") return;
++    if (used) e.preventDefault();
++    used = false;
++  };
++  onMounted(() => window.addEventListener("keyup", onKeyUp));
++  onUnmounted(() => window.removeEventListener("keyup", onKeyUp));
++  return () => { used = true; };
++}

modified web/src/project/steps/derush/Timeline.vue +3 -0 Viewed

@@ -11,6 +11,7 @@
11	11	*/
12	12	import { computed, nextTick, onMounted, onUnmounted, ref, watch } from "vue";
13	13	import { useI18n } from "vue-i18n";
	14	+import { useAltWheel } from "../../../lib/composables";
14	15	import { mmss } from "../../../lib/format";
15	16	import type { DerushClip, DerushSeg, TimelineClip } from "../../types";
16	17	import { clipLen, offsets, type Selection } from "./clips";
@@ -71,9 +72,11 @@ function fit() {
71	72	}
72	73	defineExpose({ zoomBy, fit });
73	74
	75	+const altWheel = useAltWheel();
74	76	function onWheel(e: WheelEvent) {
75	77	// la molette seule fait défiler la page
76	78	if (e.altKey) {
	79	+ altWheel();
77	80	e.preventDefault();
78	81	zoomBy(Math.pow(1.0015, -e.deltaY));
79	82	} else if ((e.ctrlKey \|\| e.metaKey) && Math.abs(e.deltaY) > Math.abs(e.deltaX)) {

   */
  import { computed, nextTick, onMounted, onUnmounted, ref, watch } from "vue";
  import { useI18n } from "vue-i18n";
++import { useAltWheel } from "../../../lib/composables";
  import { mmss } from "../../../lib/format";
  import type { DerushClip, DerushSeg, TimelineClip } from "../../types";
  import { clipLen, offsets, type Selection } from "./clips";
  }
  defineExpose({ zoomBy, fit });
++const altWheel = useAltWheel();
  function onWheel(e: WheelEvent) {
    // la molette seule fait défiler la page
    if (e.altKey) {
++    altWheel();
      e.preventDefault();
      zoomBy(Math.pow(1.0015, -e.deltaY));
    } else if ((e.ctrlKey || e.metaKey) && Math.abs(e.deltaY) > Math.abs(e.deltaX)) {

modified web/src/project/steps/montage/Timeline.vue +3 -0 Viewed

@@ -12,6 +12,7 @@
12	12	*/
13	13	import { computed, nextTick, onMounted, onUnmounted, ref, watch } from "vue";
14	14	import { useI18n } from "vue-i18n";
	15	+import { useAltWheel } from "../../../lib/composables";
15	16	import { fxName } from "../../../lib/transitions";
16	17	import { MEDIA_DRAG, trimAroll } from "./ops";
17	18	import {
@@ -106,9 +107,11 @@ function fit() {
106	107	}
107	108	defineExpose({ zoomBy, fit });
108	109
	110	+const altWheel = useAltWheel();
109	111	function onWheel(e: WheelEvent) {
110	112	// la molette seule fait défiler la page (pour atteindre les pistes du bas)
111	113	if (e.altKey) {
	114	+ altWheel();
112	115	e.preventDefault();
113	116	zoomBy(Math.pow(1.0015, -e.deltaY));
114	117	} else if ((e.ctrlKey \|\| e.metaKey) && Math.abs(e.deltaY) > Math.abs(e.deltaX)) {

   */
  import { computed, nextTick, onMounted, onUnmounted, ref, watch } from "vue";
  import { useI18n } from "vue-i18n";
++import { useAltWheel } from "../../../lib/composables";
  import { fxName } from "../../../lib/transitions";
  import { MEDIA_DRAG, trimAroll } from "./ops";
  import {
  }
  defineExpose({ zoomBy, fit });
++const altWheel = useAltWheel();
  function onWheel(e: WheelEvent) {
    // la molette seule fait défiler la page (pour atteindre les pistes du bas)
    if (e.altKey) {
++    altWheel();
      e.preventDefault();
      zoomBy(Math.pow(1.0015, -e.deltaY));
    } else if ((e.ctrlKey || e.metaKey) && Math.abs(e.deltaY) > Math.abs(e.deltaX)) {

fix(web): keep Chrome's menu from grabbing focus after Alt+wheel zoom