061e2e5e73
* chore: bump chromium in DEPS to 113.0.5645.0 * chore: update patches/chromium/mas_avoid_usage_of_private_macos_apis.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4300129 Fix simple code shear * chore: update patches/chromium/build_only_use_the_mas_build_config_in_the_required_components.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4297496 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4327491 patch-fuzz update; no manual changes * chore: remove patches/chromium/fix_x11_window_restore_minimized_maximized_window.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4252946 Upstreamed by zcbenz, so local patch is no longer needed * chore: update chromium/printing.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4313019 Remove cookie parameter from PrintViewManagerBase::UpdatePrintSettings() * chore: remove NOTIMPLEMENTED BrowserProcessImpl::GetBreadcrumbPersistentStorageManager() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4247145 method removed upstream, so we do not need to add a stub for it in the subclass * chore: remove PrintViewManagerElectron::UpdatePrintSettings() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4313019 Previously, our implementation checked to see if we recognized the cookie param that was passed in. If so, we reported a bad message. Otherwise, we passed it up to the base class' UpdatePrintSettings(). CL4313019 removed the cookie param, so checking for a bad cookie param is no longer necessary / no longer possible. Since the only remaining task was to pass the work up to the base class, this commit removes the subclass implmentation entirely. * chore: update patches * chore: bump chromium in DEPS to 113.0.5647.0 * chore: bump chromium in DEPS to 113.0.5649.2 * chore: bump chromium in DEPS to 113.0.5651.0 * chore: update patches --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.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 60a334e37e8f00be1e06fbc996b1367d88e073f2..ed0393cae510a845f4f935b606fd78859f70ec17 100644
|
|
--- a/ui/views/win/hwnd_message_handler.cc
|
|
+++ b/ui/views/win/hwnd_message_handler.cc
|
|
@@ -1850,7 +1850,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();
|