eb291485bb
* chore: drop support for Windows 7 & 8 * chore: remove disable-redraw-lock.patch * chore: update patches * Update docs/breaking-changes.md Co-authored-by: Erick Zhao <erick@hotmail.ca> * Update docs/breaking-changes.md Co-authored-by: Keeley Hammond <vertedinde@electronjs.org> * fix breaking-changes.md * chore: note last supported version Co-authored-by: Jeremy Rose <jeremya@chromium.org> * chore: add link to deprecation policy * Update docs/breaking-changes.md Co-authored-by: Jeremy Rose <jeremya@chromium.org> * update README.md Co-authored-by: Milan Burda <miburda@microsoft.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Erick Zhao <erick@hotmail.ca> Co-authored-by: Keeley Hammond <vertedinde@electronjs.org> Co-authored-by: Jeremy Rose <jeremya@chromium.org>
38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Cheng Zhao <zcbenz@gmail.com>
|
|
Date: Thu, 4 Oct 2018 14:57:02 -0700
|
|
Subject: feat: enable setting aspect ratio to 0
|
|
|
|
Make SetAspectRatio accept 0 as valid input, which would reset to null.
|
|
|
|
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
|
|
index 7fe6a03afbaf219841f65646e3a7b7d4b17bd5ee..2c29c97e36a10eaf25146b359c9172f39863404a 100644
|
|
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
|
|
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
|
|
@@ -574,7 +574,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
|
|
}
|
|
|
|
void DesktopWindowTreeHostWin::SetAspectRatio(const gfx::SizeF& aspect_ratio) {
|
|
- DCHECK(!aspect_ratio.IsEmpty());
|
|
+ DCHECK_NE(aspect_ratio.height(), 0);
|
|
message_handler_->SetAspectRatio(aspect_ratio.width() /
|
|
aspect_ratio.height());
|
|
}
|
|
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
|
|
index ec39cb0d15c80f051e89bf4d0f05368dff897fa7..5678d2ace3c1c05fbf2c17233d7bfc9ed7d3ca99 100644
|
|
--- a/ui/views/win/hwnd_message_handler.cc
|
|
+++ b/ui/views/win/hwnd_message_handler.cc
|
|
@@ -1002,8 +1002,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen,
|
|
}
|
|
|
|
void HWNDMessageHandler::SetAspectRatio(float aspect_ratio) {
|
|
- // If the aspect ratio is not in the valid range, do nothing.
|
|
- DCHECK_GT(aspect_ratio, 0.0f);
|
|
+ // If the aspect ratio is 0, reset it to null.
|
|
+ if (aspect_ratio == 0.0f) {
|
|
+ aspect_ratio_.reset();
|
|
+ return;
|
|
+ }
|
|
|
|
aspect_ratio_ = aspect_ratio;
|
|
|