cfc0826b65
* chore: bump chromium in DEPS to 117.0.5899.0 * 4686653: webui: Filter out non-chrome scheme URLs in WebUIConfigMap https://chromium-review.googlesource.com/c/chromium/src/+/4686653 * 4696355: Remove deprecated version of base::CommandLine::CopySwitchesFrom() https://chromium-review.googlesource.com/c/chromium/src/+/4696355 * chore: fixup patch indices * 4603888: Reland "Enable raw_ref check on linux" https://chromium-review.googlesource.com/c/chromium/src/+/4603888 * chore: bump chromium in DEPS to 117.0.5901.0 * chore: update patches * chore: bump chromium in DEPS to 117.0.5903.0 * chore: bump chromium in DEPS to 117.0.5903.2 * chore: bump chromium in DEPS to 117.0.5905.0 * 4706792: Printing: Add debug code for a DispatchBeforePrintEvent() failure https://chromium-review.googlesource.com/c/chromium/src/+/4706792 * 4704786: Refactor libunwind build rules/flags https://chromium-review.googlesource.com/c/chromium/src/+/4704786 * 4701710: [Linux Ui] Set toolkit dark preference based on FDO dark preference https://chromium-review.googlesource.com/c/chromium/src/+/4701710 * chore: fixup patch indices * chore: bump chromium in DEPS to 117.0.5907.0 * chore: bump chromium in DEPS to 117.0.5909.2 * chore: update patches * chore: bump chromium in DEPS to 117.0.5911.0 * chore: update patches * chore: build-what-we-include * fix: set allowFileAccess on devtools extensions correctly Ref: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/4714725 * 4670615: Reland "[iterator-helpers] Shipping iterator helpers" https://chromium-review.googlesource.com/c/v8/v8/+/4670615 --------- 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: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <marshallofsound@electronjs.org>
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 0d39d88d3084bd3f38231e476b215f29623ac1e7..bf967adcc74c1c97036e7f9d01e7afe3eb141a78 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();
|