滑动条控件垂直方向时改为底部为最小值；界面xml中root元素增加icon属性，用于设置ui对话框的图标

zhongyang219 · zhongyang219 · commit 9f30bc62e6fe · 2026-02-06T21:04:22.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -291,3 +291,4 @@ __pycache__/
 *.sf2
 /MusicPlayer2/compile_time.txt
 !/MusicPlayer2/language/*.ini
+/enc_temp_folder
diff --git a/MusicPlayer2/UIDialog/UIDialog.cpp b/MusicPlayer2/UIDialog/UIDialog.cpp
@@ -4,7 +4,6 @@
 #include "stdafx.h"
 #include "MusicPlayer2.h"
 #include "UIDialog.h"
-#include <dwmapi.h>
 #include "WinVersionHelper.h"
 
 #define UI_DIALOG_TIMER_ID 1365
@@ -29,6 +28,11 @@ CUIDialog::~CUIDialog()
 {
 }
 
+BOOL CUIDialog::Create(CWnd* pParent)
+{
+    return CDialog::Create(IDD_UI_DIALOG, pParent);
+}
+
 void CUIDialog::RePaintUi()
 {
     Invalidate(FALSE);
@@ -69,8 +73,10 @@ BOOL CUIDialog::OnInitDialog()
     CDialog::OnInitDialog();
 
     //深色模式下，为对话框启用深色标题栏
+    bool dark_mode = false;
     if (theApp.m_app_setting_data.dark_mode && CWinVersionHelper::IsWindows10Version1809OrLater())
     {
+        dark_mode = true;
         BOOL darkMode = TRUE;
         DwmSetWindowAttribute(m_hWnd, DWMWA_USE_IMMERSIVE_DARK_MODE, &darkMode, sizeof(darkMode));
     }
@@ -81,7 +87,8 @@ BOOL CUIDialog::OnInitDialog()
 
     //设置窗口标题和图标
     SetWindowText(m_ui.GetUIName().c_str());
-    SetIcon(theApp.m_icon_mgr.GetHICON(IconMgr::IT_App, IconMgr::IS_Auto, IconMgr::IS_DPI_16), FALSE);
+    IconMgr::IconStyle icon_style = dark_mode ? IconMgr::IconStyle::IS_OutlinedLight : IconMgr::IconStyle::IS_OutlinedDark;
+    SetIcon(theApp.m_icon_mgr.GetHICON(m_ui.GetUiIcon(), icon_style, IconMgr::IS_DPI_16), FALSE);
     
     //初始化对话框大小
     int width = m_ui.GetCurrentTypeUi()->GetWidth(CRect());
diff --git a/MusicPlayer2/UIDialog/UIDialog.h b/MusicPlayer2/UIDialog/UIDialog.h
@@ -11,6 +11,7 @@ class CUIDialog : public CDialog
 public:
     CUIDialog(UINT ui_res_id, CWnd* pParent = nullptr);   // 标准构造函数
     virtual ~CUIDialog();
+    BOOL Create(CWnd* pParent = nullptr);
 
 // 对话框数据
 #ifdef AFX_DESIGN_TIME
diff --git a/MusicPlayer2/UIDialog/UITestDialog.cpp b/MusicPlayer2/UIDialog/UITestDialog.cpp
@@ -20,7 +20,12 @@ CUITestDialog::CUITestDialog(CWnd* pParent)
 
     UiElement::Slider* horizentol_slider = m_ui.GetCurrentTypeUi()->FindElement<UiElement::Slider>("horizontalSlider1");
     horizentol_slider->SetPosChangedTrigger([&](UiElement::Slider* sender) {
-        std::wstring str = L"滑动条当前值：" + std::to_wstring(sender->GetCurPos());
+        std::wstring str = L"水平滑动条当前值：" + std::to_wstring(sender->GetCurPos());
+        m_info_text->SetText(str);
+    });
+    UiElement::Slider* vertical_slider = m_ui.GetCurrentTypeUi()->FindElement<UiElement::Slider>("verticalSlider1");
+    vertical_slider->SetPosChangedTrigger([&](UiElement::Slider* sender) {
+        std::wstring str = L"垂直滑动条当前值：" + std::to_wstring(sender->GetCurPos());
         m_info_text->SetText(str);
     });
 
diff --git a/MusicPlayer2/UIElement/AbstractScrollArea.cpp b/MusicPlayer2/UIElement/AbstractScrollArea.cpp
@@ -131,8 +131,9 @@ bool UiElement::AbstractScrollArea::LButtonDown(CPoint point)
         //点击了滚动区域
         else
         {
+            if (Element::LButtonDown(point))
+                return true;
             mouse_pressed = true;
-            rtn = Element::LButtonDown(point);
         }
         mouse_pressed_offset = scroll_offset;
         mouse_pressed_pos = point;
diff --git a/MusicPlayer2/UIElement/Helper/UiElementHelper.cpp b/MusicPlayer2/UIElement/Helper/UiElementHelper.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "UiElementHelper.h"
 
-IconMgr::IconType UiElementHelper::NameToIconType(const std::string& icon_name)
+IconMgr::IconType UiElementHelper::NameToIconType(const std::string& icon_name, IconMgr::IconType default_icon)
 {
-    IconMgr::IconType icon_type{ IconMgr::IT_NO_ICON };
+    IconMgr::IconType icon_type{ default_icon };
     if (icon_name == "app") icon_type = IconMgr::IT_App;
     else if (icon_name == "appMonochrome") icon_type = IconMgr::IT_App_Monochrome;
     else if (icon_name == "stop") icon_type = IconMgr::IT_Stop;
diff --git a/MusicPlayer2/UIElement/Helper/UiElementHelper.h b/MusicPlayer2/UIElement/Helper/UiElementHelper.h
@@ -3,7 +3,7 @@
 class UiElementHelper
 {
 public:
-	static IconMgr::IconType NameToIconType(const std::string& icon_name);
+	static IconMgr::IconType NameToIconType(const std::string& icon_name, IconMgr::IconType default_icon = IconMgr::IT_NO_ICON);
 
 };
 
diff --git a/MusicPlayer2/UIElement/Slider.cpp b/MusicPlayer2/UIElement/Slider.cpp
@@ -106,15 +106,15 @@ void UiElement::Slider::Draw()
     else
     {
         cur_point.X = rect.CenterPoint().x;
-        cur_point.Y = rect.top;
+        cur_point.Y = rect.bottom;
     }
 
     if (max_val - min_val > 0)
     {
         if (orientation == Horizontal)
             cur_point.X = rect_back.left + static_cast<double>(rect_back.Width() * (GetCurPos() - min_val) / static_cast<double>(max_val - min_val));
         else
-            cur_point.Y = rect_back.top + static_cast<double>(rect_back.Height() * (GetCurPos() - min_val) / static_cast<double>(max_val - min_val));
+            cur_point.Y = rect_back.bottom - static_cast<double>(rect_back.Height() * (GetCurPos() - min_val) / static_cast<double>(max_val - min_val));
     }
 
     //计算当前位置前后两部分的矩形区域
@@ -127,8 +127,8 @@ void UiElement::Slider::Draw()
     }
     else
     {
-        rect_back_before_current.bottom = static_cast<int>(cur_point.Y);
-        rect_back_after_current.top = static_cast<int>(cur_point.Y);
+        rect_back_after_current.bottom = static_cast<int>(cur_point.Y);
+        rect_back_before_current.top = static_cast<int>(cur_point.Y);
     }
     //分别绘制两部分背景
     ui->DrawRectangle(rect_back_before_current, back_color_before_curent, GetBackAlpha(true));
@@ -209,7 +209,7 @@ bool UiElement::Slider::MouseMove(CPoint point)
         }
         else
         {
-            pos = min_val + (max_val - min_val) * (point.y - rect_back.top) / rect_back.Height();
+            pos = min_val + (max_val - min_val) * (rect_back.bottom - point.y) / rect_back.Height();
         }
         CCommon::SetNumRange(pos, min_val, max_val);
         if (GetCurPos() != pos)
diff --git a/MusicPlayer2/UIElement/SliderProgressBar.cpp b/MusicPlayer2/UIElement/SliderProgressBar.cpp
@@ -45,7 +45,7 @@ bool UiElement::SliderProgressBar::MouseMove(CPoint point)
             ui->UpdateMouseToolTip(UiElement::TooltipIndex::PROGRESS_BAR, str.c_str());
             ui->UpdateMouseToolTipPosition(UiElement::TooltipIndex::PROGRESS_BAR, GetRect());
             last_sec = song_pos_time.sec;
-            TRACE("Progressbar mouse move\n");
+            //TRACE("Progressbar mouse move\n");
         }
 
         return true;
diff --git a/MusicPlayer2/UIElement/StackElement.cpp b/MusicPlayer2/UIElement/StackElement.cpp
@@ -316,19 +316,22 @@ void UiElement::StackElement::IndexChanged()
     }
     //清空不显示的子元素的矩形区域和鼠标提示
     auto cur_element{ CurrentElement() };
-    cur_element->MouseLeave();
-    for (size_t i{}; i < childLst.size(); i++)
+    if (cur_element != nullptr)
     {
-        if (cur_element != childLst[i])
+        cur_element->MouseLeave();
+        for (size_t i{}; i < childLst.size(); i++)
         {
-            childLst[i]->IterateAllElements([&](UiElement::Element* element) ->bool {
-                if (element != nullptr)
-                {
-                    element->ClearRect();
-                    element->HideTooltip();
-                }
-                return false;
-            });
+            if (cur_element != childLst[i])
+            {
+                childLst[i]->IterateAllElements([&](UiElement::Element* element) ->bool {
+                    if (element != nullptr)
+                    {
+                        element->ClearRect();
+                        element->HideTooltip();
+                    }
+                    return false;
+                });
+            }
         }
     }
 }
diff --git a/MusicPlayer2/UserUi.cpp b/MusicPlayer2/UserUi.cpp
@@ -17,6 +17,7 @@ CUserUi::CUserUi(CWnd* pMainWnd, UINT id, UIData& ui_data)
     : CPlayerUIBase(ui_data, pMainWnd)
 {
     string xml = CCommon::GetTextResourceRawData(id);
+    ASSERT(!xml.empty());
     LoadFromContents(xml);
 }
 
@@ -31,6 +32,7 @@ void CUserUi::LoadFromContents(const std::string& xml_contents)
     xml_doc.Parse(xml_contents.c_str());
     tinyxml2::XMLElement* root = xml_doc.RootElement();
     m_ui_name = CCommon::StrToUnicode(CTinyXml2Helper::ElementAttribute(root, "name"), CodeType::UTF8_NO_BOM);
+    m_icon = UiElementHelper::NameToIconType(CTinyXml2Helper::ElementAttribute(root, "icon"), IconMgr::IT_App);
     ReplaceUiStringRes(m_ui_name);
     std::string ui_index = CTinyXml2Helper::ElementAttribute(root, "index");
     if (!ui_index.empty())
diff --git a/MusicPlayer2/UserUi.h b/MusicPlayer2/UserUi.h
@@ -48,6 +48,8 @@ class CUserUi :
     template<class T>
     void IterateAllElements(std::function<bool(T*)> func, bool visible_only = false);
 
+    IconMgr::IconType GetUiIcon() const { return m_icon; }
+
     enum { SHOW_VOLUME_TIMER_ID = 1635 };
 
     // 通过 CPlayerUIBase 继承
@@ -74,6 +76,7 @@ class CUserUi :
     std::shared_ptr<UiElement::Element> m_root_ui_narrow;
     std::shared_ptr<UiElement::Element> m_root_ui_small;
     std::wstring m_ui_name;
+    IconMgr::IconType m_icon{ IconMgr::IT_NO_ICON };
     bool m_last_mouse_in_draw_area{};
     CPanelManager m_panel_mgr{ this };
     CPoint m_mouse_clicked_point;
diff --git a/MusicPlayer2/res/ui/test_dialog.xml b/MusicPlayer2/res/ui/test_dialog.xml
@@ -1,5 +1,5 @@
 <root xmlns="https://github.com/zhongyang219/MusicPlayer2/skin" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/zhongyang219/MusicPlayer2/skin ../../skins/skin.xsd"
-      name="测试对话框">
+      name="测试对话框" icon="setting">
   <ui width="350" height="300" min-width="250" min-height="200">
     <verticalLayout margin="8">
       <scrollArea>
diff --git a/MusicPlayer2/skins/skin.xsd b/MusicPlayer2/skins/skin.xsd
@@ -813,6 +813,11 @@
           <xs:documentation> 界面的序号，至少为3。序号不能与其他界面重复。未定义此属性的界面总是排在后面。 </xs:documentation>
         </xs:annotation>
       </xs:attribute>
+      <xs:attribute name="icon" type="icon_type">
+        <xs:annotation>
+          <xs:documentation>图标。仅用于UI对话框。</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
       <xs:attributeGroup ref="sharedattr"></xs:attributeGroup>
       <!--引用属性组sharedattr-->
     </xs:complexType>

Original file line number	Diff line number	Diff line change
`@@ -131,8 +131,9 @@ bool UiElement::AbstractScrollArea::LButtonDown(CPoint point)`
`131`	`131`	`//点击了滚动区域`
`132`	`132`	`else`
`133`	`133`	`{`
	`134`	`+ if (Element::LButtonDown(point))`
	`135`	`+ return true;`
`134`	`136`	`mouse_pressed = true;`
`135`		`- rtn = Element::LButtonDown(point);`
`136`	`137`	`}`
`137`	`138`	`mouse_pressed_offset = scroll_offset;`
`138`	`139`	`mouse_pressed_pos = point;`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`class UiElementHelper`
`4`	`4`	`{`
`5`	`5`	`public:`
`6`		`- static IconMgr::IconType NameToIconType(const std::string& icon_name);`
	`6`	`+ static IconMgr::IconType NameToIconType(const std::string& icon_name, IconMgr::IconType default_icon = IconMgr::IT_NO_ICON);`
`7`	`7`
`8`	`8`	`};`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -106,15 +106,15 @@ void UiElement::Slider::Draw()`
`106`	`106`	`else`
`107`	`107`	`{`
`108`	`108`	`cur_point.X = rect.CenterPoint().x;`
`109`		`- cur_point.Y = rect.top;`
	`109`	`+ cur_point.Y = rect.bottom;`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`if (max_val - min_val > 0)`
`113`	`113`	`{`
`114`	`114`	`if (orientation == Horizontal)`
`115`	`115`	`cur_point.X = rect_back.left + static_cast<double>(rect_back.Width() * (GetCurPos() - min_val) / static_cast<double>(max_val - min_val));`
`116`	`116`	`else`
`117`		`- cur_point.Y = rect_back.top + static_cast<double>(rect_back.Height() * (GetCurPos() - min_val) / static_cast<double>(max_val - min_val));`
	`117`	`+ cur_point.Y = rect_back.bottom - static_cast<double>(rect_back.Height() * (GetCurPos() - min_val) / static_cast<double>(max_val - min_val));`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`//计算当前位置前后两部分的矩形区域`
`@@ -127,8 +127,8 @@ void UiElement::Slider::Draw()`
`127`	`127`	`}`
`128`	`128`	`else`
`129`	`129`	`{`
`130`		`- rect_back_before_current.bottom = static_cast<int>(cur_point.Y);`
`131`		`- rect_back_after_current.top = static_cast<int>(cur_point.Y);`
	`130`	`+ rect_back_after_current.bottom = static_cast<int>(cur_point.Y);`
	`131`	`+ rect_back_before_current.top = static_cast<int>(cur_point.Y);`
`132`	`132`	`}`
`133`	`133`	`//分别绘制两部分背景`
`134`	`134`	`ui->DrawRectangle(rect_back_before_current, back_color_before_curent, GetBackAlpha(true));`
`@@ -209,7 +209,7 @@ bool UiElement::Slider::MouseMove(CPoint point)`
`209`	`209`	`}`
`210`	`210`	`else`
`211`	`211`	`{`
`212`		`- pos = min_val + (max_val - min_val) * (point.y - rect_back.top) / rect_back.Height();`
	`212`	`+ pos = min_val + (max_val - min_val) * (rect_back.bottom - point.y) / rect_back.Height();`
`213`	`213`	`}`
`214`	`214`	`CCommon::SetNumRange(pos, min_val, max_val);`
`215`	`215`	`if (GetCurPos() != pos)`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ bool UiElement::SliderProgressBar::MouseMove(CPoint point)`
`45`	`45`	`ui->UpdateMouseToolTip(UiElement::TooltipIndex::PROGRESS_BAR, str.c_str());`
`46`	`46`	`ui->UpdateMouseToolTipPosition(UiElement::TooltipIndex::PROGRESS_BAR, GetRect());`
`47`	`47`	`last_sec = song_pos_time.sec;`
`48`		`- TRACE("Progressbar mouse move\n");`
	`48`	`+ //TRACE("Progressbar mouse move\n");`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -316,19 +316,22 @@ void UiElement::StackElement::IndexChanged()`
`316`	`316`	`}`
`317`	`317`	`//清空不显示的子元素的矩形区域和鼠标提示`
`318`	`318`	`auto cur_element{ CurrentElement() };`
`319`		`- cur_element->MouseLeave();`
`320`		`- for (size_t i{}; i < childLst.size(); i++)`
	`319`	`+ if (cur_element != nullptr)`
`321`	`320`	`{`
`322`		`- if (cur_element != childLst[i])`
	`321`	`+ cur_element->MouseLeave();`
	`322`	`+ for (size_t i{}; i < childLst.size(); i++)`
`323`	`323`	`{`
`324`		`- childLst[i]->IterateAllElements([&](UiElement::Element* element) ->bool {`
`325`		`- if (element != nullptr)`
`326`		`- {`
`327`		`- element->ClearRect();`
`328`		`- element->HideTooltip();`
`329`		`- }`
`330`		`- return false;`
`331`		`- });`
	`324`	`+ if (cur_element != childLst[i])`
	`325`	`+ {`
	`326`	`+ childLst[i]->IterateAllElements([&](UiElement::Element* element) ->bool {`
	`327`	`+ if (element != nullptr)`
	`328`	`+ {`
	`329`	`+ element->ClearRect();`
	`330`	`+ element->HideTooltip();`
	`331`	`+ }`
	`332`	`+ return false;`
	`333`	`+ });`
	`334`	`+ }`
`332`	`335`	`}`
`333`	`336`	`}`
`334`	`337`	`}`