From e3d88825e99a4acf01a45ede12ef3910912dc454 Mon Sep 17 00:00:00 2001
From: zhongyang <zhongyang219@hotmail.com>
Date: Fri, 8 Nov 2019 14:46:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=8C=E9=9D=A2=E6=AD=8C=E8=AF=8D=E5=9C=A8?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E4=B8=8D=E5=A4=9F=E6=97=B6=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MusicPlayer2/LyricsWindow.cpp | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/MusicPlayer2/LyricsWindow.cpp b/MusicPlayer2/LyricsWindow.cpp
index c20c0d7e..b0166872 100644
--- a/MusicPlayer2/LyricsWindow.cpp
+++ b/MusicPlayer2/LyricsWindow.cpp
@@ -230,6 +230,28 @@ void CLyricsWindow::DrawLyricText(Gdiplus::Graphics* pGraphics, LPCTSTR strText,
 	if (fontSize < 1)
 		fontSize = m_FontSize;
 
+    Gdiplus::REAL textWidth = rect.Width;
+    Gdiplus::REAL highlighWidth = rect.Width * m_nHighlight / 1000;
+    //如果文本宽度大于控件宽度，就要根据分割的位置滚动文本
+    if (textWidth > m_nWidth)
+    {
+        //如果分割的位置（歌词进度）剩下的宽度已经小于控件宽度的一半，此时使文本右侧和控件右侧对齐
+        if (textWidth - highlighWidth < m_nWidth / 2)
+        {
+            rect.X = m_nWidth - textWidth;
+        }
+        //分割位置剩下的宽度还没有到小于控件宽度的一半，但是分割位置的宽度已经大于控件宽度的一半时，需要移动文本使分割位置正好在控件的中间
+        else if (highlighWidth > m_nWidth / 2)
+        {
+            rect.X = m_nWidth / 2 - highlighWidth;
+        }
+        //分割位置还不到控件宽度的一半时，使文本左侧和控件左侧对齐
+        else
+        {
+            rect.X = 0;
+        }
+    }
+
 	//-----------------------------------------------------------
 	//画出阴影
 	if (m_pShadowBrush) {
@@ -287,10 +309,10 @@ void CLyricsWindow::DrawLyrics(Gdiplus::Graphics* pGraphics)
 		transRect.Y += (boundingBox.Height + gapHeight);
 		transRect.Height = translateHeight;
 	}
-	if(dstRect.X<0)dstRect.X=0;
-	if(dstRect.Width>m_nWidth)dstRect.Width=m_nWidth;
-	if (transRect.X < 0)transRect.X = 0;
-	if (transRect.Width > m_nWidth)transRect.Width = m_nWidth;
+	//if(dstRect.X<0)dstRect.X=0;
+	//if(dstRect.Width>m_nWidth)dstRect.Width=m_nWidth;
+	//if (transRect.X < 0)transRect.X = 0;
+	//if (transRect.Width > m_nWidth)transRect.Width = m_nWidth;
 
 	DrawLyricText(pGraphics, m_lpszLyrics, dstRect, false);
 	if (!m_strTranslate.IsEmpty())