mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

feat: add support for preventing the system context menu (#25795)

Browse source
This commit is contained in:
Samuel Attard 2020-10-08 15:45:05 -07:00 • committed by GitHub
parent 042d25e926
commit 6d5cf02abd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 36 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
shell/browser/api/electron_api_base_window.cc
View file

@ -294,6 +294,12 @@ void BaseWindow::OnNewWindowForTab() {
Emit("new-window-for-tab");
}
void BaseWindow::OnSystemContextMenu(int x, int y, bool* prevent_default) {
if (Emit("system-context-menu", gfx::Point(x, y))) {
*prevent_default = true;
}
}
#if defined(OS_WIN)
void BaseWindow::OnWindowMessage(UINT message, WPARAM w_param, LPARAM l_param) {
if (IsWindowMessageHooked(message)) {

1
shell/browser/api/electron_api_base_window.h
View file

@ -82,6 +82,7 @@ class BaseWindow : public gin_helper::TrackableObject<BaseWindow>,
void OnTouchBarItemResult(const std::string& item_id,
const base::DictionaryValue& details) override;
void OnNewWindowForTab() override;
void OnSystemContextMenu(int x, int y, bool* prevent_default) override;
#if defined(OS_WIN)
void OnWindowMessage(UINT message, WPARAM w_param, LPARAM l_param) override;
#endif

7
shell/browser/native_window.cc
View file

@ -579,6 +579,13 @@ void NativeWindow::NotifyNewWindowForTab() {
observer.OnNewWindowForTab();
}
void NativeWindow::NotifyWindowSystemContextMenu(int x,
int y,
bool* prevent_default) {
for (NativeWindowObserver& observer : observers_)
observer.OnSystemContextMenu(x, y, prevent_default);
}
#if defined(OS_WIN)
void NativeWindow::NotifyWindowMessage(UINT message,
WPARAM w_param,

1
shell/browser/native_window.h
View file

@ -288,6 +288,7 @@ class NativeWindow : public base::SupportsUserData,
void NotifyTouchBarItemInteraction(const std::string& item_id,
const base::DictionaryValue& details);
void NotifyNewWindowForTab();
void NotifyWindowSystemContextMenu(int x, int y, bool* prevent_default);
#if defined(OS_WIN)
void NotifyWindowMessage(UINT message, WPARAM w_param, LPARAM l_param);

1
shell/browser/native_window_observer.h
View file

@ -92,6 +92,7 @@ class NativeWindowObserver : public base::CheckedObserver {
virtual void OnTouchBarItemResult(const std::string& item_id,
const base::DictionaryValue& details) {}
virtual void OnNewWindowForTab() {}
virtual void OnSystemContextMenu(int x, int y, bool* prevent_default) {}
// Called when window message received
#if defined(OS_WIN)

6
shell/browser/native_window_views_win.cc
View file

@ -306,6 +306,12 @@ bool NativeWindowViews::PreHandleMSG(UINT message,
}
return false;
}
case WM_CONTEXTMENU: {
bool prevent_default = false;
NotifyWindowSystemContextMenu(GET_X_LPARAM(l_param),
GET_Y_LPARAM(l_param), &prevent_default);
return prevent_default;
}
default:
return false;
}