From 015cc015c8d8a7e63a41dd7dc15a8f2c5c1a7e25 Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Mon, 21 Mar 2022 16:43:00 +0900 Subject: [PATCH] chore: cherry-pick 2ed58f4 from chromium (#33247) * chore: cherry-pick 2ed58f4 from chromium (#33109) Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3492658 Fixes: https://github.com/electron/electron/issues/33049 Signed-off-by: Darshan Sen Co-authored-by: Charles Kerr * chore: update patches Co-authored-by: Darshan Sen Co-authored-by: Charles Kerr Co-authored-by: Cheng Zhao Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> --- patches/chromium/.patches | 1 + ...e_incorrect_width_height_adjustments.patch | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 patches/chromium/remove_incorrect_width_height_adjustments.patch diff --git a/patches/chromium/.patches b/patches/chromium/.patches index 51d6ed8252571..fdab76de039ac 100644 --- a/patches/chromium/.patches +++ b/patches/chromium/.patches @@ -155,3 +155,4 @@ cherry-pick-1887414c016d.patch cherry-pick-6b2643846ae3.patch cherry-pick-246c10dede97.patch fix_imagebitmaprenderingcontext_interaction_with_software_compositor.patch +remove_incorrect_width_height_adjustments.patch diff --git a/patches/chromium/remove_incorrect_width_height_adjustments.patch b/patches/chromium/remove_incorrect_width_height_adjustments.patch new file mode 100644 index 0000000000000..fde557a9151ab --- /dev/null +++ b/patches/chromium/remove_incorrect_width_height_adjustments.patch @@ -0,0 +1,39 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Bruce Dawson +Date: Mon, 28 Feb 2022 19:07:41 +0000 +Subject: Remove incorrect width/height adjustments + +In late 2016 a change which fixed some problems around window sizing +when attaching or detaching additional displays was landed, which fixed +some genuine bugs. Unfortunately it included a subtraction of 1 from the +width and height of the Chrome window. I couldn't find any discussion of +this size adjustment and I think that it was just a misunderstanding of +how window rectangles work (inclusive versus exclusive extents). + +This size adjustment causes non-maximized Chrome windows to shrink every +time a monitor is added or removed. The problematic commit was found +by the bug-filer through a bisect of more than four years of Chrome +history - I'm just landing the fix that they suggested. + +Bug: 1300415 +Change-Id: Ief124f584a91aa9cc3f10704b0cc1e83356dea5b +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3492658 +Reviewed-by: Allen Bauer +Commit-Queue: Bruce Dawson +Cr-Commit-Position: refs/heads/main@{#975872} + +diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc +index e4c25788cf40e2b748cb25f004e448c0ea5f622c..72a62447a4a713c78984065f36f1734ad0826b62 100644 +--- a/ui/views/win/hwnd_message_handler.cc ++++ b/ui/views/win/hwnd_message_handler.cc +@@ -2818,8 +2818,8 @@ void HWNDMessageHandler::OnWindowPosChanging(WINDOWPOS* window_pos) { + // (Win+Shift+Arrows). See crbug.com/656001. + window_rect.left = window_pos->x; + window_rect.top = window_pos->y; +- window_rect.right = window_pos->x + window_pos->cx - 1; +- window_rect.bottom = window_pos->y + window_pos->cy - 1; ++ window_rect.right = window_pos->x + window_pos->cx; ++ window_rect.bottom = window_pos->y + window_pos->cy; + } + + HMONITOR monitor;