Skip to content

Commit 42944e0

Browse files
committed
Fix: #62
1 parent 97e210e commit 42944e0

File tree

2 files changed

+16
-9
lines changed

2 files changed

+16
-9
lines changed

cef/chromium_browser.go

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -258,14 +258,20 @@ func (m *TCEFChromiumBrowser) RegisterDefaultEvent() {
258258
if m.window == nil || m.window.WindowType() == consts.WT_DEV_TOOLS || m.window.WindowType() == consts.WT_VIEW_SOURCE {
259259
return
260260
}
261-
if m.Chromium().Config().EnableDevTools() {
262-
if event.WindowsKeyCode == consts.VkF12 && event.Kind == consts.KEYEVENT_RAW_KEYDOWN {
263-
browser.ShowDevTools(m.window, m)
261+
if event.WindowsKeyCode == consts.VkF12 {
262+
if event.Kind == consts.KEYEVENT_RAW_KEYDOWN {
263+
if m.Chromium().Config().EnableDevTools() {
264+
browser.ShowDevTools(m.window, m)
265+
}
264266
*result = true
265-
} else if event.WindowsKeyCode == consts.VkF12 && event.Kind == consts.KEYEVENT_KEYUP {
267+
} else if event.Kind == consts.KEYEVENT_KEYUP {
266268
*result = true
267269
}
268270
}
271+
isCtrlPressed := (event.Modifiers & consts.EVENTFLAG_CONTROL_DOWN) != 0
272+
if isCtrlPressed && event.WindowsKeyCode == consts.VkU {
273+
*result = true
274+
}
269275
if KeyAccelerator.accelerator(browser, event, result) {
270276
return
271277
}

cef/types_menumodel.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,16 @@ func (m *keyEventAccelerator) AddAcceleratorCustom(accelerator *AcceleratorCusto
5959
accelerator.Accelerator = strings.Replace(strings.ToUpper(accelerator.Accelerator), " ", "", -1)
6060
as := strings.Split(accelerator.Accelerator, "+")
6161
if len(as) > 0 && len(as) <= 4 {
62-
var shift = ArrayIndexOf(as, MA_Shift) != -1
63-
var ctrl = ArrayIndexOf(as, MA_Ctrl) != -1
64-
var alt = ArrayIndexOf(as, MA_Alt) != -1
65-
var keyCode = rune(strings.ToUpper(as[len(as)-1])[0])
62+
shift := ArrayIndexOf(as, MA_Shift) != -1
63+
ctrl := ArrayIndexOf(as, MA_Ctrl) != -1
64+
alt := ArrayIndexOf(as, MA_Alt) != -1
65+
keyCode := rune(strings.ToUpper(as[len(as)-1])[0])
6666
accelerator.Accelerator = acceleratorCode(shift, ctrl, alt, keyCode)
6767
m.acceleratorCustom[accelerator.Accelerator] = accelerator
6868
}
6969
}
7070

71+
// 自定义快捷键
7172
func (m *keyEventAccelerator) acceleratorCustomCallback(accelerator string, browse *ICefBrowser, event *TCefKeyEvent, result *bool) bool {
7273
if item, ok := m.acceleratorCustom[accelerator]; ok {
7374
if item.Callback != nil {
@@ -123,6 +124,7 @@ func (m *keyEventAccelerator) accelerator(browse *ICefBrowser, event *TCefKeyEve
123124
return false
124125
}
125126

127+
// 右键快捷键
126128
func (m *keyEventAccelerator) acceleratorEventCallback(browse *ICefBrowser, accelerator string, result *bool) bool {
127129
if item, ok := m.acceleratorItems[accelerator]; ok {
128130
if item.Callback != nil {
@@ -147,7 +149,6 @@ func (m *ICefMenuModel) AddMenuItem(item *MenuItem) bool {
147149
if item.CommandId == 0 {
148150
item.CommandId = KeyAccelerator.NextCommandId()
149151
}
150-
//if item.CommandId >= MENU_ID_USER_FIRST && item.CommandId <= MENU_ID_USER_LAST {
151152
if item.MenuType == CMT_NONE {
152153
m.AddItem(item.CommandId, item.Text)
153154
} else if item.MenuType == CMT_CHECK {

0 commit comments

Comments
 (0)