github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-06 11:40:17 +08:00
Code Projects Activity

Merge pull request #859 from marktohark/master

Browse Source 
PutAreBrowserAcceleratorKeysEnabled => false
This commit is contained in:
Lea Anthony 2021-10-07 21:02:27 +11:00 committed by GitHub
commit 1bd3deb39f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
v2/internal/frontend/desktop/windows/frontend.go
View File

@ -13,8 +13,6 @@ import (
"strings" "strings"
"text/template" "text/template"
"github.com/leaanthony/slicer"
"github.com/leaanthony/go-webview2/pkg/edge" "github.com/leaanthony/go-webview2/pkg/edge"
"github.com/leaanthony/winc" "github.com/leaanthony/winc"
"github.com/leaanthony/winc/w32" "github.com/leaanthony/winc/w32"
@ -278,16 +276,19 @@ func (f *Frontend) setupChromium() {
chromium.MessageCallback = f.processMessage chromium.MessageCallback = f.processMessage
chromium.WebResourceRequestedCallback = f.processRequest chromium.WebResourceRequestedCallback = f.processRequest
chromium.NavigationCompletedCallback = f.navigationCompleted 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 { 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) 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
//return true
} }
chromium.Embed(f.mainWindow.Handle()) chromium.Embed(f.mainWindow.Handle())
chromium.Resize() chromium.Resize()
@ -311,7 +312,7 @@ func (f *Frontend) setupChromium() {
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
err = settings.PutIsStatusBarEnabled(false) err = settings.PutAreBrowserAcceleratorKeysEnabled(false)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }