From 6f287cb35bd1fe82c19feaaf577a71c796053ebb Mon Sep 17 00:00:00 2001 From: zhongyang Date: Fri, 19 Jul 2019 17:12:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=AE=E5=8A=A8=E6=92=AD?= =?UTF-8?q?=E6=94=BE=E5=88=97=E8=A1=A8=E6=90=9C=E7=B4=A2=E6=97=B6=E7=A6=81?= =?UTF-8?q?=E6=AD=A2=E6=8B=96=E5=8A=A8=E7=9A=84=E5=A4=84=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E8=BF=B7=E4=BD=A0=E6=A8=A1=E5=BC=8F=E5=A2=9E=E5=8A=A0=E6=8B=96?= =?UTF-8?q?=E5=8A=A8=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MusicPlayer2/CFloatPlaylistDlg.cpp | 9 ++++++++- MusicPlayer2/CFloatPlaylistDlg.h | 3 ++- MusicPlayer2/MiniModeDlg.cpp | 14 +++++++++++++- MusicPlayer2/MiniModeDlg.h | 4 ++++ MusicPlayer2/MusicPlayer2.rc | Bin 328974 -> 328974 bytes MusicPlayer2/MusicPlayerDlg.cpp | 6 +++++- 6 files changed, 32 insertions(+), 4 deletions(-) diff --git a/MusicPlayer2/CFloatPlaylistDlg.cpp b/MusicPlayer2/CFloatPlaylistDlg.cpp index e23e22c5..4b8da488 100644 --- a/MusicPlayer2/CFloatPlaylistDlg.cpp +++ b/MusicPlayer2/CFloatPlaylistDlg.cpp @@ -115,6 +115,12 @@ void CFloatPlaylistDlg::GetPlaylistItemSelected() } +void CFloatPlaylistDlg::SetDragEnable() +{ + bool enable = CPlayer::GetInstance().IsPlaylistMode() && !m_searched; //处于播放列表模式且不处理搜索状态时才允许拖动排序 + m_playlist_ctrl.SetDragEnable(enable); +} + bool CFloatPlaylistDlg::Initilized() const { return m_playlist_ctrl.GetSafeHwnd() != NULL && m_path_static.GetSafeHwnd() != NULL && m_path_edit.GetSafeHwnd() != NULL @@ -174,7 +180,7 @@ BOOL CFloatPlaylistDlg::OnInitDialog() else m_path_static.SetWindowText(CCommon::LoadText(IDS_CURRENT_FOLDER, _T(":"))); - m_playlist_ctrl.SetDragEnable(CPlayer::GetInstance().IsPlaylistMode()); + SetDragEnable(); return TRUE; // return TRUE unless you set the focus to a control // 异常: OCX 属性页应返回 FALSE @@ -265,6 +271,7 @@ void CFloatPlaylistDlg::OnEnChangeSearchEdit() m_searched = (key_word.GetLength() != 0); m_playlist_ctrl.QuickSearch(wstring(key_word)); m_playlist_ctrl.ShowPlaylist(theApp.m_ui_data.display_format, m_searched); + SetDragEnable(); } void CFloatPlaylistDlg::OnBnClickedClearSearchButton() diff --git a/MusicPlayer2/CFloatPlaylistDlg.h b/MusicPlayer2/CFloatPlaylistDlg.h index 766262af..6065448c 100644 --- a/MusicPlayer2/CFloatPlaylistDlg.h +++ b/MusicPlayer2/CFloatPlaylistDlg.h @@ -27,6 +27,7 @@ public: CStaticEx& GetPathStatic(); CEdit& GetPathEdit(); void GetPlaylistItemSelected(); + void SetDragEnable(); private: CPlayListCtrl m_playlist_ctrl{ CPlayer::GetInstance().GetPlayList() }; @@ -38,7 +39,7 @@ private: SLayoutData m_layout; //窗口布局的固定数据 - bool m_searched; //播放列表是否处于搜索状态 + bool m_searched{ false }; //播放列表是否处于搜索状态 int& m_item_selected; //播放列表中鼠标选中的项目 vector& m_items_selected; diff --git a/MusicPlayer2/MiniModeDlg.cpp b/MusicPlayer2/MiniModeDlg.cpp index c4a137d7..b05134e0 100644 --- a/MusicPlayer2/MiniModeDlg.cpp +++ b/MusicPlayer2/MiniModeDlg.cpp @@ -123,6 +123,7 @@ BEGIN_MESSAGE_MAP(CMiniModeDlg, CDialogEx) ON_WM_MOUSELEAVE() ON_WM_SETCURSOR() ON_COMMAND(ID_MINI_MIDE_MINIMIZE, &CMiniModeDlg::OnMiniMideMinimize) + ON_MESSAGE(WM_LIST_ITEM_DRAGGED, &CMiniModeDlg::OnListItemDragged) END_MESSAGE_MAP() @@ -285,6 +286,11 @@ void CMiniModeDlg::SetTransparency() CCommon::SetWindowOpacity(m_hWnd, theApp.m_app_setting_data.window_transparency); } +void CMiniModeDlg::SetDragEnable() +{ + m_playlist_ctrl.SetDragEnable(CPlayer::GetInstance().IsPlaylistMode()); +} + BOOL CMiniModeDlg::PreTranslateMessage(MSG* pMsg) { // TODO: ڴרô/û @@ -509,7 +515,7 @@ void CMiniModeDlg::OnNMRClickList2(NMHDR *pNMHDR, LRESULT *pResult) m_item_selected = pNMItemActivate->iItem; //ȡѡеĿ m_playlist_ctrl.GetItemSelected(m_items_selected); - CMenu* pContextMenu = theApp.m_menu_set.m_popup_menu.GetSubMenu(0); //ȡһ˵ + CMenu* pContextMenu = theApp.m_menu_set.m_list_popup_menu.GetSubMenu(0); //ȡһ˵ CPoint point; //һȷλõλ GetCursorPos(&point); //ȡǰλãԱʹò˵Ը @@ -596,3 +602,9 @@ void CMiniModeDlg::OnMiniMideMinimize() // TODO: ڴ ShowWindow(HIDE_WINDOW); } + + +afx_msg LRESULT CMiniModeDlg::OnListItemDragged(WPARAM wParam, LPARAM lParam) +{ + return 0; +} diff --git a/MusicPlayer2/MiniModeDlg.h b/MusicPlayer2/MiniModeDlg.h index 900dfd22..7d3593e4 100644 --- a/MusicPlayer2/MiniModeDlg.h +++ b/MusicPlayer2/MiniModeDlg.h @@ -33,6 +33,8 @@ public: void SetVolume(bool up); // void SetTransparency(); + void SetDragEnable(); + protected: int m_position_x; @@ -95,4 +97,6 @@ public: afx_msg void OnMouseLeave(); afx_msg BOOL OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message); afx_msg void OnMiniMideMinimize(); +protected: + afx_msg LRESULT OnListItemDragged(WPARAM wParam, LPARAM lParam); }; diff --git a/MusicPlayer2/MusicPlayer2.rc b/MusicPlayer2/MusicPlayer2.rc index e715621f1628bacbae0b9d51573595ac669b9d4f..0d6654ab2bbd66a5147a0c0a491566c42af73842 100644 GIT binary patch delta 65 zcmeC{66xy_Y1qQpw1<0ARIvZ#I1L6hhLG)na~YEv+du3DVW#aL_A*E1PCsGDtTdfV Tn&lp=4?{kK+ID{(mi;#XKd=~~ delta 46 zcmeC{66xy_Y1qQpv}d~9L&iVtb$c0sm}z_6Ugk5o(>*>jznQ+_0<+ro7#)^PHvsym B72*H@ diff --git a/MusicPlayer2/MusicPlayerDlg.cpp b/MusicPlayer2/MusicPlayerDlg.cpp index 42a95582..b7249ed1 100644 --- a/MusicPlayer2/MusicPlayerDlg.cpp +++ b/MusicPlayer2/MusicPlayerDlg.cpp @@ -981,8 +981,11 @@ void CMusicPlayerDlg::SetPlaylistDragEnable() { bool enable = CPlayer::GetInstance().IsPlaylistMode() && !m_searched; //ڲбģʽҲ״̬ʱ϶ m_playlist_list.SetDragEnable(enable); + if (m_pFloatPlaylistDlg->GetSafeHwnd() != NULL) - m_pFloatPlaylistDlg->GetListCtrl().SetDragEnable(enable); + m_pFloatPlaylistDlg->SetDragEnable(); + if(m_miniModeDlg.GetSafeHwnd()!=NULL) + m_miniModeDlg.SetDragEnable(); } BOOL CMusicPlayerDlg::OnInitDialog() @@ -3400,6 +3403,7 @@ void CMusicPlayerDlg::OnShowMenuBar() theApp.m_ui_data.show_menu_bar = !theApp.m_ui_data.show_menu_bar; SetMenubarVisible(); SetThumbnailClipArea(); + m_pUI->UpdateToolTipPosition(); //ز˵󵯳ʾûٴʾ˵ if (!theApp.m_ui_data.show_menu_bar)