From cb877bd2e157e034d9505b3124613a011fa0bb33 Mon Sep 17 00:00:00 2001
From: lrisora <43085437+lrisora@users.noreply.github.com>
Date: Sun, 23 May 2021 22:03:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=8D=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=A0=87=E9=A2=98=E6=A0=8F=E6=97=B6=E9=9D=9E?=
 =?UTF-8?q?=E4=B8=BB=E6=98=BE=E7=A4=BA=E5=99=A8=E6=9C=80=E5=A4=A7=E5=8C=96?=
 =?UTF-8?q?=E5=B0=BA=E5=AF=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MusicPlayer2/MusicPlayerDlg.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/MusicPlayer2/MusicPlayerDlg.cpp b/MusicPlayer2/MusicPlayerDlg.cpp
index 3a0ffdd3..48483f1d 100644
--- a/MusicPlayer2/MusicPlayerDlg.cpp
+++ b/MusicPlayer2/MusicPlayerDlg.cpp
@@ -2722,9 +2722,14 @@ void CMusicPlayerDlg::OnGetMinMaxInfo(MINMAXINFO* lpMMI)
 
     if (!theApp.m_ui_data.show_window_frame)
     {
-        CRect rect_screed;
-        ::SystemParametersInfo(SPI_GETWORKAREA, 0, &rect_screed, 0);   // 获得工作区大小
-        lpMMI->ptMaxSize.y = rect_screed.Height() + theApp.DPI(12) + 2;
+        // 获取主窗口所在监视器句柄，如果窗口不在任何监视器则返回主监视器句柄
+        HMONITOR hMonitor = MonitorFromWindow(theApp.m_pMainWnd->GetSafeHwnd(), MONITOR_DEFAULTTOPRIMARY);
+        // 获取监视器信息
+        MONITORINFO lpmi;
+        lpmi.cbSize = sizeof(lpmi);
+        GetMonitorInfo(hMonitor, &lpmi);
+        lpMMI->ptMaxSize.x = lpmi.rcWork.right  - lpmi.rcWork.left + theApp.DPI(12) + 2;
+        lpMMI->ptMaxSize.y = lpmi.rcWork.bottom - lpmi.rcWork.top  + theApp.DPI(12) + 2;
     }
 
     CMainDialogBase::OnGetMinMaxInfo(lpMMI);