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
patch/patches/aura_window_1677.patch
View File

@@ -1,32 +0,0 @@
diff --git window.cc window.cc
index 6cde8c2..bdd5093 100644
--- window.cc
+++ window.cc
@@ -522,6 +522,12 @@ void Window::Focus() {
client->FocusWindow(this);
}
+void Window::Blur() {
+ client::FocusClient* client = client::GetFocusClient(this);
+ DCHECK(client);
+ client->FocusWindow(NULL);
+}
+
bool Window::HasFocus() const {
client::FocusClient* client = client::GetFocusClient(this);
return client && client->GetFocusedWindow() == this;
diff --git window.h window.h
index 5586044..53bfd2e 100644
--- window.h
+++ window.h
@@ -262,8 +262,9 @@ class AURA_EXPORT Window : public ui::LayerDelegate,
// that has a delegate set). The toplevel window may be |this|.
Window* GetToplevelWindow();
- // Claims focus.
+ // Claims or relinquishes the claim to focus.
void Focus();
+ void Blur();
// Returns true if the Window is currently the focused window.
bool HasFocus() const;

17
patch/patches/views_widget_180_1677.patch
View File

@@ -12,7 +12,7 @@ index a8e088c..838b6a0 100644
return host ? host->GetAcceleratedWidget() : NULL;
}
diff --git desktop_aura/desktop_window_tree_host_win.cc desktop_aura/desktop_window_tree_host_win.cc
index 5bee7fd..53e6c22 100644
index 5bee7fd..3d89853 100644
--- desktop_aura/desktop_window_tree_host_win.cc
+++ desktop_aura/desktop_window_tree_host_win.cc
@@ -131,7 +131,9 @@ void DesktopWindowTreeHostWin::Init(aura::Window* content_window,
@@ -26,16 +26,21 @@ index 5bee7fd..53e6c22 100644
parent_hwnd = params.parent->GetHost()->GetAcceleratedWidget();
message_handler_->set_remove_standard_frame(params.remove_standard_frame);
@@ -793,10 +795,12 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() {
@@ -792,11 +794,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() {
}
void DesktopWindowTreeHostWin::HandleNativeFocus(HWND last_focused_window) {
// TODO(beng): inform the native_widget_delegate_.
+ GetWidget()->GetNativeWindow()->Focus();
- // TODO(beng): inform the native_widget_delegate_.
+ // See comments in CefBrowserHostImpl::PlatformSetFocus.
+ if (CanActivate())
+ HandleActivationChanged(true);
}
void DesktopWindowTreeHostWin::HandleNativeBlur(HWND focused_window) {
// TODO(beng): inform the native_widget_delegate_.
+ GetWidget()->GetNativeWindow()->Blur();
- // TODO(beng): inform the native_widget_delegate_.
+ // See comments in CefBrowserHostImpl::PlatformSetFocus.
+ if (CanActivate())
+ HandleActivationChanged(false);
}
bool DesktopWindowTreeHostWin::HandleMouseEvent(const ui::MouseEvent& event) {