From 899e522c7492d11ce4287636de0c69345cbae81f Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Wed, 15 Sep 2021 20:28:23 +1000 Subject: [PATCH] [windows] Webview to handle ctrl-x/c/z/v. Foreward other accelerators to Window. --- v2/internal/frontend/desktop/windows/frontend.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/v2/internal/frontend/desktop/windows/frontend.go b/v2/internal/frontend/desktop/windows/frontend.go index 28164e89..6fd0ce2d 100644 --- a/v2/internal/frontend/desktop/windows/frontend.go +++ b/v2/internal/frontend/desktop/windows/frontend.go @@ -253,11 +253,15 @@ func (f *Frontend) setupChromium() { chromium.MessageCallback = f.processMessage chromium.WebResourceRequestedCallback = f.processRequest chromium.NavigationCompletedCallback = f.navigationCompleted - acceleratorsWebviewShouldProcess := slicer.Int([]int{ctrlV, ctrlC, ctrlX, ctrlZ}) chromium.AcceleratorKeyCallback = func(vkey uint) bool { // We want webview to handle ctrl-C, ctrl-Z, ctrl-v, ctrl-x - return !acceleratorsWebviewShouldProcess.Contains(int(vkey)) + if acceleratorsWebviewShouldProcess.Contains(int(vkey)) { + return false + } + // Post keypress + w32.PostMessage(f.mainWindow.Handle(), w32.WM_KEYDOWN, uintptr(vkey), 0) + return true } chromium.Embed(f.mainWindow.Handle()) chromium.Resize()