53fd879043
* chore: bump chromium in DEPS to 138.0.7180.0 * 6546797: Add a metric for the overall success of the "safe storage" item retrieval. Refs6546797* 6548078: extensions: Fix TODO in ScriptInjectionTracker for desktop Android Refs6548078* 6544950: Revert "FSA: Only normalize the hardcoded rules once during initialization" Refs6544950* chore: bump chromium in DEPS to 138.0.7181.0 * chore: update patches * fix: correctly clamp HSL shift values between 0 and 1 * chore: bump DEPS to 138.0.7183.0 * 6553142: Remove SelectFileDialogLinuxKde |6553142* chore: update patches * chore: bump chromium in DEPS to 138.0.7184.0 * chore: bump chromium in DEPS to 138.0.7186.0 * chore: bump chromium in DEPS to 138.0.7190.0 * chore: update patches * 6547778: Remove some superfluous //ui/gfx includes from //chrome headers |6547778* 6556022: Reland FSA: Only normalize the hardcoded rules once during initialization |6556022* fix: remove pdf_extension_util::AddAdditionalData4099130This was removed 2 years ago in Chrome. * fix: provide BrowserContext to pdf_extension_util::AddAdditionalData6558173* fixup! 6556022: Reland FSA: Only normalize the hardcoded rules once during initialization |6556022* fix: pass in navigation throttle registry6536175* fixup! 6556022: Reland "FSA: Only normalize the hardcoded rules once during initialization" |6556022This partially reverts commit 20d709dd15ba0ff332e24ee314149d642dc5d47c. * 6545984: corner-shape: render dashed & dotted borders Refs6545984* Update corner smoothing expected images * Apply "future" revert commit to fix windows build > Reason for revert: Multiple eng reporting that this is causing build failures due to too-long pathnames, with no immediate feasible workaround This issue also affects our CI builds. Problematic CL in current roll: 6494836: [webgl] Add stub WebGL[2]RenderingContextWebGPU |6494836"Future" revert CL: 6565622: Revert "[webgl] Add stub WebGL[2]RenderingContextWebGPU" |6565622This patch should automatically disappear when we roll the revert. * 6533919: win: don't add WS_CAPTION style to popup windows6533919This mirrors the change made earlier to the code ours is based on: 6374074: [headless] Provide headless aware window metrics on Windows |6374074--------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: David Sanders <dsanders11@ucsbalum.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> Co-authored-by: clavin <clavin@electronjs.org>
68 lines
2.8 KiB
Diff
68 lines
2.8 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 30399c8a81819a57f07702a97f85e3edd7df9d69..1559eb26fb86ac6172509785afff1e0bbd226ee7 100644
|
|
--- a/ui/views/win/hwnd_message_handler.cc
|
|
+++ b/ui/views/win/hwnd_message_handler.cc
|
|
@@ -937,13 +937,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,
|
|
@@ -1732,7 +1732,7 @@ void HWNDMessageHandler::OnActivateApp(BOOL active, DWORD thread_id) {
|
|
if (delegate_->HasNonClientView() && !active &&
|
|
thread_id != GetCurrentThreadId()) {
|
|
// Update the native frame if it is rendering the non-client area.
|
|
- if (HasSystemFrame()) {
|
|
+ if (is_translucent_ || HasSystemFrame()) {
|
|
DefWindowProcWithRedrawLock(WM_NCACTIVATE, FALSE, 0);
|
|
}
|
|
}
|
|
@@ -2340,17 +2340,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) {
|