c92a02ea17
* chore: bump chromium to 134.0.6992.0 Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: add BrowserProcessImpl::CreateGlobalFeaturesForTesting() stub Xref:6216193Remove GlobalFeatures from TestingBrowserProcess::Init Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: bump chromium to 134.0.6994.0 Co-authored-by: Charles Kerr <charles@charleskerr.com> * 6208630: Mac sandbox: don't use protobuf for policy serialization |6208630Co-authored-by: alice <alice@makenotion.com> * Remove HasUnsupportedFeature Mojo interface Xref:6220800Co-authored-by: Charles Kerr <charles@charleskerr.com> * 6217444: Remove scoped_gdi_object.h type aliases. |6217444Co-authored-by: alice <alice@makenotion.com> * chore: bump chromium to 134.0.6998.10 Co-authored-by: Charles Kerr <charles@charleskerr.com> * 6221378: Revert [OBC] Exclude Aliasing Cookies in FilterCookiesWithOptions() |6221378Co-authored-by: alice <alice@makenotion.com> * Update ExtensionPrefs::GetDisableReasons to return DisableReasonSet Xref:6218840change copied from 6218840 extensions/shell/browser/shell_extension_loader.cc Co-authored-by: Charles Kerr <charles@charleskerr.com> * 6218402: Typemap ui.gfx.DXGIHandle <=> gfx::DXGIHandle |6218402Co-authored-by: alice <alice@makenotion.com> * chore: disable flaky contentTracing test not new to this roll; it is happening in main as well Co-authored-by: Charles Kerr <charles@charleskerr.com> * fixup! chore: disable flaky contentTracing test Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: update patches * chore: disable flaky content tracing tests on Linux (#45612) (cherry picked from commita1e4550c9e) --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: alice <alice@makenotion.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
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 9888ac709c51cd30228e3bca6915f7d89071cb83..e7b2bc1905958d2ff9c34ed7a22eb53e7ea3b9b8 100644
|
|
--- a/ui/views/win/hwnd_message_handler.cc
|
|
+++ b/ui/views/win/hwnd_message_handler.cc
|
|
@@ -932,13 +932,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,
|
|
@@ -2327,17 +2327,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) {
|