@@ -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+ // 自定义快捷键
7172func (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+ // 右键快捷键
126128func (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