48801be8e9
* chore: bump chromium in DEPS to 132.0.6791.0 * 5804481: [UI] Migrate remaining clients of `MenuSourceType`5804481* chore: try revert PA CL * chore: bump chromium in DEPS to 132.0.6793.0 * chore: bump chromium in DEPS to 132.0.6794.0 * 5952404: Clean up //ui/base/resource from Lacros code.5952404* 5920842: Generate combined grd for PEPC strings and use them in the element5920842* 5943708: Enable DynamicSafeAreaInsets for eligible users only5943708* chore: fixup patch indices * 5937004: Remove components/services/language_detection5937004* 5920322: [UI] Use mojo enum for `MenuSourceType` in ui/views/controls/5920322* chore: bump chromium in DEPS to 132.0.6797.0 * 5947724: [ui] Add missing shortcut text for VKEY_COMMAND on linux5947724* chore: fixup patch indices * 5948024: [DNT] Fix NavigationController raw_ptr during WebContents destruction5948024* 5945209: Roll libc++ from c8eec3629a9e to e2c39ff9388b (1 revision)5945209* chore: bump chromium in DEPS to 132.0.6799.0 * chore: bump chromium in DEPS to 132.0.6801.0 * chore: bump chromium in DEPS to 132.0.6803.0 * 5942398: Remove some chrome:: namespace from chrome/browser/win/* Refs:5942398* 5963016: FSA: Use the profile path for base::DIR_HOME on ChromeOS Refs:5963016* chore: fixup patch indices * chore: bump chromium in DEPS to 132.0.6805.0 * 5924816: [macOS][FSA] Block Access to Application Bundle Path Refs:5924816* 5962517: [media] Apply inside blink to renderer/platform/media Refs:5962517* 5829616: MPArch based GuestViews basic implementation Refs:5829616* 5953710: Expose a rust_static_library instead of raw rs file from rust_bindgen Refs:5953710* chore: fixup patch indices * chore: disable ELF CREL on Linux Arm 5938657: Reapply "Enable ELF CREL, which reduces the size of ELF relocatable object files." |5938657* chore: bump chromium in DEPS to 132.0.6807.0 * 5868889: Shared Storage: Support saved queries in selectURL Refs:5868889* Revert "5956408: [fastapi] Promote deprecation of FastApiTypedArray" Refs:5956408* Revert "5962696: [mojo] Force blink headers to only be included in blink" Refs:5962696* chore: update patches * 5973073: [Extensions] Improve warnings parsing (host) permissions in MV3 Refs:5973073* chore: update filenames.libcxx.gni * Apply suggestions from code review Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: David Sanders <dsanders11@ucsbalum.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
59 lines
2.5 KiB
Diff
59 lines
2.5 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 3bc598c8a1809f55750764018402dd04dd58f255..3d72ea4ad293f1c7f64003f1ddb2cf2efe0705d4 100644
|
|
--- a/ui/views/win/hwnd_message_handler.cc
|
|
+++ b/ui/views/win/hwnd_message_handler.cc
|
|
@@ -896,13 +896,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,
|
|
@@ -2251,17 +2251,18 @@ LRESULT HWNDMessageHandler::OnNCActivate(UINT message,
|
|
if (IsVisible())
|
|
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) {
|