fix: titlebar incorrectly displayed on frameless windows (#40749)
* fix: titlebar incorrectly displayed on frameless windows * fix: enable transparency for Mica windows * Refactor ShouldWindowContentsBeTransparent --------- Co-authored-by: clavin <clavin@electronjs.org>
This commit is contained in:
parent
7995c56fb0
commit
a208d45aca
2 changed files with 42 additions and 7 deletions
|
@ -1,19 +1,23 @@
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
From: clavin <clavin@electronjs.org>
|
From: clavin <clavin@electronjs.org>
|
||||||
Date: Wed, 30 Aug 2023 18:15:36 -0700
|
Date: Mon, 11 Dec 2023 20:43:34 -0300
|
||||||
Subject: fix: activate background material on windows
|
Subject: fix: activate background material on windows
|
||||||
|
|
||||||
This patch adds a condition to the HWND message handler to allow windows
|
This patch adds a condition to the HWND message handler to allow windows
|
||||||
with translucent background materials to become activated.
|
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 patch likely can't be upstreamed as-is, as Chromium doesn't have
|
||||||
this use case in mind currently.
|
this use case in mind currently.
|
||||||
|
|
||||||
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
|
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
|
||||||
index 23905a6b7f739ff3c6f391f984527ef5d2ed0bd9..ee72bad1b884677b02cc2f86ea307742e5528bad 100644
|
index 23905a6b7f739ff3c6f391f984527ef5d2ed0bd9..aed8894a5514fddfc8d15b8fb4ae611fa4493b6f 100644
|
||||||
--- a/ui/views/win/hwnd_message_handler.cc
|
--- a/ui/views/win/hwnd_message_handler.cc
|
||||||
+++ b/ui/views/win/hwnd_message_handler.cc
|
+++ b/ui/views/win/hwnd_message_handler.cc
|
||||||
@@ -901,7 +901,7 @@ void HWNDMessageHandler::FrameTypeChanged() {
|
@@ -901,13 +901,13 @@ void HWNDMessageHandler::FrameTypeChanged() {
|
||||||
|
|
||||||
void HWNDMessageHandler::PaintAsActiveChanged() {
|
void HWNDMessageHandler::PaintAsActiveChanged() {
|
||||||
if (!delegate_->HasNonClientView() || !delegate_->CanActivate() ||
|
if (!delegate_->HasNonClientView() || !delegate_->CanActivate() ||
|
||||||
|
@ -22,3 +26,34 @@ index 23905a6b7f739ff3c6f391f984527ef5d2ed0bd9..ee72bad1b884677b02cc2f86ea307742
|
||||||
(delegate_->GetFrameMode() == FrameMode::CUSTOM_DRAWN)) {
|
(delegate_->GetFrameMode() == FrameMode::CUSTOM_DRAWN)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
DefWindowProcWithRedrawLock(WM_NCACTIVATE, delegate_->ShouldPaintAsActive(),
|
||||||
|
- 0);
|
||||||
|
+ delegate_->HasFrame() ? 0 : -1);
|
||||||
|
}
|
||||||
|
|
||||||
|
void HWNDMessageHandler::SetWindowIcons(const gfx::ImageSkia& window_icon,
|
||||||
|
@@ -2254,17 +2254,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) {
|
||||||
|
|
|
@ -135,12 +135,12 @@ void ElectronDesktopWindowTreeHostWin::OnNativeThemeUpdated(
|
||||||
|
|
||||||
bool ElectronDesktopWindowTreeHostWin::ShouldWindowContentsBeTransparent()
|
bool ElectronDesktopWindowTreeHostWin::ShouldWindowContentsBeTransparent()
|
||||||
const {
|
const {
|
||||||
// Window should be marked as opaque if no transparency setting has been set,
|
// Window should be marked as opaque if no transparency setting has been
|
||||||
// otherwise videos rendered in the window will trigger a DirectComposition
|
// set, otherwise animations or videos rendered in the window will trigger a
|
||||||
// redraw for every frame.
|
// DirectComposition redraw for every frame.
|
||||||
// https://github.com/electron/electron/pull/39895
|
// https://github.com/electron/electron/pull/39895
|
||||||
return native_window_view_->GetOpacity() < 1.0 ||
|
return native_window_view_->GetOpacity() < 1.0 ||
|
||||||
native_window_view_->transparent();
|
native_window_view_->IsTranslucent();
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace electron
|
} // namespace electron
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue