From 69297667c198691884dee61f2ab2c31955f427c1 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 7 Oct 2021 14:28:52 +0800 Subject: [PATCH 1/3] PutAreBrowserAcceleratorKeysEnabled => false --- v2/internal/frontend/desktop/windows/frontend.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2/internal/frontend/desktop/windows/frontend.go b/v2/internal/frontend/desktop/windows/frontend.go index b7862655c..f5efc3612 100644 --- a/v2/internal/frontend/desktop/windows/frontend.go +++ b/v2/internal/frontend/desktop/windows/frontend.go @@ -311,7 +311,7 @@ func (f *Frontend) setupChromium() { if err != nil { log.Fatal(err) } - err = settings.PutIsStatusBarEnabled(false) + err = settings.PutAreBrowserAcceleratorKeysEnabled(false) if err != nil { log.Fatal(err) } From a148c67df075e060ec81dc3b166412142cf0baab Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 7 Oct 2021 14:35:14 +0800 Subject: [PATCH 2/3] don't hook any AcceleratorKey in callback --- .../frontend/desktop/windows/frontend.go | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/v2/internal/frontend/desktop/windows/frontend.go b/v2/internal/frontend/desktop/windows/frontend.go index f5efc3612..a8e5ad3e5 100644 --- a/v2/internal/frontend/desktop/windows/frontend.go +++ b/v2/internal/frontend/desktop/windows/frontend.go @@ -13,8 +13,6 @@ import ( "strings" "text/template" - "github.com/leaanthony/slicer" - "github.com/leaanthony/go-webview2/pkg/edge" "github.com/leaanthony/winc" "github.com/leaanthony/winc/w32" @@ -278,16 +276,18 @@ func (f *Frontend) setupChromium() { chromium.MessageCallback = f.processMessage chromium.WebResourceRequestedCallback = f.processRequest chromium.NavigationCompletedCallback = f.navigationCompleted - acceleratorsWebviewShouldProcess := slicer.Int([]int{ctrlV, ctrlC, ctrlX, ctrlZ, ctrlA, arrowLeft, arrowRight, arrowUp, arrowDown, keyDel}) + //acceleratorsWebviewShouldProcess := slicer.Int([]int{ctrlV, ctrlC, ctrlX, ctrlZ, ctrlA, arrowLeft, arrowRight, arrowUp, arrowDown, keyDel}) chromium.AcceleratorKeyCallback = func(vkey uint) bool { - // We want webview to handle ctrl-C, ctrl-Z, ctrl-v, ctrl-x - if acceleratorsWebviewShouldProcess.Contains(int(vkey)) { - return false - } - // Post keypress - w32.PostMessage(f.mainWindow.Handle(), w32.WM_KEYDOWN, uintptr(vkey), 0) - return true + return false + + //// We want webview to handle ctrl-C, ctrl-Z, ctrl-v, ctrl-x + //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() From be5f7ceb0e41390fe31a37fc9c526ad59b5b1dda Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 7 Oct 2021 17:34:06 +0800 Subject: [PATCH 3/3] uncomment PostMessage --- v2/internal/frontend/desktop/windows/frontend.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/v2/internal/frontend/desktop/windows/frontend.go b/v2/internal/frontend/desktop/windows/frontend.go index a8e5ad3e5..a8b20fc69 100644 --- a/v2/internal/frontend/desktop/windows/frontend.go +++ b/v2/internal/frontend/desktop/windows/frontend.go @@ -279,6 +279,7 @@ func (f *Frontend) setupChromium() { //acceleratorsWebviewShouldProcess := slicer.Int([]int{ctrlV, ctrlC, ctrlX, ctrlZ, ctrlA, arrowLeft, arrowRight, arrowUp, arrowDown, keyDel}) chromium.AcceleratorKeyCallback = func(vkey uint) bool { + w32.PostMessage(f.mainWindow.Handle(), w32.WM_KEYDOWN, uintptr(vkey), 0) return false //// We want webview to handle ctrl-C, ctrl-Z, ctrl-v, ctrl-x @@ -286,7 +287,7 @@ func (f *Frontend) setupChromium() { // return false //} //// Post keypress - //w32.PostMessage(f.mainWindow.Handle(), w32.WM_KEYDOWN, uintptr(vkey), 0) + //return true } chromium.Embed(f.mainWindow.Handle())