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
|
2022-02-25 18:17:35 +00:00
|
|
|
index a1de50d6b0f699d0651c369cafafdd5bb542242d..65b9f5e5f81e8ef8b591ef2e027e095df11c0d7b 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
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -530,7 +530,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
|
2021-01-05 08:17:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
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
|
2022-03-25 01:39:03 +00:00
|
|
|
index b14fa0f41166a904991ec920cec2f45c3b71c953..37bb1e9788a251b3f2c79b5272d4a44c22b707b3 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
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -936,8 +936,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen) {
|
2021-01-05 08:17:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
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;
|
|
|
|
|