c3036d4557
* chore: bump chromium in DEPS to 117.0.5929.0 * chore: bump chromium in DEPS to 117.0.5931.0 * chore: bump chromium in DEPS to 117.0.5932.0 * chore: update patches * 4728317: Prevent PrintRenderFrameHelper from printing when already printing | https://chromium-review.googlesource.com/c/chromium/src/+/4728317 * 4739501: Use base::SequenceBound to manage SerialPortManagerImpl | https://chromium-review.googlesource.com/c/chromium/src/+/4739501 * 4702051: Allow overriding source in install-sysroot.py | https://chromium-review.googlesource.com/c/chromium/src/+/4702051 * chore: update filenames.libcxx.gni * 4727002: Rename "enable_arc2" to "enable_arc" | https://chromium-review.googlesource.com/c/chromium/src/+/4727002 * chore: bump chromium in DEPS to 117.0.5934.0 * 4736873: Rename ColorSpaces methods on display::Display | https://chromium-review.googlesource.com/c/chromium/src/+/4736873 * 4727203: Replace bool with an enum in as suggested in DevtoolsManagerDelegate. | https://chromium-review.googlesource.com/c/chromium/src/+/4727203 * 4744479: [DevTools] Add 'generateTaggedPDF' option to DevTools Page.printToPDF | https://chromium-review.googlesource.com/c/chromium/src/+/4744479 * 4735893: Don't share WebUSB permissions with webviews | https://chromium-review.googlesource.com/c/chromium/src/+/4735893 * revert: update filenames.libcxx.gni * chore: bump chromium in DEPS to 117.0.5936.0 * chore: update patches * 4746465: SAA: Query for embargoed StorageAccess permissions | https://chromium-review.googlesource.com/c/chromium/src/+/4746465 * 4666325: Move buildtools/third_party/lib*/trunk source paths to third_party/lib*/src. | https://chromium-review.googlesource.com/c/chromium/src/+/4666325 * chore: bump chromium in DEPS to 117.0.5938.0 * chore: bump chromium in DEPS to 118.0.5939.0 * chore: update patches * Send line bounds through CursorAnchorInfo on requestCursorUpdate https://chromium-review.googlesource.com/c/chromium/src/+/4394588 * Fixup lint for Move buildtools/third_party/lib*/trunk source paths to third_party/lib*/src * 4700305: [mac] Fix override of CHILD_PROCESS_EXE https://chromium-review.googlesource.com/c/chromium/src/+/4700305 Needed because of 4729689: Reland "Remove redundant existence check in PathService" | https://chromium-review.googlesource.com/c/chromium/src/+/4729689 * 4753759: More consistent icon handling for menus. https://chromium-review.googlesource.com/c/chromium/src/+/4753759 * chore: bump chromium in DEPS to 118.0.5941.0 * chore: update patches * chore: bump chromium in DEPS to 117.0.5938.0 * test: update nan-spec-runner cflags * build: fix isystem include path in nan-spec-runner * fixup! 4666325: Move buildtools/third_party/lib*/trunk source paths to third_party/lib*/src. | https://chromium-review.googlesource.com/c/chromium/src/+/4666325 fix a few more instances of the old path libc++.a and libc++abi.a are still in buildtools/ --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com>
48 lines
2.4 KiB
Diff
48 lines
2.4 KiB
Diff
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
|
|
index ec7a05ac5c261c0292684b47db275f7b1ef5daa4..13268bd89c710690eed5296f4b2157e9476f195e 100644
|
|
--- a/ui/views/win/hwnd_message_handler.cc
|
|
+++ b/ui/views/win/hwnd_message_handler.cc
|
|
@@ -1873,7 +1873,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();
|