mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-12 09:37:37 +01:00
6573df6cc3
- Windows: 10.0.19041 SDK is now required. - macOS: 10.15.1 SDK (at least Xcode 11.2) is now required. - Remove CefMediaSource::IsValid and CefMediaSink::IsValid which would always return true.
16 lines
804 B
Diff
16 lines
804 B
Diff
diff --git ui/base/ime/win/input_method_win_base.cc ui/base/ime/win/input_method_win_base.cc
|
|
index fc9c8d3a0f2c..6098c4d1c9b9 100644
|
|
--- ui/base/ime/win/input_method_win_base.cc
|
|
+++ ui/base/ime/win/input_method_win_base.cc
|
|
@@ -246,8 +246,9 @@ bool InputMethodWinBase::IsWindowFocused(const TextInputClient* client) const {
|
|
// receiving keyboard input as long as it is an active window. This works well
|
|
// even when the |attached_window_handle| becomes active but has not received
|
|
// WM_FOCUS yet.
|
|
+ // With CEF |toplevel_window_handle_| may be a child window.
|
|
return toplevel_window_handle_ &&
|
|
- GetActiveWindow() == toplevel_window_handle_;
|
|
+ GetActiveWindow() == ::GetAncestor(toplevel_window_handle_, GA_ROOT);
|
|
}
|
|
|
|
LRESULT InputMethodWinBase::OnChar(HWND window_handle,
|