1 From 6515114202a98f81950687b6656151fa7cfd5ab6 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 7/9] 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 c34963302..9f196a1e7 100644
16 --- a/include/views/cef_window.h
17 +++ b/include/views/cef_window.h
18 @@ -405,6 +405,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 bf657fd39..50037a198 100644
33 --- a/libcef/browser/views/view_util.h
34 +++ b/libcef/browser/views/view_util.h
35 @@ -173,6 +173,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 2946a2d81..bf435078d 100644
45 --- a/libcef/browser/views/view_util_aura.cc
46 +++ b/libcef/browser/views/view_util_aura.cc
47 @@ -120,6 +120,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 8edac98b5..12858364e 100644
73 --- a/libcef/browser/views/window_impl.cc
74 +++ b/libcef/browser/views/window_impl.cc
75 @@ -795,4 +795,11 @@ 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);
87 diff --git a/libcef/browser/views/window_impl.h b/libcef/browser/views/window_impl.h
88 index 7f7b47e1a..aaca3c281 100644
89 --- a/libcef/browser/views/window_impl.h
90 +++ b/libcef/browser/views/window_impl.h
91 @@ -142,6 +142,7 @@ class CefWindowImpl
92 void AglSetBackGroundApp() override;
93 void AglSetPanelApp(uint32_t edge) override;
94 bool IsSurfaceConfigured() override;
95 + void SetupActivationArea(uint32_t x, uint32_t y, uint32_t width, uint32_t height) override;