Skip to content

Commit 4bf26d3

Browse files
Merge pull request #148 from WPFDevelopersOrg/master
merge master into
2 parents cdee8e0 + 77b29ea commit 4bf26d3

File tree

2 files changed

+44
-7
lines changed

2 files changed

+44
-7
lines changed

README-zh.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,24 @@ Install-Package WPFDevelopers
7474
``` XML
7575
xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
7676
```
77+
#### 1.1.0.3-preview1 以上版本
7778
``` XML
78-
<Application.Resources>
79+
<Application.Resources>
80+
<ResourceDictionary>
81+
<ResourceDictionary.MergedDictionaries>
82+
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers;component/Themes/Theme.xaml" />
83+
<!-- 需要注意 wd:Resources 必须在Theme.xaml后 -->
84+
<!-- 默认情况下,Theme 会跟随系统主题(适用于 Windows 10 及以上版本),自动切换为 Light 或 Dark 模式。
85+
若要手动设置为 Light 模式,可以使用 Theme="Light"。
86+
你还可以自定义主题色,使用 Color="Fuchsia"(例如设置为 Fuchsia)-->
87+
<wd:Resources />
88+
</ResourceDictionary.MergedDictionaries>
89+
</ResourceDictionary>
90+
</Application.Resources>
91+
```
92+
#### 1.1.0.3-preview1 以下版本
93+
``` XML
94+
<Application.Resources>
7995
<ResourceDictionary>
8096
<ResourceDictionary.MergedDictionaries>
8197
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers;component/Themes/Light.Blue.xaml"/>

README.md

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,24 @@ Install-Package WPFDevelopers
6464
``` XML
6565
xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
6666
```
67+
#### 1.1.0.3-preview1 and above versions
6768
``` XML
68-
<Application.Resources>
69+
<Application.Resources>
70+
<ResourceDictionary>
71+
<ResourceDictionary.MergedDictionaries>
72+
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers;component/Themes/Theme.xaml" />
73+
<!-- 需要注意 wd:Resources 必须在Theme.xaml后 -->
74+
<!-- 默认情况下,Theme 会跟随系统主题(适用于 Windows 10 及以上版本),自动切换为 Light 或 Dark 模式。
75+
若要手动设置为 Light 模式,可以使用 Theme="Light"。
76+
你还可以自定义主题色,使用 Color="Fuchsia"(例如设置为 Fuchsia)-->
77+
<wd:Resources />
78+
</ResourceDictionary.MergedDictionaries>
79+
</ResourceDictionary>
80+
</Application.Resources>
81+
```
82+
#### 1.1.0.3-preview1 and below versions
83+
``` XML
84+
<Application.Resources>
6985
<ResourceDictionary>
7086
<ResourceDictionary.MergedDictionaries>
7187
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers;component/Themes/Light.Blue.xaml"/>
@@ -81,6 +97,16 @@ xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
8197

8298
`xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"`
8399

100+
----------
101+
### Gauge
102+
103+
<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/Gauge.gif"/>
104+
105+
----------
106+
### Message
107+
108+
<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/Message.png"/>
109+
84110
----------
85111
### DateRangePicker
86112

@@ -166,11 +192,6 @@ xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
166192

167193
<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/window.jpg"/>
168194

169-
----------
170-
### Message
171-
172-
<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/Message.gif"/>
173-
174195
----------
175196
### Badge
176197

0 commit comments

Comments
 (0)