修正頁碼

This commit is contained in:
jasonchenwork 2025-06-18 15:39:08 +08:00
parent 2e664788ca
commit 020f19bf93

View File

@ -158,10 +158,10 @@ namespace DualScreenDemo
} }
public void LoadPreviousPage() public void LoadPreviousPage()
{ {
if (currentPageIndex > 0) if (currentPageIndex - 1 >= 0)
{ {
currentPageIndex--; currentPageIndex--;
if(currentSongList.Count == 0) if(_isShowingSinger)
{ {
RefreshDisplayBase_Singer(); RefreshDisplayBase_Singer();
} }
@ -358,6 +358,10 @@ namespace DualScreenDemo
// 添加滑鼠事件 // 添加滑鼠事件
artistLabel.MouseEnter += mouseEnter; artistLabel.MouseEnter += mouseEnter;
artistLabel.MouseLeave += mouseLeave; artistLabel.MouseLeave += mouseLeave;
// 滑動
artistLabel.MouseDown += MultiPagePanel_MouseDown;
artistLabel.MouseMove += MultiPagePanel_MouseMove;
artistLabel.MouseUp += MultiPagePanel_MouseUp;
separatorPanel.MouseEnter += mouseEnter; separatorPanel.MouseEnter += mouseEnter;
separatorPanel.MouseLeave += mouseLeave; separatorPanel.MouseLeave += mouseLeave;
// 添加到畫面上 // 添加到畫面上
@ -612,10 +616,18 @@ namespace DualScreenDemo
// 添加事件处理 // 添加事件处理
songLabel.Click += PrimaryForm.Instance.Label_Click; songLabel.Click += PrimaryForm.Instance.Label_Click;
artistLabel.Click += PrimaryForm.Instance.Label_Click; artistLabel.Click += PrimaryForm.Instance.Label_Click;
// 滑動事件調整位置
songLabel.MouseDown += MultiPagePanel_MouseDown;
songLabel.MouseMove += MultiPagePanel_MouseMove;
songLabel.MouseUp += MultiPagePanel_MouseUp;
songLabel.MouseEnter += mouseEnter; songLabel.MouseEnter += mouseEnter;
songLabel.MouseLeave += mouseLeave; songLabel.MouseLeave += mouseLeave;
artistLabel.MouseEnter += mouseEnter; artistLabel.MouseEnter += mouseEnter;
artistLabel.MouseLeave += mouseLeave; artistLabel.MouseLeave += mouseLeave;
// 滑動事件調整位置
artistLabel.MouseDown += MultiPagePanel_MouseDown;
artistLabel.MouseMove += MultiPagePanel_MouseMove;
artistLabel.MouseUp += MultiPagePanel_MouseUp;
separatorPanel.MouseEnter += mouseEnter; separatorPanel.MouseEnter += mouseEnter;
separatorPanel.MouseLeave += mouseLeave; separatorPanel.MouseLeave += mouseLeave;
// 按正确顺序添加控件 // 按正确顺序添加控件