1fc3a60655
fix: `system-context-menu` should only fire in draggable regions (#45893) fix: system-context-menu should only fire in draggable regions Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
59 lines
2.4 KiB
Diff
59 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: clavin <clavin@electronjs.org>
|
|
Date: Mon, 11 Dec 2023 20:43:34 -0300
|
|
Subject: fix: activate background material on windows
|
|
|
|
This patch adds a condition to the HWND message handler to allow windows
|
|
with translucent background materials to become activated.
|
|
|
|
It also ensures the lParam of WM_NCACTIVATE is set to -1 so as to not repaint
|
|
the client area, which can lead to a title bar incorrectly being displayed in
|
|
frameless windows.
|
|
|
|
This patch likely can't be upstreamed as-is, as Chromium doesn't have
|
|
this use case in mind currently.
|
|
|
|
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
|
|
index d68fd93d4cb912b9b27d3a7cdfecc6faf638b91e..22ed43bdf4dbaccc598135807abc8383c52db50e 100644
|
|
--- a/ui/views/win/hwnd_message_handler.cc
|
|
+++ b/ui/views/win/hwnd_message_handler.cc
|
|
@@ -934,13 +934,13 @@ void HWNDMessageHandler::FrameTypeChanged() {
|
|
|
|
void HWNDMessageHandler::PaintAsActiveChanged() {
|
|
if (!delegate_->HasNonClientView() || !delegate_->CanActivate() ||
|
|
- !delegate_->HasFrame() ||
|
|
+ (!delegate_->HasFrame() && !is_translucent_) ||
|
|
(delegate_->GetFrameMode() == FrameMode::CUSTOM_DRAWN)) {
|
|
return;
|
|
}
|
|
|
|
DefWindowProcWithRedrawLock(WM_NCACTIVATE, delegate_->ShouldPaintAsActive(),
|
|
- 0);
|
|
+ delegate_->HasFrame() ? 0 : -1);
|
|
}
|
|
|
|
void HWNDMessageHandler::SetWindowIcons(const gfx::ImageSkia& window_icon,
|
|
@@ -2329,17 +2329,18 @@ LRESULT HWNDMessageHandler::OnNCActivate(UINT message,
|
|
delegate_->SchedulePaint();
|
|
}
|
|
|
|
- // Calling DefWindowProc is only necessary if there's a system frame being
|
|
- // drawn. Otherwise it can draw an incorrect title bar and cause visual
|
|
- // corruption.
|
|
- if (!delegate_->HasFrame() ||
|
|
+ // If the window is translucent, it may have the Mica background.
|
|
+ // In that case, it's necessary to call |DefWindowProc|, but we can
|
|
+ // pass -1 in the lParam to prevent any non-client area elements from
|
|
+ // being displayed.
|
|
+ if ((!delegate_->HasFrame() && !is_translucent_) ||
|
|
delegate_->GetFrameMode() == FrameMode::CUSTOM_DRAWN) {
|
|
SetMsgHandled(TRUE);
|
|
return TRUE;
|
|
}
|
|
|
|
return DefWindowProcWithRedrawLock(WM_NCACTIVATE, paint_as_active || active,
|
|
- 0);
|
|
+ delegate_->HasFrame() ? 0 : -1);
|
|
}
|
|
|
|
LRESULT HWNDMessageHandler::OnNCCalcSize(BOOL mode, LPARAM l_param) {
|