From cd0604f5ed3abdd95f8d26ecf34ecfbd07ffaa75 Mon Sep 17 00:00:00 2001
From: zhongyang219 <380526481@qq.com>
Date: Fri, 1 Oct 2021 22:43:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9F=B3=E9=87=8F=E4=B8=BA0=E6=97=B6=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=9D=99=E9=9F=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MusicPlayer2/CPlayerUIBase.cpp |  18 ++++++++++++------
 MusicPlayer2/MusicPlayer2.rc   | Bin 542148 -> 542288 bytes
 MusicPlayer2/resource.h        |   1 +
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/MusicPlayer2/CPlayerUIBase.cpp b/MusicPlayer2/CPlayerUIBase.cpp
index 694c7fe5..f3575672 100644
--- a/MusicPlayer2/CPlayerUIBase.cpp
+++ b/MusicPlayer2/CPlayerUIBase.cpp
@@ -1168,7 +1168,10 @@ wstring CPlayerUIBase::GetDisplayFormatString()
 CString CPlayerUIBase::GetVolumeTooltipString()
 {
     CString tooltip;
-    tooltip.Format(_T("%s: %d%%\r\n%s"), CCommon::LoadText(IDS_VOLUME).GetString(), CPlayer::GetInstance().GetVolume(), CCommon::LoadText(IDS_MOUSE_WHEEL_ADJUST_VOLUME).GetString());
+    if (CPlayer::GetInstance().GetVolume() <= 0)
+        tooltip.Format(_T("%s: %s\r\n%s"), CCommon::LoadText(IDS_VOLUME).GetString(), CCommon::LoadText(IDS_MUTE).GetString(), CCommon::LoadText(IDS_MOUSE_WHEEL_ADJUST_VOLUME).GetString());
+    else
+        tooltip.Format(_T("%s: %d%%\r\n%s"), CCommon::LoadText(IDS_VOLUME).GetString(), CPlayer::GetInstance().GetVolume(), CCommon::LoadText(IDS_MOUSE_WHEEL_ADJUST_VOLUME).GetString());
     return tooltip;
 }
 
@@ -1796,12 +1799,15 @@ void CPlayerUIBase::DrawVolumeButton(CRect rect, bool adj_btn_top, bool show_tex
     {
         CRect rect_text{ rect };
         rect_text.left = rect_icon.right;
-        wchar_t buff[64];
-        swprintf_s(buff, _T("%d%%"), CPlayer::GetInstance().GetVolume());
-        if (m_buttons[BTN_VOLUME].hover)        //鼠标指向音量区域时，以另外一种颜色显示
-            m_draw.DrawWindowText(rect_text, buff, m_colors.color_text_heighlight);
+        CString str;
+        if (CPlayer::GetInstance().GetVolume() <= 0)
+            str = CCommon::LoadText(IDS_MUTE).GetString();
         else
-            m_draw.DrawWindowText(rect_text, buff, m_colors.color_text);
+            str.Format(_T("%d%%"), CPlayer::GetInstance().GetVolume());
+        if (m_buttons[BTN_VOLUME].hover)        //鼠标指向音量区域时，以另外一种颜色显示
+            m_draw.DrawWindowText(rect_text, str, m_colors.color_text_heighlight);
+        else
+            m_draw.DrawWindowText(rect_text, str, m_colors.color_text);
     }
     //设置音量调整按钮的位置
     rc_tmp = rect;
diff --git a/MusicPlayer2/MusicPlayer2.rc b/MusicPlayer2/MusicPlayer2.rc
index 2e40589e42780b5c7304da8e0dc791a3fd492ba9..1026c00d9232a4b787159970f876592dd0d6b838 100644
GIT binary patch
delta 110
zcmX@ot$3kFv7v>rg{g&k3rn8ybhc^C0?fV)p_3goq^AeGX69jyoc?*b(&U5JgxhP3
zS%8=oh}nRceS3{DM-I>Qm>p~!(-khVb1@=m@?|JxD4Cwf$00r)s7q?QfCI-CRsa@;
BBN_kz

delta 59
zcmcc6qj;oSv7v>rg{g&k3rn8y<YU+P+7B4B05K~NvjH*t_5;QoIXu&UY-Q)04wRDG
KKF5J$3o8K3kQWmG

diff --git a/MusicPlayer2/resource.h b/MusicPlayer2/resource.h
index d2b2a03b..cc199a19 100644
--- a/MusicPlayer2/resource.h
+++ b/MusicPlayer2/resource.h
@@ -681,6 +681,7 @@
 #define IDS_SHOW_HIDE_PLAYER            541
 #define IDI_VOLUME3_D                   541
 #define IDI_VOLUME2_D                   542
+#define IDS_MUTE                        542
 #define IDI_VOLUME1_D                   543
 #define IDI_VOLUME3                     544
 #define IDI_VOLUME2                     545