2021-01-05 08:17:33 +00:00
|
|
|
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
|
2024-08-08 22:16:59 +00:00
|
|
|
index 692ea6ab585cf26befd5f0d2b4aa450a5506a68c..d510a52222f2f61df6040976c0d7f4ac4811b133 100644
|
2021-01-05 08:17:33 +00:00
|
|
|
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
|
|
|
|
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -581,7 +581,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
|
2023-05-10 14:47:48 +00:00
|
|
|
void DesktopWindowTreeHostWin::SetAspectRatio(
|
|
|
|
const gfx::SizeF& aspect_ratio,
|
|
|
|
const gfx::Size& excluded_margin) {
|
2021-01-05 08:17:33 +00:00
|
|
|
- DCHECK(!aspect_ratio.IsEmpty());
|
|
|
|
+ DCHECK_NE(aspect_ratio.height(), 0);
|
2023-05-10 14:47:48 +00:00
|
|
|
message_handler_->SetAspectRatio(aspect_ratio.width() / aspect_ratio.height(),
|
|
|
|
excluded_margin);
|
2021-01-05 08:17:33 +00:00
|
|
|
}
|
|
|
|
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
|
2024-08-02 14:02:11 +00:00
|
|
|
index 6bc81c605948eca2aa05089a939e3bd2ab79976b..73f62b38d4595e9dd3befba196756b311266013d 100644
|
2021-01-05 08:17:33 +00:00
|
|
|
--- a/ui/views/win/hwnd_message_handler.cc
|
|
|
|
+++ b/ui/views/win/hwnd_message_handler.cc
|
2024-08-02 14:02:11 +00:00
|
|
|
@@ -959,8 +959,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen,
|
2021-01-05 08:17:33 +00:00
|
|
|
|
2023-05-10 14:47:48 +00:00
|
|
|
void HWNDMessageHandler::SetAspectRatio(float aspect_ratio,
|
|
|
|
const gfx::Size& excluded_margin) {
|
2021-01-05 08:17:33 +00:00
|
|
|
- // 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;
|
|
|
|
|