mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
ae630f45b8
* chore: bump chromium in DEPS to 93.0.4562.0
* chore: update patches
* [base] Made Value::Take{Dict,List}() rvalue ref-qualified.
https://chromium-review.googlesource.com/c/chromium/src/+/2988105
* Revert "Reland "Roll src/buildtools/third_party/libc++/trunk/ 8fa879467..79a2e924d (426 commits)""
https://chromium-review.googlesource.com/c/chromium/src/+/2995482
This reverts commit 9691d6c265 and 797723ec83
* Pass gfx::Insets to GetHTComponentForFrame
https://chromium-review.googlesource.com/c/chromium/src/+/2984243
* chore: bump chromium in DEPS to 93.0.4563.0
* chore: bump chromium in DEPS to 93.0.4564.0
* chore: bump chromium in DEPS to 93.0.4565.0
* chore: bump chromium in DEPS to 93.0.4566.0
* [Clipboard API] Clipboard Custom Formats implementation Part 2.
https://chromium-review.googlesource.com/c/chromium/src/+/2967649
(cherry picked from commit 607ca0a09b)
* Prevent use of base::NoDestructor for trivially-destructible types
https://chromium-review.googlesource.com/c/chromium/src/+/2998672
(cherry picked from commit 3983afda29)
* fixup! [Clipboard API] Clipboard Custom Formats implementation Part 2.
(cherry picked from commit 3a1dbc649c)
* chore: add missing header
(cherry picked from commit a291f4864e)
* chore: update patches
* ci: do not run clipboard tests on WOA
(cherry picked from commit 0e3aedfbde)
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
39 lines
1.6 KiB
Diff
39 lines
1.6 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 4d986b929bd795b7bacc9d7001a623e5d3f9d110..df4bab7b0a1cdf9158bd55c1f1a177156dd4c156 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
|
|
@@ -517,7 +517,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 771b57e0380ff3b042fdbb2434127e8dba965b03..41fa3c23b9a5d8596f2fb44d0957ab6e1f60a95a 100644
|
|
--- a/ui/views/win/hwnd_message_handler.cc
|
|
+++ b/ui/views/win/hwnd_message_handler.cc
|
|
@@ -926,8 +926,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;
|
|
|