2021-01-05 17:17:33 +09: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
|
2025-04-08 11:49:48 -07:00
|
|
|
index 82e6f7c91bac6e8a973947dace1a33de8078a86b..1d298f66a2c2a0f02668af797b3a421fe5578d56 100644
|
2021-01-05 17:17:33 +09: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
|
2025-04-08 11:49:48 -07:00
|
|
|
@@ -636,7 +636,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
|
2023-05-10 10:47:48 -04:00
|
|
|
void DesktopWindowTreeHostWin::SetAspectRatio(
|
|
|
|
const gfx::SizeF& aspect_ratio,
|
|
|
|
const gfx::Size& excluded_margin) {
|
2021-01-05 17:17:33 +09:00
|
|
|
- DCHECK(!aspect_ratio.IsEmpty());
|
|
|
|
+ DCHECK_NE(aspect_ratio.height(), 0);
|
2023-05-10 10:47:48 -04:00
|
|
|
message_handler_->SetAspectRatio(aspect_ratio.width() / aspect_ratio.height(),
|
|
|
|
excluded_margin);
|
2021-01-05 17:17:33 +09:00
|
|
|
}
|
|
|
|
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
|
2025-04-08 11:49:48 -07:00
|
|
|
index a183cfe07b357e0b17e3781e85b79f7c371cbea8..ea67a60d78f4adec960bb4954486420bce423c14 100644
|
2021-01-05 17:17:33 +09:00
|
|
|
--- a/ui/views/win/hwnd_message_handler.cc
|
|
|
|
+++ b/ui/views/win/hwnd_message_handler.cc
|
2025-04-08 11:49:48 -07:00
|
|
|
@@ -1010,8 +1010,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen,
|
2021-01-05 17:17:33 +09:00
|
|
|
|
2023-05-10 10:47:48 -04:00
|
|
|
void HWNDMessageHandler::SetAspectRatio(float aspect_ratio,
|
|
|
|
const gfx::Size& excluded_margin) {
|
2021-01-05 17:17:33 +09: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;
|
|
|
|
|