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 129.0.6664.0 (main) (#43329) * chore: bump chromium in DEPS to 129.0.6657.0 * chore: update patches * chore: bump chromium in DEPS to 129.0.6658.0 * chore: update patches * 5743786: [ServiceWorker] Populate service worker start token to WorkerId. https://chromium-review.googlesource.com/c/chromium/src/+/5743786 * 5784424: [Extensions] Move ownership of Dispatcher to ExtensionsRendererClient https://chromium-review.googlesource.com/c/chromium/src/+/5784424 * chore: bump chromium in DEPS to 129.0.6659.0 * chore: bump chromium in DEPS to 129.0.6660.0 * chore: update patches * chore: bump chromium in DEPS to 129.0.6662.0 * chore: bump chromium in DEPS to 129.0.6664.0 * 5789627: [Partitioned Popins] (3) `popin` feature triggers third-party storage partitioning https://chromium-review.googlesource.com/c/chromium/src/+/5789627 * 5791367: Remove some chrome:: namespace from chrome/browser/app_mode/* https://chromium-review.googlesource.com/c/chromium/src/+/5791367 * 5791522: [SCK] Skip redundant getShareableContentWithCompletionHandler https://chromium-review.googlesource.com/c/chromium/src/+/5791522 * 5761330: Send refresh rate prefs b/w RefreshRateController and DisplayPrivate https://chromium-review.googlesource.com/c/chromium/src/+/5761330 * chore: fixup patch indices * 5793591: Remove unused GetHeader overload https://chromium-review.googlesource.com/c/chromium/src/+/5793591 * 5787624: [Extensions] Simplify ExtensionsRendererClient::RenderThreadStarted() https://chromium-review.googlesource.com/c/chromium/src/+/5787624 * 5721709: Fix Incorrect last_accessed_time Tracking for Tabs https://chromium-review.googlesource.com/c/chromium/src/+/5721709 * 5789215: [Extensions] Add a //chrome/common/extensions build target https://chromium-review.googlesource.com/c/chromium/src/+/5789215 * Roll V8 from 48f669a0758c to eee3eb91d01c https://chromium.googlesource.com/v8/v8.git/+log/48f669a0758c..eee3eb91d01c --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
2024-08-19 18:52:53 +00:00
index a5e0c59a432932ccae4f56f694196ac9635e5af7..4aae7e22cf10975df4331ad1628f0da6272e67a8 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -1731,7 +1731,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();