mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
7eaca97133
* chore: bump chromium in DEPS to 146.0.7680.0 * fix(patch): constant moved to header Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7536483 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> (cherry picked from commit6b348354f6) * chore: update patches * 7535923: Rename ozone buildflags Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7535923 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> (cherry picked from commit96e2a174fd) * 7528398: [LNA] Rename PNA-named files to LNA-named files Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7528398 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> (cherry picked from commita4f879ce52) * 7534194: Convert some functions in ui::Clipboard to async Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7534194 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> (cherry picked from commit30bbb9456f) * 7544580: [DevTools] Add command to restart Chrome to DevTools UI bindings Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7544580 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> (cherry picked from commit6737a36cda) * fix(patch): V1 Keychain removal Upstream deleted the V1 Keychain API. Removed V1 hunks and adapted keychain_password_mac.mm to use KeychainV2 APIs. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7540447 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> (cherry picked from commit02d423c1bb) * chore: update patches * fixup 7534194: Convert some functions in ui::Clipboard to async * chore: bump chromium in DEPS to 146.0.7680.16 * chore: update patches --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: John Kleinschmidt <kleinschmidtorama@gmail.com>
49 lines
2.4 KiB
Diff
49 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 fd21436484c851acfe0027cfc475ebef5e642d64..bbd092d2a90765c52fd5792ee37a909d028634fe 100644
|
|
--- a/ui/views/win/hwnd_message_handler.cc
|
|
+++ b/ui/views/win/hwnd_message_handler.cc
|
|
@@ -1856,7 +1856,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();
|