From 0f87fdb98b7d09bae4d7bec390b74162c8ecbc39 Mon Sep 17 00:00:00 2001
From: Noisyfox <timemanager.rick@gmail.com>
Date: Sun, 17 Dec 2023 02:31:10 +1100
Subject: [PATCH] Fix window maximize when task bar is on the left. (#3148)

Partially revert fe80dc6
---
 src/slic3r/GUI/MainFrame.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp
index 676dbc78ee..8478746684 100644
--- a/src/slic3r/GUI/MainFrame.cpp
+++ b/src/slic3r/GUI/MainFrame.cpp
@@ -395,6 +395,20 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, BORDERLESS_FRAME_
     update_layout();
     sizer->SetSizeHints(this);
 
+#ifdef WIN32
+    // SetMaximize already position window at left/top corner, even if Windows Task Bar is at left side.
+    // Not known why, but fix it here
+    this->Bind(wxEVT_MAXIMIZE, [this](auto &e) {
+        wxDisplay display(this);
+        auto pos = display.GetClientArea().GetPosition();
+        HWND      hWnd = GetHandle();
+        RECT      borderThickness;
+        SetRectEmpty(&borderThickness);
+        AdjustWindowRectEx(&borderThickness, GetWindowLongPtr(hWnd, GWL_STYLE), FALSE, 0);
+        Move(pos + wxPoint{borderThickness.left, borderThickness.top});
+        e.Skip();
+    });
+#endif // WIN32
     // BBS
     Fit();