1 From fcbb9bc7c390f2b9ab54c9f8996140ff83b46538 Mon Sep 17 00:00:00 2001
2 From: Roger Zanoni <rzanoni@igalia.com>
3 Date: Sun, 2 Jul 2023 12:08:59 +0200
4 Subject: [PATCH 08/10] Add the SetActivateRegion method
7 include/views/cef_window.h | 6 ++++++
8 libcef/browser/views/view_util.h | 1 +
9 libcef/browser/views/view_util_aura.cc | 17 +++++++++++++++++
10 libcef/browser/views/window_impl.cc | 7 +++++++
11 libcef/browser/views/window_impl.h | 1 +
12 5 files changed, 32 insertions(+)
14 diff --git a/include/views/cef_window.h b/include/views/cef_window.h
15 index 063529964..52ccb7dc5 100644
16 --- a/include/views/cef_window.h
17 +++ b/include/views/cef_window.h
18 @@ -387,6 +387,12 @@ class CefWindow : public CefPanel {
20 virtual bool IsSurfaceConfigured() = 0;
23 + /// A hint for the compositor to use a custom area, rather than inferring the activation area.
26 + virtual void SetupActivationArea(uint32_t x, uint32_t y, uint32_t width, uint32_t height) = 0;
31 diff --git a/libcef/browser/views/view_util.h b/libcef/browser/views/view_util.h
32 index 20b97038b..76c023254 100644
33 --- a/libcef/browser/views/view_util.h
34 +++ b/libcef/browser/views/view_util.h
35 @@ -149,6 +149,7 @@ void AglSetAppReady(views::Widget* widget);
36 void AglSetBackGroundApp(views::Widget* widget);
37 void AglSetPanelApp(views::Widget* widget, uint32_t edge);
38 bool IsSurfaceConfigured(views::Widget* widget);
39 +void SetupActivationArea(views::Widget* widget, uint32_t x, uint32_t y, uint32_t width, uint32_t height);
43 diff --git a/libcef/browser/views/view_util_aura.cc b/libcef/browser/views/view_util_aura.cc
44 index b5b4f414b..96e44dbb6 100644
45 --- a/libcef/browser/views/view_util_aura.cc
46 +++ b/libcef/browser/views/view_util_aura.cc
47 @@ -101,6 +101,23 @@ bool IsSurfaceConfigured(views::Widget* widget) {
51 +void SetupActivationArea(views::Widget* widget,
59 + aura::Window* window = widget->GetNativeWindow();
60 + if (window && window->GetRootWindow()) {
61 + window->GetHost()->SetupActivationArea(x,
70 } // namespace view_util
71 diff --git a/libcef/browser/views/window_impl.cc b/libcef/browser/views/window_impl.cc
72 index 1b5d196ab..485943ec6 100644
73 --- a/libcef/browser/views/window_impl.cc
74 +++ b/libcef/browser/views/window_impl.cc
75 @@ -548,6 +548,13 @@ bool CefWindowImpl::IsSurfaceConfigured() {
76 return view_util::IsSurfaceConfigured(widget_);
79 +void CefWindowImpl::SetupActivationArea(uint32_t x,
83 + view_util::SetupActivationArea(widget_, x, y, width, height);
88 void CefWindowImpl::SendKeyPress(int key_code, uint32 event_flags) {
89 diff --git a/libcef/browser/views/window_impl.h b/libcef/browser/views/window_impl.h
90 index 4ab77dbe6..89c136873 100644
91 --- a/libcef/browser/views/window_impl.h
92 +++ b/libcef/browser/views/window_impl.h
93 @@ -140,6 +140,7 @@ class CefWindowImpl
94 void AglSetBackGroundApp() override;
95 void AglSetPanelApp(uint32_t edge) override;
96 bool IsSurfaceConfigured() override;
97 + void SetupActivationArea(uint32_t x, uint32_t y, uint32_t width, uint32_t height) override;