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-03-04 23:46:13 +00:00
|
|
|
index 7476de34aa6ecf7759492e871db82a35bf1a2288..896de263c09b0c0b74f4be472d5d1ce9a3854429 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-03-04 23:46:13 +00:00
|
|
|
@@ -483,7 +483,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-03-04 17:27:05 +00:00
|
|
|
index 1013375edabb6e59338bcd9266f04ee09668098e..80b0e1cb9f52c8b25f00d538733c0c15c2df0196 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-03-04 17:27:05 +00:00
|
|
|
@@ -921,8 +921,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;
|
|
|
|
|