electron/patches/chromium/fix_remove_caption-removing_style_call.patch

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

49 lines
2.4 KiB
Diff
Raw Normal View History

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Wed, 17 Aug 2022 13:49:40 -0700
Subject: fix: Adjust caption-removing style call
There is a SetWindowLong call that removes WS_CAPTION for frameless
windows, but Electron uses WS_CAPTION even for frameless windows,
unless they are transparent.
Changing this call only affects frameless windows, and it fixes
a visual glitch where they showed a Windows 7 style frame
during startup.
The if statement was originally introduced by
https://codereview.chromium.org/9372053/, and it was there to fix
a visual glitch with the close button showing up during startup
or resizing, but Electron does not seem to run into that issue
for opaque frameless windows even with that block commented out.
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
chore: bump chromium to 137.0.7141.0 (main) (#46725) * chore: bump chromium in DEPS to 137.0.7139.0 * chore: bump chromium in DEPS to 137.0.7141.0 * chore: update patches Refs https://chromium-review.googlesource.com/c/chromium/src/+/6474596 Refs https://chromium-review.googlesource.com/c/chromium/src/+/6443472 Refs https://chromium-review.googlesource.com/c/chromium/src/+/6471184 * [ServiceWorker] Pipe is_for_service_worker into OverrideURLLoaderFactoryParams Refs https://chromium-review.googlesource.com/c/chromium/src/+/6459481 * Reland "[PermissionOptions] Use PermissionDescriptorPtr in PermissionControllerDelegate" Refs https://chromium-review.googlesource.com/c/chromium/src/+/6455975 * clickiness: Check attestation and user settings on origins Refs https://chromium-review.googlesource.com/c/chromium/src/+/6356796 * extensions : Move ReloadExtension from ExtensionService Refs https://chromium-review.googlesource.com/c/chromium/src/+/6472812 Refs https://chromium-review.googlesource.com/c/chromium/src/+/6472777 * fixup! Update AppleKeychain API to be friendlier Refs https://chromium-review.googlesource.com/c/chromium/src/+/6443472 * chore: script/gen-libc++-filenames.js * Rename ColorVariant::CovertToSkColor() to ColorVariant::ResolveToSkColor() Refs https://chromium-review.googlesource.com/c/chromium/src/+/6373793 * [headless] Provide headless aware window metrics on Windows Refs https://chromium-review.googlesource.com/c/chromium/src/+/6374074 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
2025-04-24 17:18:38 +09:00
index 5b17d5bf0b32405ae9515b941a17b68a04a3b317..6e706c32ca4c2a5d0831588ee2eea8a8059f04fe 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
chore: bump chromium to 137.0.7141.0 (main) (#46725) * chore: bump chromium in DEPS to 137.0.7139.0 * chore: bump chromium in DEPS to 137.0.7141.0 * chore: update patches Refs https://chromium-review.googlesource.com/c/chromium/src/+/6474596 Refs https://chromium-review.googlesource.com/c/chromium/src/+/6443472 Refs https://chromium-review.googlesource.com/c/chromium/src/+/6471184 * [ServiceWorker] Pipe is_for_service_worker into OverrideURLLoaderFactoryParams Refs https://chromium-review.googlesource.com/c/chromium/src/+/6459481 * Reland "[PermissionOptions] Use PermissionDescriptorPtr in PermissionControllerDelegate" Refs https://chromium-review.googlesource.com/c/chromium/src/+/6455975 * clickiness: Check attestation and user settings on origins Refs https://chromium-review.googlesource.com/c/chromium/src/+/6356796 * extensions : Move ReloadExtension from ExtensionService Refs https://chromium-review.googlesource.com/c/chromium/src/+/6472812 Refs https://chromium-review.googlesource.com/c/chromium/src/+/6472777 * fixup! Update AppleKeychain API to be friendlier Refs https://chromium-review.googlesource.com/c/chromium/src/+/6443472 * chore: script/gen-libc++-filenames.js * Rename ColorVariant::CovertToSkColor() to ColorVariant::ResolveToSkColor() Refs https://chromium-review.googlesource.com/c/chromium/src/+/6373793 * [headless] Provide headless aware window metrics on Windows Refs https://chromium-review.googlesource.com/c/chromium/src/+/6374074 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
2025-04-24 17:18:38 +09:00
@@ -1807,7 +1807,23 @@ LRESULT HWNDMessageHandler::OnCreate(CREATESTRUCT* create_struct) {
SendMessage(hwnd(), WM_CHANGEUISTATE, MAKELPARAM(UIS_CLEAR, UISF_HIDEFOCUS),
0);
- if (!delegate_->HasFrame()) {
+ LONG is_popup =
+ GetWindowLong(hwnd(), GWL_STYLE) & static_cast<LONG>(WS_POPUP);
+
+ // For transparent windows, Electron removes the WS_CAPTION style,
+ // so we continue to remove it here. If we didn't, an opaque rectangle
+ // would show up.
+ // For non-transparent windows, Electron keeps the WS_CAPTION style,
+ // so we don't remove it in that case. If we did, a Windows 7 frame
+ // would show up.
+ // We also need this block for frameless popup windows. When the user opens
+ // a dropdown in an Electron app, the internal popup menu from
+ // third_party/blink/renderer/core/html/forms/internal_popup_menu.h
+ // is rendered. That menu is actually an HTML page inside of a frameless popup window.
+ // A new popup window is created every time the user opens the dropdown,
+ // and this code path is run. The code block below runs SendFrameChanged,
+ // which gives the dropdown options the proper layout.
+ if (!delegate_->HasFrame() && (is_translucent_ || is_popup)) {
SetWindowLong(hwnd(), GWL_STYLE,
GetWindowLong(hwnd(), GWL_STYLE) & ~WS_CAPTION);
SendFrameChanged();