1234567891011121314151617181920212223242526272829303132333435363738 |
- From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
- From: Cheng Zhao <[email protected]>
- 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
- index d877d237b2c1622057ff5e2304f232760016b948..e8a6da6bdb14eea3217a6824163364958552ba44 100644
- --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
- +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
- @@ -579,7 +579,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
- void DesktopWindowTreeHostWin::SetAspectRatio(
- const gfx::SizeF& aspect_ratio,
- const gfx::Size& excluded_margin) {
- - DCHECK(!aspect_ratio.IsEmpty());
- + DCHECK_NE(aspect_ratio.height(), 0);
- message_handler_->SetAspectRatio(aspect_ratio.width() / aspect_ratio.height(),
- excluded_margin);
- }
- diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
- index 1d52e72cb648de3c82f6061dc95ddd5f1c192ac8..e447cae6e00efa8b0afa72f6d3887bedf9cb5a5c 100644
- --- a/ui/views/win/hwnd_message_handler.cc
- +++ b/ui/views/win/hwnd_message_handler.cc
- @@ -963,8 +963,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen,
-
- void HWNDMessageHandler::SetAspectRatio(float aspect_ratio,
- const gfx::Size& excluded_margin) {
- - // 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;
-
|