mirror of
https://github.com/electron/electron.git
synced 2026-01-08 15:13:52 -05:00
a22511a196
* chore: bump chromium in DEPS to 144.0.7514.0 * chore: update patches * 7119882: Reorganize //ui/gfx GN build target https://chromium-review.googlesource.com/c/chromium/src/+/7119882 * Replace includes with forward declares in rect_conversions.h https://chromium-review.googlesource.com/c/chromium/src/+/7127098 * Add ssl info to TrustedHeaderClient https://chromium-review.googlesource.com/c/chromium/src/+/7106780 * Replace ContentPluginInfo with WebPluginInfo https://chromium-review.googlesource.com/c/chromium/src/+/7127893 * Reland "[temporal] Unflag Temporal" https://chromium-review.googlesource.com/c/v8/v8/+/7123876 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
39 lines
1.8 KiB
Diff
39 lines
1.8 KiB
Diff
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 cb704a865eb1b748163a7c25b0a571585c2497b4..3b2fbefaeec2bac725d46bcfeea488122c873d76 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
|
|
@@ -614,7 +614,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 a919d3bbafc1a16d66c647c2a1b7819af9d0dd1d..acd69eb0a38241db8ae5a3a1d7009366383d1817 100644
|
|
--- a/ui/views/win/hwnd_message_handler.cc
|
|
+++ b/ui/views/win/hwnd_message_handler.cc
|
|
@@ -1054,8 +1054,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;
|
|
excluded_margin_dip_ = excluded_margin;
|