Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: make win.setAspectRatio() work on Windows (#27203)
- Loading branch information
Showing
6 changed files
with
51 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
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 | ||
index 3b132d4d7618e11b851b315e82fa67442c852fb3..af2c2f2bbc1f52f4455fb973ab2fc0d0dd013ca5 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 | ||
@@ -484,7 +484,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) { | ||
} | ||
|
||
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 | ||
index 42eeb16a3d59de7e37eb858a982cc3534ab7cc51..ce3672e4d5cee51651bc6f8c294b27f0a9e01682 100644 | ||
--- a/ui/views/win/hwnd_message_handler.cc | ||
+++ b/ui/views/win/hwnd_message_handler.cc | ||
@@ -920,8 +920,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen) { | ||
} | ||
|
||
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; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters