From e09fff70ff1a41fb1d7cd0a2eac2d754634992eb Mon Sep 17 00:00:00 2001
From: lrisora <43085437+lrisora@users.noreply.github.com>
Date: Wed, 26 May 2021 22:59:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=8F=E6=97=B6=E9=81=87=E5=88=B0WM?=
 =?UTF-8?q?=5FDISPLAYCHANGE=E9=80=80=E5=87=BA=E5=85=A8=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MusicPlayer2/MusicPlayerDlg.cpp | 12 ++++++++++++
 MusicPlayer2/MusicPlayerDlg.h   |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/MusicPlayer2/MusicPlayerDlg.cpp b/MusicPlayer2/MusicPlayerDlg.cpp
index 48483f1d..67171a10 100644
--- a/MusicPlayer2/MusicPlayerDlg.cpp
+++ b/MusicPlayer2/MusicPlayerDlg.cpp
@@ -287,6 +287,7 @@ BEGIN_MESSAGE_MAP(CMusicPlayerDlg, CMainDialogBase)
     ON_COMMAND(ID_VIEW_ALBUM, &CMusicPlayerDlg::OnViewAlbum)
     ON_COMMAND(ID_LOCATE_TO_CURRENT, &CMusicPlayerDlg::OnLocateToCurrent)
     ON_COMMAND(ID_USE_STANDARD_TITLE_BAR, &CMusicPlayerDlg::OnUseStandardTitleBar)
+    ON_MESSAGE(WM_DISPLAYCHANGE, &CMusicPlayerDlg::OnDisplaychange)
 END_MESSAGE_MAP()
 
 
@@ -5613,3 +5614,14 @@ void CMusicPlayerDlg::OnUseStandardTitleBar()
     if (pCurUi != nullptr)
         pCurUi->ClearBtnRect();
 }
+
+
+afx_msg LRESULT CMusicPlayerDlg::OnDisplaychange(WPARAM wParam, LPARAM lParam)
+{
+    // 显示器状态改变时退出全屏，防止窗口被移动后以旧尺寸全屏显示在主显示器上
+    if (theApp.m_ui_data.full_screen)
+    {
+        OnFullScreen();
+    }
+    return 0;
+}
diff --git a/MusicPlayer2/MusicPlayerDlg.h b/MusicPlayer2/MusicPlayerDlg.h
index 02fc615c..945d789b 100644
--- a/MusicPlayer2/MusicPlayerDlg.h
+++ b/MusicPlayer2/MusicPlayerDlg.h
@@ -458,4 +458,6 @@ public:
     afx_msg void OnViewAlbum();
     afx_msg void OnLocateToCurrent();
     afx_msg void OnUseStandardTitleBar();
+protected:
+    afx_msg LRESULT OnDisplaychange(WPARAM wParam, LPARAM lParam);
 };