[RPP] Fix Zoom on Cmd/Ctrl bug

On Mac, the 'modern' navigation zoom should happen on Cmd + scroll. There was a bug that made it only zoom on Ctrl + scrool Bug: None Change-Id: I1db4b861c830cc82eb3cf133050735e9fc12f831 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6140553 Reviewed-by: Nancy Li <[email protected]> Auto-Submit: Alina Varkki <[email protected]> Commit-Queue: Alina Varkki <[email protected]>
ChromeDevTools · Jan 3, 2025 · ef61624 · ef61624
1 parent 2636063
commit ef61624
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/front_end/ui/legacy/components/perf_ui/ChartViewport.ts b/front_end/ui/legacy/components/perf_ui/ChartViewport.ts
@@ -232,9 +232,10 @@ export class ChartViewport extends UI.Widget.VBox {
         this.handleZoomGesture(zoomDelta);
       }
     } else if (navigation === 'modern') {
+      const isCtrlOrCmd = UI.KeyboardShortcut.KeyboardShortcut.eventHasCtrlEquivalentKey(wheelEvent);
       if (wheelEvent.shiftKey) {  // Pan left/right
         this.handlePanGesture(wheelEvent.deltaY, /* animate */ true);
-      } else if (wheelEvent.ctrlKey || Math.abs(wheelEvent.deltaX) > Math.abs(wheelEvent.deltaY)) {  // Zoom
+      } else if (isCtrlOrCmd || Math.abs(wheelEvent.deltaX) > Math.abs(wheelEvent.deltaY)) {  // Zoom
         this.handleZoomGesture(zoomDelta);
       } else {  // Scroll
         this.vScrollElement.scrollTop += scrollDelta;