Revert "去掉已经没有必要的m_no_lbtnup和定时器"

This reverts commit 95d2fbe.
lrisora · Sep 15, 2023 · 0847f05 · 0847f05
1 parent ee12da7
commit 0847f05
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/MusicPlayer2/MusicPlayerDlg.cpp b/MusicPlayer2/MusicPlayerDlg.cpp
@@ -2665,6 +2665,12 @@ void CMusicPlayerDlg::OnTimer(UINT_PTR nIDEvent)
         m_fps_cnt = 0;
     }
 
+    else if (nIDEvent == DELAY_TIMER_ID)
+    {
+        KillTimer(DELAY_TIMER_ID);
+        m_no_lbtnup = false;
+    }
+
     else if (nIDEvent == INGORE_COLOR_CHANGE_TIMER_ID)
     {
         KillTimer(INGORE_COLOR_CHANGE_TIMER_ID);
@@ -2907,6 +2913,8 @@ afx_msg LRESULT CMusicPlayerDlg::OnPathSelected(WPARAM wParam, LPARAM lParam)
         //m_findDlg.ClearFindResult();      //更换路径后清除查找结果
         CPlayer::GetInstance().SaveRecentPath();
         m_play_error_cnt = 0;
+        SetTimer(DELAY_TIMER_ID, 500, NULL);        //在媒体库对话框中选择了一个文件夹播放后，500毫秒内不响应WM_LBUTTONUP消息
+        m_no_lbtnup = true;
     }
     return 0;
 }
@@ -5422,6 +5430,8 @@ afx_msg LRESULT CMusicPlayerDlg::OnPlaylistSelected(WPARAM wParam, LPARAM lParam
         CPlayer::GetInstance().SaveRecentPath();
         IniPlaylistPopupMenu();
         m_play_error_cnt = 0;
+        SetTimer(DELAY_TIMER_ID, 500, NULL);        //在媒体库对话框中选择了一个播放列表播放后，500毫秒内不响应WM_LBUTTONUP消息
+        m_no_lbtnup = true;
     }
     return 0;
 }

diff --git a/MusicPlayer2/MusicPlayerDlg.h b/MusicPlayer2/MusicPlayerDlg.h
@@ -157,8 +157,9 @@ class CMusicPlayerDlg : public CMainDialogBase
     CPlayerToolBar m_playlist_toolbar;
     CHorizontalSplitter m_splitter_ctrl;
 
+    bool m_no_lbtnup{ false };      //当它为true时，不响应WM_LBUTTONUP消息
     bool m_ignore_color_change{ false };    //当它为true时，不响应颜色变化，防止短时间内重复收到主题颜色变化的消息
-    enum { INGORE_COLOR_CHANGE_TIMER_ID = 1200 };
+    enum { DELAY_TIMER_ID = 1200, INGORE_COLOR_CHANGE_TIMER_ID = 1201 };
 
     CDevicesManager* devicesManager;
 

diff --git a/MusicPlayer2/UIWindow.cpp b/MusicPlayer2/UIWindow.cpp
@@ -59,7 +59,8 @@ void CUIWindow::OnLButtonUp(UINT nFlags, CPoint point)
     }
     else
     {
-        m_pUI->LButtonUp(point);
+        if (pMainWindow != nullptr && !pMainWindow->m_no_lbtnup)
+            m_pUI->LButtonUp(point);
 
         CStatic::OnLButtonUp(nFlags, point);
     }