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
|
2021-10-06 02:21:00 +00:00
|
|
|
index d8411ddc4fd88a1416181cce366b112df3f48d63..a33ec53b96fec67feacc92e71fa6ed17c5e47d7d 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
|
2021-10-06 02:21:00 +00:00
|
|
|
@@ -525,7 +525,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
|
2021-10-06 02:21:00 +00:00
|
|
|
index 9cac7284aeacda2d877502f97d9e442ae4fdadd3..33c533665589f78425488547b550876c5161f010 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
|
2021-10-06 02:21:00 +00:00
|
|
|
@@ -929,8 +929,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;
|
|
|
|
|