|
@@ -19,10 +19,10 @@ would be removed from its snapped state when re-shown. This fixes that.
|
|
|
Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/6330848.
|
|
|
|
|
|
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
|
|
|
-index 22ed43bdf4dbaccc598135807abc8383c52db50e..c5457e3e58b53ca04697b22a885da654c6c0655f 100644
|
|
|
+index 64dd7b6e507b61fab7a044823462fb04eabba698..2cd734db007174834c70365ffe6b46d52673e5cb 100644
|
|
|
--- a/ui/views/win/hwnd_message_handler.cc
|
|
|
+++ b/ui/views/win/hwnd_message_handler.cc
|
|
|
-@@ -676,7 +676,8 @@ void HWNDMessageHandler::Show(ui::mojom::WindowShowState show_state,
|
|
|
+@@ -683,7 +683,8 @@ void HWNDMessageHandler::Show(ui::mojom::WindowShowState show_state,
|
|
|
SetWindowPlacement(hwnd(), &placement);
|
|
|
native_show_state = SW_SHOWMAXIMIZED;
|
|
|
} else {
|
|
@@ -32,7 +32,7 @@ index 22ed43bdf4dbaccc598135807abc8383c52db50e..c5457e3e58b53ca04697b22a885da654
|
|
|
|
|
|
// Use SW_SHOW/SW_SHOWNA instead of SW_SHOWNORMAL/SW_SHOWNOACTIVATE so that
|
|
|
// the window is not restored to its original position if it is maximized.
|
|
|
-@@ -686,7 +687,8 @@ void HWNDMessageHandler::Show(ui::mojom::WindowShowState show_state,
|
|
|
+@@ -693,7 +694,8 @@ void HWNDMessageHandler::Show(ui::mojom::WindowShowState show_state,
|
|
|
// position, some do not. See crbug.com/1296710
|
|
|
switch (show_state) {
|
|
|
case ui::mojom::WindowShowState::kInactive:
|
|
@@ -42,7 +42,7 @@ index 22ed43bdf4dbaccc598135807abc8383c52db50e..c5457e3e58b53ca04697b22a885da654
|
|
|
break;
|
|
|
case ui::mojom::WindowShowState::kMaximized:
|
|
|
native_show_state = SW_SHOWMAXIMIZED;
|
|
|
-@@ -697,9 +699,11 @@ void HWNDMessageHandler::Show(ui::mojom::WindowShowState show_state,
|
|
|
+@@ -704,9 +706,11 @@ void HWNDMessageHandler::Show(ui::mojom::WindowShowState show_state,
|
|
|
case ui::mojom::WindowShowState::kNormal:
|
|
|
if ((GetWindowLong(hwnd(), GWL_EXSTYLE) & WS_EX_TRANSPARENT) ||
|
|
|
(GetWindowLong(hwnd(), GWL_EXSTYLE) & WS_EX_NOACTIVATE)) {
|