Skip to content

Commit 81a2048

Browse files
committed
Use the typed enum CefEventFlags for modifiers in keyboard events.
1 parent 349edc7 commit 81a2048

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

CefSharp.Core/Internals/ClientAdapter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ namespace CefSharp
140140

141141
// TODO: windows_key_code could possibly be the wrong choice here (the OnKeyEvent signature has changed since CEF1). The
142142
// other option would be native_key_code.
143-
return handler->OnKeyEvent(_browserControl, KeyTypeToManaged(event.type), event.windows_key_code, event.modifiers, event.is_system_key == 1);
143+
return handler->OnKeyEvent(_browserControl, KeyTypeToManaged(event.type), event.windows_key_code, (CefEventFlags)event.modifiers, event.is_system_key == 1);
144144
}
145145

146146
bool ClientAdapter::OnPreKeyEvent(CefRefPtr<CefBrowser> browser, const CefKeyEvent& event, CefEventHandle os_event, bool* is_keyboard_shortcut)
@@ -152,7 +152,7 @@ namespace CefSharp
152152
return false;
153153
}
154154

155-
return handler->OnPreKeyEvent(_browserControl, (KeyType)event.type, event.windows_key_code, event.native_key_code, event.modifiers, event.is_system_key == 1, *is_keyboard_shortcut);
155+
return handler->OnPreKeyEvent(_browserControl, (KeyType)event.type, event.windows_key_code, event.native_key_code, (CefEventFlags)event.modifiers, event.is_system_key == 1, *is_keyboard_shortcut);
156156
}
157157

158158
void ClientAdapter::OnLoadStart(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame)

CefSharp/IKeyboardHandler.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace CefSharp
66
{
77
public interface IKeyboardHandler
88
{
9-
bool OnKeyEvent(IWebBrowser browser, KeyType type, int code, int modifiers, bool isSystemKey);
10-
bool OnPreKeyEvent(IWebBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, int modifiers, bool isSystemKey, bool isKeyboardShortcut);
9+
bool OnKeyEvent(IWebBrowser browser, KeyType type, int code, CefEventFlags modifiers, bool isSystemKey);
10+
bool OnPreKeyEvent(IWebBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey, bool isKeyboardShortcut);
1111
}
1212
}

0 commit comments

Comments
 (0)