From a20f48869c62d0a428bf6313b9ae3df6365f715b Mon Sep 17 00:00:00 2001
From: evilbeast <houshao55@gmail.com>
Date: Wed, 12 Jun 2019 11:48:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E4=BD=BF=E7=94=A8Cl?=
 =?UTF-8?q?ass=E5=AE=9A=E4=B9=89=E6=A0=B7=E5=BC=8F=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E7=9A=84value=E5=B1=9E=E6=80=A7=E4=B8=8EClas?=
 =?UTF-8?q?s=E7=9A=84value=E5=B1=9E=E6=80=A7=E5=86=B2=E7=AA=81=E6=97=B6?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E6=8E=A7=E5=88=B6=E4=BD=BF=E7=94=A8=5Fvalue?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/resources/themes/default/global.xml | 8 ++++----
 tool_kits/duilib/Core/WindowBuilder.cpp | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/bin/resources/themes/default/global.xml b/bin/resources/themes/default/global.xml
index 18b9ee3b..f2509721 100644
--- a/bin/resources/themes/default/global.xml
+++ b/bin/resources/themes/default/global.xml
@@ -146,7 +146,7 @@
     <Class name="btn_wnd_close" width="20" height="20" normalimage="file='../public/button/btn_wnd_gray_close.png' dest='4,4,16,16'" hotimage="../public/button/btn_wnd_white_close_hovered.png" pushedimage="../public/button/btn_wnd_white_close_pushed.png" fadehot="false"/>
     <Class name="btn_wnd_max" width="auto" height="auto" forenormalimage="file='../public/button/btn_wnd_gray_max.png' dest='4,4,16,16'" normalimage="" hotimage="../public/button/btn_wnd_gray_max_hovered.png" pushedimage="../public/button/btn_wnd_gray_max_pushed.png"/>
     <Class name="btn_wnd_restore" width="auto" height="auto" forenormalimage="file='../public/button/btn_wnd_gray_restore.png' dest='4,4,16,16'" normalimage="" hotimage="../public/button/btn_wnd_gray_restore_hovered.png" pushedimage="../public/button/btn_wnd_gray_restore_pushed.png"/>
-    <Class name="btn_wnd_settings" width="auto" height="auto" forenormalimage="file='../public/button/btn_wnd_settings.png' source=&apos;1,1,21,21&apos;" hotimage="../public/button/btn_wnd_bk_hovered.png" pushedimage="../public/button/btn_wnd_bk_pushed.png"/>
+    <Class name="btn_wnd_settings" width="auto" height="auto" forenormalimage="file='../public/button/btn_wnd_settings.png' source='1,1,21,21'" hotimage="../public/button/btn_wnd_bk_hovered.png" pushedimage="../public/button/btn_wnd_bk_pushed.png"/>
 
     <!--窗口右上角按钮 白色版 -->
     <Class name="btn_wnd_white_min" width="auto" height="auto" forenormalimage="file='../public/button/btn_wnd_white_min.png'" normalimage="" hotimage="../public/button/btn_wnd_white_min_hovered.png" pushedimage="../public/button/btn_wnd_white_min_pushed.png"/>
@@ -165,9 +165,9 @@
     <Class name="listitem" hotcolor="bk_listitem_hovered" pushedcolor="bk_listitem_selected" selectednormalcolor="bk_listitem_selected" fadehot="false"/>
     <Class name="list_topitem" normalcolor="bk_topitem_normal" hotcolor="bk_topitem_hovered" pushedcolor="bk_topitem_selected" selectednormalcolor="bk_topitem_selected" fadehot="false"/>
 
-    <!--进度条通用样式-->
-    <Class name="progress_blue" valign="center" value="0" bkimage="../public/progress/progress_blue_bg.png" height="3" width="stretch" hor="true" max="100" min="0" progressimage="../public/progress/progress_blue_fg.png"/>
-    <Class name="slider_green" width="stretch" height="14" margin="4,0,0,0" valign="center" thumbsize="14,14" min="0" max="255" progressbarpadding="0,6,0,6" bkimage="file=&apos;../public/slider/slider_hor_bk.png&apos; dest=&apos;0,6,1000,8&apos;" progresscolor="bk_progress_progress" thumbnormalimage="../public/slider/slider_thumb.png"/>
+    <!--进度条通用样式, 注意进度条的值使用`_value`属性-->
+    <Class name="progress_blue" valign="center" _value="0" bkimage="../public/progress/progress_blue_bg.png" height="3" width="stretch" hor="true" max="100" min="0" progressimage="../public/progress/progress_blue_fg.png"/>
+    <Class name="slider_green" width="stretch" height="14" margin="4,0,0,0" valign="center" thumbsize="14,14" min="0" max="255" progressbarpadding="0,6,0,6" bkimage="file='../public/slider/slider_hor_bk.png' dest='0,6,1000,8'" progresscolor="bk_progress_progress" thumbnormalimage="../public/slider/slider_thumb.png"/>
 
     <!--菜单通用样式-->
     <Class name="menu" width="auto" height="auto" bkcolor="bk_wnd_lightcolor"/>
diff --git a/tool_kits/duilib/Core/WindowBuilder.cpp b/tool_kits/duilib/Core/WindowBuilder.cpp
index 3753e538..71ddc362 100644
--- a/tool_kits/duilib/Core/WindowBuilder.cpp
+++ b/tool_kits/duilib/Core/WindowBuilder.cpp
@@ -243,6 +243,9 @@ Box* WindowBuilder::Create(CreateControlCallback pCallback, Window* pManager, Bo
 						else if( strName == _T("value") ) {
 							strAttribute.append(strValue);
 						}
+						else if (strName == _T("_value")) {
+							strAttribute.append(StringHelper::Printf(L" value=\"%s\"",strValue.c_str()));
+						}
 						else {
 							strAttribute.append(StringHelper::Printf(L" %s=\"%s\"",
 								strName.c_str(), strValue.c_str()));
@@ -290,6 +293,9 @@ Box* WindowBuilder::Create(CreateControlCallback pCallback, Window* pManager, Bo
 						else if( strName == _T("value") ) {
 							strAttribute.append(strValue);
 						}
+						else if (strName == _T("_value")) {
+							strAttribute.append(StringHelper::Printf(L" value=\"%s\"", strValue.c_str()));
+						}
 						else {
 							strAttribute.append(StringHelper::Printf(L" %s=\"%s\"",
 								strName.c_str(), strValue.c_str()));