bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Windows: Fix focus/activation handling and keyboard input (issue #1700)

Browse Source
This commit is contained in:
Marshall Greenblatt
2015-08-27 17:55:48 -04:00
parent c2086cf7c7
commit 4a8546efd7
5 changed files with 52 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
libcef/browser/browser_host_impl_win.cc
View File

@@ -864,10 +864,34 @@ void CefBrowserHostImpl::PlatformSetFocus(bool focus) {
}
if (window_widget_) {
// Give native focus to the DesktopNativeWidgetAura for the root window.
// Needs to be done via the HWND so that keyboard focus is assigned
// correctly. DesktopNativeWidgetAura will update focus state on the
// aura::Window when WM_SETFOCUS and WM_KILLFOCUS are received.
// Give native focus to the DesktopWindowTreeHostWin associated with the
// root window.
//
// The DesktopWindowTreeHostWin HandleNativeFocus/HandleNativeBlur methods
// are called in response to WM_SETFOCUS/WM_KILLFOCUS respectively. The
// implementation has been patched to call HandleActivationChanged which
// results in the following behaviors:
// 1. Update focus/activation state of the aura::Window indirectly via
// wm::FocusController. This allows focus-related behaviors (e.g. focus
// rings, flashing caret, onFocus/onBlur JS events, etc.) to work as
// expected (see issue #1677).
// 2. Update focus state of the ui::InputMethod. If this does not occur
// then InputMethodBase::GetTextInputClient will return NULL and
// InputMethodWin::OnChar will fail to sent character events to the
// renderer (see issue #1700).
//
// This differs from activation in Chrome which is handled via
// HWNDMessageHandler::PostProcessActivateMessage (Widget::Show indirectly
// calls HWNDMessageHandler::Activate which calls ::SetForegroundWindow
// resulting in a WM_ACTIVATE message being sent to the window). The Chrome
// code path doesn't work for CEF because IsTopLevelWindow in
// hwnd_message_handler.cc will return false and consequently
// HWNDMessageHandler::PostProcessActivateMessage will not be called.
//
// Activation events are usually reserved for the top-level window so
// triggering activation based on focus events may be incorrect in some
// circumstances. Revisit this implementation if additional problems are
// discovered.
::SetFocus(HWNDForWidget(window_widget_));
}
}

11
libcef/browser/window_delegate_view.cc
View File

@@ -41,6 +41,13 @@ void CefWindowDelegateView::Init(
params.opacity = views::Widget::InitParams::OPAQUE_WINDOW;
// Tell Aura not to draw the window frame on resize.
params.remove_standard_frame = true;
#if defined(OS_WIN)
// Cause WidgetDelegate::CanActivate to return true. See comments in
// CefBrowserHostImpl::PlatformSetFocus.
// TODO(cef): Do we need similar logic on Linux for proper activation/focus
// handling?
params.activatable = views::Widget::InitParams::ACTIVATABLE_YES;
#endif
// Results in a call to InitContent().
widget->Init(params);
@@ -49,6 +56,10 @@ void CefWindowDelegateView::Init(
DCHECK_EQ(widget, GetWidget());
// |widget| must be top-level for focus handling to work correctly.
DCHECK(widget->is_top_level());
#if defined(OS_WIN)
// |widget| must be activatable for focus handling to work correctly.
DCHECK(widget->widget_delegate()->CanActivate());
#endif
}
void CefWindowDelegateView::InitContent() {