From 97b60000e478dde0c3166aeabbb7abb204d76023 Mon Sep 17 00:00:00 2001 From: zhongyang Date: Fri, 15 Feb 2019 16:46:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=9C=A8=E8=BF=B7=E4=BD=A0?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E6=89=93=E5=BC=80=E9=80=89=E9=A1=B9=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=AF=B9=E8=AF=9D=E6=A1=86=E6=97=B6=EF=BC=8C=E9=BC=A0?= =?UTF-8?q?=E6=A0=87=E6=8F=90=E7=A4=BA=E8=A2=AB=E7=AA=97=E5=8F=A3=E6=8C=A1?= =?UTF-8?q?=E4=BD=8F=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MusicPlayer2/AppearanceSettingDlg.cpp | 2 ++ MusicPlayer2/CHotKeySettingDlg.cpp | 2 ++ MusicPlayer2/CPlayerUI2.cpp | 2 +- MusicPlayer2/DataSettingsDlg.cpp | 2 ++ MusicPlayer2/LyricSettingsDlg.cpp | 2 ++ 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/MusicPlayer2/AppearanceSettingDlg.cpp b/MusicPlayer2/AppearanceSettingDlg.cpp index 98990fdc..ca6853f2 100644 --- a/MusicPlayer2/AppearanceSettingDlg.cpp +++ b/MusicPlayer2/AppearanceSettingDlg.cpp @@ -183,6 +183,8 @@ BOOL CAppearanceSettingDlg::OnInitDialog() m_toolTip.AddTool(&m_color_static5, CCommon::LoadText(IDS_PINK)); m_toolTip.AddTool(&m_color_static6, CCommon::LoadText(IDS_LIGHT_PURPLE)); + m_toolTip.SetWindowPos(&CWnd::wndTopMost, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); + DrawColor(); ////设置“更多颜色”按钮的可用状态 diff --git a/MusicPlayer2/CHotKeySettingDlg.cpp b/MusicPlayer2/CHotKeySettingDlg.cpp index bd4af1fc..46dcf9f5 100644 --- a/MusicPlayer2/CHotKeySettingDlg.cpp +++ b/MusicPlayer2/CHotKeySettingDlg.cpp @@ -89,6 +89,8 @@ BOOL CHotKeySettingDlg::OnInitDialog() m_toolTip.SetMaxTipWidth(theApp.DPI(300)); m_toolTip.AddTool(GetDlgItem(IDC_ENABLE_GLOBAL_MULTIMEDIA_KEY_CHECK), CCommon::LoadText(IDS_MULTI_MEDIA_KEY_TIP)); + m_toolTip.SetWindowPos(&CWnd::wndTopMost, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); + m_key_list.SetExtendedStyle(LVS_EX_FULLROWSELECT | LVS_EX_GRIDLINES | LVS_EX_LABELTIP); m_key_list.InsertColumn(0, CCommon::LoadText(IDS_FUNCTION), LVCFMT_LEFT, theApp.DPI(130)); m_key_list.InsertColumn(1, CCommon::LoadText(IDS_SHORTCUT_KEY), LVCFMT_LEFT, theApp.DPI(170)); diff --git a/MusicPlayer2/CPlayerUI2.cpp b/MusicPlayer2/CPlayerUI2.cpp index 396b1866..822fc103 100644 --- a/MusicPlayer2/CPlayerUI2.cpp +++ b/MusicPlayer2/CPlayerUI2.cpp @@ -53,7 +53,7 @@ void CPlayerUI2::DrawInfo(bool reset) CRect rc_tmp; //绘制全屏图标 int full_screen_icon_size = 0; - int margin_tmp = 0;; + int margin_tmp = 0; if(m_ui_data.full_screen) { full_screen_icon_size = DPI(28); diff --git a/MusicPlayer2/DataSettingsDlg.cpp b/MusicPlayer2/DataSettingsDlg.cpp index a6813c9a..f1a40ebf 100644 --- a/MusicPlayer2/DataSettingsDlg.cpp +++ b/MusicPlayer2/DataSettingsDlg.cpp @@ -79,6 +79,8 @@ BOOL CDataSettingsDlg::OnInitDialog() //m_toolTip.AddTool(GetDlgItem(IDC_SF2_PATH_EDIT), _T("需要额外的音色库才能播放 MIDI 音乐。")); m_toolTip.AddTool(GetDlgItem(IDC_MIDI_USE_INNER_LYRIC_CHECK), CCommon::LoadText(IDS_MIDI_INNER_LYRIC_TIP_INFO)); + m_toolTip.SetWindowPos(&CWnd::wndTopMost, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); + GetDlgItem(IDC_BROWSE_BUTTON)->EnableWindow(theApp.m_format_convert_dialog_exit); //正在进行格式转换时不允许更改音色库 m_sf2_path_edit.EnableWindow(theApp.m_format_convert_dialog_exit); diff --git a/MusicPlayer2/LyricSettingsDlg.cpp b/MusicPlayer2/LyricSettingsDlg.cpp index 29ad6407..4af12398 100644 --- a/MusicPlayer2/LyricSettingsDlg.cpp +++ b/MusicPlayer2/LyricSettingsDlg.cpp @@ -99,6 +99,8 @@ BOOL CLyricSettingsDlg::OnInitDialog() m_tool_tip.AddTool(GetDlgItem(IDC_LYRIC_PATH_EDIT), CCommon::LoadText(IDS_LYRIC_PATH_TIP_INFO)); m_tool_tip.AddTool(GetDlgItem(IDC_SHOW_LYRIC_IN_CORTANA), CCommon::LoadText(IDS_CORTANA_SHOW_LYRIC_TIP_INFO)); + m_tool_tip.SetWindowPos(&CWnd::wndTopMost, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); + m_cortana_color_combo.AddString(CCommon::LoadText(IDS_FOLLOWING_SYSTEM)); m_cortana_color_combo.AddString(CCommon::LoadText(IDS_BLACK)); m_cortana_color_combo.AddString(CCommon::LoadText(IDS_WHITE));