Merge remote-tracking branches 'origin/sub_laptop_2', 'origin/sub_laptop_6' and 'origin/sub_laptop_7' into sub_laptop_5

M02_MasterTemplete/DataFlow/M02_DF_Diagram.ts

@@ -7,6 +7,7 @@
  * 그리기만(바꾸는 것은 부른 쪽이 Model 로) · 순수 부분은 `M02_DF_Diagram_Parts.ts`.
  * ========================================================================== */
 
+import { wheelZoomsIn } from "../../A00_Common/touch_bridge";
 import { createButton, el, showConfirmDialog } from "@ui/ui_template_elements";
 import type { CfBox, CfKind, CfLogic, CfPill, CfPort } from "./M02_DF_Model";
 import {
@@ -454,7 +455,7 @@ export function renderDiagram(
     "wheel",
     (ev) => {
       ev.preventDefault();
-      setZoom(st.zoom * (ev.deltaY < 0 ? 1.1 : 1 / 1.1), ev.clientX, ev.clientY);
+      setZoom(st.zoom * (wheelZoomsIn(ev) ? 1.1 : 1 / 1.1), ev.clientX, ev.clientY); // ☰ [설정] 방향(332)
     },
     { passive: false },
   );

M02_MasterTemplete/M02_MasterTemplete_Labor_Diagram.ts

@@ -7,6 +7,7 @@
  * ========================================================================== */
 
 import { currentLanguageIndex } from "@ui/ui_template_locale";
+import { wheelZoomsIn } from "../A00_Common/touch_bridge";
 import { createButton, el } from "@ui/ui_template_elements";
 import { formatMoney } from "../M01_MasterData/M01_MasterData_UI_Logic_Money";
 import "./M02_MasterTemplete_Labor_Diagram.css";
@@ -313,7 +314,7 @@ function mountShell(host: HTMLElement): State {
       if (!e.ctrlKey) return;
       e.preventDefault();
       const r = viewport.getBoundingClientRect();
-      zoomAt(st, e.deltaY < 0 ? 1.1 : 1 / 1.1, e.clientX - r.left, e.clientY - r.top);
+      zoomAt(st, wheelZoomsIn(e) ? 1.1 : 1 / 1.1, e.clientX - r.left, e.clientY - r.top); // ☰ [설정] 방향(332)
     },
     { passive: false },
   );