mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
4336172: Include client-drawn window decorations in aspect ratio. |
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4336172
This commit is contained in:
@@ -34,7 +34,7 @@ index 2e4bacce52a45b5d9d7829c1f88f82aa0bb1b4bb..f3537e89191bd2c6d9b06c9b741a1680
|
||||
Widget* GetWidget();
|
||||
const Widget* GetWidget() const;
|
||||
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
|
||||
index 0740176e4e5a87ed2786fd7c3b9a7e97a5ebd907..f86d7ebb92261cb118e6fc6e9abd943d44962ea8 100644
|
||||
index 81d3612a4d0a56c0e3fdc57a3e1718984014f7bc..6b7366dfd43ca13587f0fc430eb1b11f2ed0436a 100644
|
||||
--- a/ui/views/win/hwnd_message_handler.cc
|
||||
+++ b/ui/views/win/hwnd_message_handler.cc
|
||||
@@ -3225,15 +3225,19 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
|
||||
|
||||
@@ -11,10 +11,10 @@ enlarge window above dimensions set during creation of the
|
||||
BrowserWindow.
|
||||
|
||||
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
|
||||
index 1bb4dcca04b57c2dab18c23c358f59c1f7c5abf1..0740176e4e5a87ed2786fd7c3b9a7e97a5ebd907 100644
|
||||
index 1bb4dcca04b57c2dab18c23c358f59c1f7c5abf1..81d3612a4d0a56c0e3fdc57a3e1718984014f7bc 100644
|
||||
--- a/ui/views/win/hwnd_message_handler.cc
|
||||
+++ b/ui/views/win/hwnd_message_handler.cc
|
||||
@@ -3800,6 +3800,21 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param,
|
||||
@@ -3800,14 +3800,29 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param,
|
||||
delegate_->GetMinMaxSize(&min_window_size, &max_window_size);
|
||||
min_window_size = delegate_->DIPToScreenSize(min_window_size);
|
||||
max_window_size = delegate_->DIPToScreenSize(max_window_size);
|
||||
@@ -36,3 +36,13 @@ index 1bb4dcca04b57c2dab18c23c358f59c1f7c5abf1..0740176e4e5a87ed2786fd7c3b9a7e97
|
||||
|
||||
absl::optional<gfx::Size> max_size_param;
|
||||
if (!max_window_size.IsEmpty())
|
||||
max_size_param = max_window_size;
|
||||
|
||||
- gfx::SizeRectToAspectRatioWithExcludedMargin(
|
||||
+ gfx::SizeRectToAspectRatio(
|
||||
GetWindowResizeEdge(param), aspect_ratio_.value(), min_window_size,
|
||||
- max_size_param, excluded_margin_, *window_rect);
|
||||
+ max_size_param, window_rect);
|
||||
}
|
||||
|
||||
POINT HWNDMessageHandler::GetCursorPos() const {
|
||||
|
||||
@@ -18,7 +18,7 @@ or resizing, but Electron does not seem to run into that issue
|
||||
for opaque frameless windows even with that block commented out.
|
||||
|
||||
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
|
||||
index f86d7ebb92261cb118e6fc6e9abd943d44962ea8..27da01e1202f81c8a4f7336b4310dfe75ac6a5a8 100644
|
||||
index 6b7366dfd43ca13587f0fc430eb1b11f2ed0436a..b3c3299befba4a16e167e117d599c37eada56b6c 100644
|
||||
--- a/ui/views/win/hwnd_message_handler.cc
|
||||
+++ b/ui/views/win/hwnd_message_handler.cc
|
||||
@@ -1863,7 +1863,23 @@ LRESULT HWNDMessageHandler::OnCreate(CREATESTRUCT* create_struct) {
|
||||
|
||||
Reference in New Issue
Block a user