diff --git a/src/Resources.props b/src/Resources.props
index 1205f7e4..ac35ddcb 100644
--- a/src/Resources.props
+++ b/src/Resources.props
@@ -39,8 +39,8 @@
Resources\Images\AMap\Car2.png
-
- Resources\Images\AnimationNavigationBar3D\background.png
+
+ Resources\Images\NavMenu3D\background.png
Resources\Images\Breathe\%(Filename)%(Extension)
diff --git a/src/TargetFrameworks.props b/src/TargetFrameworks.props
index 797279f4..ea6ba3f9 100644
--- a/src/TargetFrameworks.props
+++ b/src/TargetFrameworks.props
@@ -16,11 +16,17 @@
7.0.0
+
+ 7.0.0
+
7.0.0
+
+ 7.0.0
+
@@ -36,5 +42,8 @@
7.0.0
+
+ 7.0.0
+
\ No newline at end of file
diff --git a/src/WPFDevelopers.Net40/Themes/Generic.xaml b/src/WPFDevelopers.Net40/Themes/Generic.xaml
index 7042df93..0267af1a 100644
--- a/src/WPFDevelopers.Net40/Themes/Generic.xaml
+++ b/src/WPFDevelopers.Net40/Themes/Generic.xaml
@@ -8,18 +8,17 @@
xmlns:wd="clr-namespace:WPFDevelopers.Net40">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -697,7 +637,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
+
@@ -4934,14 +4972,14 @@
@@ -6090,11 +6152,11 @@
+
+
@@ -6602,7 +6700,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -697,7 +636,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
+
@@ -4935,14 +4953,14 @@
@@ -6091,11 +6130,11 @@
+
+
@@ -6603,7 +6678,7 @@
diff --git a/src/WPFDevelopers.Samples.Shared/Controls/ChatEmoji/ChatEmoji.cs b/src/WPFDevelopers.Samples.Shared/Controls/ChatEmoji/ChatEmoji.cs
index a1363adb..7851627a 100644
--- a/src/WPFDevelopers.Samples.Shared/Controls/ChatEmoji/ChatEmoji.cs
+++ b/src/WPFDevelopers.Samples.Shared/Controls/ChatEmoji/ChatEmoji.cs
@@ -1,7 +1,7 @@
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
-using WPFDevelopers.Helpers;
+using WPFDevelopers.Core;
namespace WPFDevelopers.Samples.Controls
{
@@ -124,7 +124,7 @@ private void UpdateIsRight()
{
//m_textBlock.Foreground = Brushes.White;
leftWrapPanel.Visibility = Visibility.Visible;
- border.Background = ControlsHelper.Brush;
+ border.Background = ThemeManager.Instance.BackgroundBrush;
rightWrapPanel.Visibility = Visibility.Collapsed;
}
}
diff --git a/src/WPFDevelopers.Samples.Shared/Controls/ChatEmoji/ChatEmoji.xaml b/src/WPFDevelopers.Samples.Shared/Controls/ChatEmoji/ChatEmoji.xaml
index 773bb073..d955b222 100644
--- a/src/WPFDevelopers.Samples.Shared/Controls/ChatEmoji/ChatEmoji.xaml
+++ b/src/WPFDevelopers.Samples.Shared/Controls/ChatEmoji/ChatEmoji.xaml
@@ -42,7 +42,7 @@
Margin="0,20,-14,0"
VerticalAlignment="Top"
Data="{StaticResource WD.ChatLeftGeometry}"
- Fill="{DynamicResource WD.BackgroundSolidColorBrush}"
+ Fill="{DynamicResource WD.BackgroundBrush}"
SnapsToDevicePixels="True"
Stretch="Fill"
StrokeThickness="0"
diff --git a/src/WPFDevelopers.Samples.Shared/Controls/CodeViewer/CodeViewer.cs b/src/WPFDevelopers.Samples.Shared/Controls/CodeViewer/CodeViewer.cs
index 2bf4a1af..381698d5 100644
--- a/src/WPFDevelopers.Samples.Shared/Controls/CodeViewer/CodeViewer.cs
+++ b/src/WPFDevelopers.Samples.Shared/Controls/CodeViewer/CodeViewer.cs
@@ -41,7 +41,7 @@ TabItem CreateTabItem(SourceCodeModel codeModel)
var partTextEditor = new TextEditor();
partTextEditor.Options = new TextEditorOptions { ConvertTabsToSpaces = true };
partTextEditor.TextArea.SelectionCornerRadius = 0;
- partTextEditor.SetResourceReference(TextArea.SelectionBrushProperty, "WD.WindowBorderBrushSolidColorBrush");
+ partTextEditor.SetResourceReference(TextArea.SelectionBrushProperty, "WD.WindowBorderBrush");
partTextEditor.TextArea.SelectionBorder = null;
partTextEditor.TextArea.SelectionForeground = null;
partTextEditor.IsReadOnly = true;
diff --git a/src/WPFDevelopers.Samples.Shared/Controls/CodeViewer/CodeViewer.xaml b/src/WPFDevelopers.Samples.Shared/Controls/CodeViewer/CodeViewer.xaml
index 729ecf28..b7806822 100644
--- a/src/WPFDevelopers.Samples.Shared/Controls/CodeViewer/CodeViewer.xaml
+++ b/src/WPFDevelopers.Samples.Shared/Controls/CodeViewer/CodeViewer.xaml
@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls">
+
+
+
+
+
\ No newline at end of file
diff --git a/src/WPFDevelopers.Samples.Shared/Controls/Theme/ThemeItem.cs b/src/WPFDevelopers.Samples.Shared/Controls/Theme/ThemeItem.cs
new file mode 100644
index 00000000..94601324
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/Controls/Theme/ThemeItem.cs
@@ -0,0 +1,9 @@
+using System.Windows.Controls;
+
+namespace WPFDevelopers.Samples.Controls
+{
+ public class ThemeItem : ListBoxItem
+ {
+
+ }
+}
diff --git a/src/WPFDevelopers.Samples.Shared/Controls/TimeLine/TimeLine.xaml b/src/WPFDevelopers.Samples.Shared/Controls/TimeLine/TimeLine.xaml
index 705cb9e9..8a92b5d0 100644
--- a/src/WPFDevelopers.Samples.Shared/Controls/TimeLine/TimeLine.xaml
+++ b/src/WPFDevelopers.Samples.Shared/Controls/TimeLine/TimeLine.xaml
@@ -15,7 +15,7 @@
Height="10"
VerticalAlignment="Top"
Fill="White"
- Stroke="{StaticResource WD.WarningSolidColorBrush}"
+ Stroke="{DynamicResource WD.WarningBrush}"
StrokeThickness="2" />
diff --git a/src/WPFDevelopers.Samples.Shared/Controls/TransformLayout/ElementAdorner.cs b/src/WPFDevelopers.Samples.Shared/Controls/TransformLayout/ElementAdorner.cs
index 22a571cd..5f9f72f5 100644
--- a/src/WPFDevelopers.Samples.Shared/Controls/TransformLayout/ElementAdorner.cs
+++ b/src/WPFDevelopers.Samples.Shared/Controls/TransformLayout/ElementAdorner.cs
@@ -7,6 +7,7 @@
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Shapes;
+using WPFDevelopers.Core;
using WPFDevelopers.Helpers;
namespace WPFDevelopers.Samples.Controls
@@ -74,7 +75,7 @@ protected override void OnRender(DrawingContext drawingContext)
{
var offset = ThumbSize / 2;
var sz = new Size(ThumbSize, ThumbSize);
- var renderPen = new Pen(ControlsHelper.Brush, 2.0);
+ var renderPen = new Pen(ThemeManager.Instance.BackgroundBrush, 2.0);
var startPoint = new Point(AdornedElement.RenderSize.Width / 2,
AdornedElement.RenderSize.Height - AdornedElement.RenderSize.Height);
var endPoint = new Point(AdornedElement.RenderSize.Width / 2,
@@ -89,7 +90,7 @@ protected override void OnRender(DrawingContext drawingContext)
tRotate.Arrange(new Rect(new Point(AdornedElement.RenderSize.Width / 2 - 10, -(RotateThumbSize - 5)), new Size(20, 20)));
var adornedElementRect = new Rect(AdornedElement.RenderSize);
- var pen = new Pen(ControlsHelper.Brush, 2);
+ var pen = new Pen(ThemeManager.Instance.BackgroundBrush, 2);
drawingContext.DrawRectangle(null, pen, adornedElementRect);
}
@@ -160,7 +161,7 @@ private Thumb CreateThumb(Cursor cursor, HorizontalAlignment horizontal, Vertica
VerticalAlignment = vertical,
Template = new ControlTemplate(typeof(Thumb))
{
- VisualTree = GetFactory(ControlsHelper.Brush)
+ VisualTree = GetFactory(ThemeManager.Instance.BackgroundBrush)
}
};
@@ -305,7 +306,7 @@ private Brush GetFactoryRotate()
var converter = TypeDescriptor.GetConverter(typeof(Geometry));
var geometry = (Geometry)converter.ConvertFrom(lan);
var bsh =
- new DrawingBrush(new GeometryDrawing(ControlsHelper.Brush, new Pen(Brushes.Transparent, 2), geometry));
+ new DrawingBrush(new GeometryDrawing(ThemeManager.Instance.BackgroundBrush, new Pen(Brushes.Transparent, 2), geometry));
bsh.Stretch = Stretch.Uniform;
return bsh;
}
diff --git a/src/WPFDevelopers.Samples.Shared/Converts/DrawPrizeIndexToColor.cs b/src/WPFDevelopers.Samples.Shared/Converts/DrawPrizeIndexToColor.cs
index 4a0a5102..0b8eb5d7 100644
--- a/src/WPFDevelopers.Samples.Shared/Converts/DrawPrizeIndexToColor.cs
+++ b/src/WPFDevelopers.Samples.Shared/Converts/DrawPrizeIndexToColor.cs
@@ -11,9 +11,9 @@ public class DrawPrizeIndexToColor : IValueConverter
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
var num = System.Convert.ToInt32(value);
- var brush = (SolidColorBrush)Application.Current.TryFindResource("WD.DrawPrizeSingularSolidColorBrush");
+ var brush = (SolidColorBrush)Application.Current?.TryFindResource("WD.DrawPrizeSingularSolidColorBrush");
if (num % 2 == 1)
- brush = (SolidColorBrush)Application.Current.TryFindResource("WD.DrawPrizeDualSolidColorBrush");
+ brush = (SolidColorBrush)Application.Current?.TryFindResource("WD.DrawPrizeDualSolidColorBrush");
return brush;
}
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/AboutWindow.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/AboutWindow.xaml
index 0f00217a..a5ed8980 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/AboutWindow.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/AboutWindow.xaml
@@ -12,7 +12,7 @@
BorderThickness="0"
NoChrome="True"
ResizeMode="NoResize"
- TitleBackground="{DynamicResource WD.WindowBorderBrushSolidColorBrush}"
+ TitleBackground="{DynamicResource WD.WindowBorderBrush}"
TitleHeight="30"
WindowStartupLocation="CenterScreen"
WindowStyle="ToolWindow"
@@ -28,7 +28,7 @@
Margin="10,0"
VerticalAlignment="Center"
FontSize="14"
- Foreground="{DynamicResource WD.WindowForegroundColorBrush}"
+ Foreground="{DynamicResource WD.WindowTextBrush}"
IsHitTestVisible="False"
Text="关于" />
@@ -55,7 +55,7 @@
-
+
@@ -87,7 +87,7 @@
HorizontalAlignment="Center"
VerticalAlignment="Bottom"
FontSize="11"
- Foreground="{DynamicResource WD.PrimaryNormalSolidColorBrush}">
+ Foreground="{DynamicResource WD.PrimaryBrush}">
Github 源码
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/AnimationAudioExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/AnimationAudioExample.xaml
index 43e16a31..35beb6cc 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/AnimationAudioExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/AnimationAudioExample.xaml
@@ -35,7 +35,7 @@
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
index 644fae3f..4d15de44 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
@@ -10,7 +10,7 @@
Name="MyBasicControls"
d:DesignHeight="450"
d:DesignWidth="800"
- Background="{DynamicResource WD.BackgroundSolidColorBrush}"
+ Background="{DynamicResource WD.BackgroundBrush}"
mc:Ignorable="d">
@@ -27,18 +27,18 @@
Padding="0,4"
HorizontalAlignment="Center"
FontSize="20"
- Foreground="{DynamicResource WD.PrimaryNormalSolidColorBrush}"
+ Foreground="{DynamicResource WD.PrimaryBrush}"
Text="WPFDevelopers" />
+ Foreground="{DynamicResource WD.PrimaryBrush}">
Github 源码
@@ -57,7 +57,7 @@
Margin="0,20,0,0"
FontSize="20"
Text="Theme" />
-
+
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartPieExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartPieExample.xaml
index 0fc4bf16..00066e9d 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartPieExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartPieExample.xaml
@@ -11,7 +11,7 @@
d:DesignWidth="800"
mc:Ignorable="d">
-
+
@@ -20,7 +20,7 @@
+ Background="{DynamicResource WD.BackgroundBrush}">
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartRadarExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartRadarExample.xaml
index 705ce488..621e7b85 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartRadarExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartRadarExample.xaml
@@ -14,7 +14,7 @@
+ Background="{DynamicResource WD.BackgroundBrush}">
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChatEmojiExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChatEmojiExample.xaml
index 45552b88..2846f9a5 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChatEmojiExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChatEmojiExample.xaml
@@ -12,7 +12,7 @@
mc:Ignorable="d">
-
+
@@ -42,7 +42,7 @@
-
+
@@ -128,7 +128,7 @@
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
-
-
+
+
+
+
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/CropImageExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/CropImageExample.xaml
index 20e7016c..6a113be6 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/CropImageExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/CropImageExample.xaml
@@ -27,7 +27,7 @@
Content="开启等比缩放"
IsChecked="False" />
-
+
+ StartWatermark="开始日期"
+ wd:ElementHelper.IsClear="True"/>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerMenu/EdgePage.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerMenu/EdgePage.xaml
index b05c7475..16da8114 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerMenu/EdgePage.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerMenu/EdgePage.xaml
@@ -6,7 +6,7 @@
xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews.DrawerMenu"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"
- Title="EdgePage" Background="{DynamicResource WD.PrimaryPressedSolidColorBrush}">
+ Title="EdgePage" Background="{DynamicResource WD.PrimaryPressedBrush}">
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerMenu/HomePage.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerMenu/HomePage.xaml
index ca293b96..a5ae8889 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerMenu/HomePage.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerMenu/HomePage.xaml
@@ -6,7 +6,7 @@
xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews.DrawerMenu"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"
- Title="HomePage" Background="{StaticResource WD.PrimaryTextSolidColorBrush}">
+ Title="HomePage" Background="{StaticResource WD.PrimaryTextBrush}">
+ FontSize="{StaticResource WD.PrimaryFontSize}">
Home
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawingExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawingExample.xaml
index 001b7f97..73bd8065 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawingExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawingExample.xaml
@@ -15,7 +15,7 @@
-
+
@@ -25,7 +25,7 @@
-
-
+
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/LogoAnimationExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/LogoAnimationExample.xaml
index 80d39b45..e2e2ff81 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/LogoAnimationExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/LogoAnimationExample.xaml
@@ -9,10 +9,10 @@
d:DesignHeight="450" d:DesignWidth="800">
-
+ Effect="{StaticResource WD.PrimaryShadowDepth}" Margin="20">
@@ -45,7 +45,7 @@
+ To="{StaticResource WD.PrimaryColor}"/>
-
@@ -142,7 +142,7 @@
-
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/MainWindow.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/MainWindow.xaml
index e202e5fa..ebe5789d 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/MainWindow.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/MainWindow.xaml
@@ -49,7 +49,7 @@
Width="20"
Height="20"
Data="{StaticResource WD.WarningGeometry}"
- Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}"
+ Fill="{DynamicResource WD.PrimaryBrush}"
Stretch="Uniform" />
@@ -102,7 +102,7 @@
+ Background="{DynamicResource WD.BackgroundBrush}">
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectComboBoxExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectComboBoxExample.xaml
index bdde174d..d4ff4a73 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectComboBoxExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectComboBoxExample.xaml
@@ -16,52 +16,87 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectComboBoxExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectComboBoxExample.xaml.cs
index d5464f5d..3ae30c43 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectComboBoxExample.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectComboBoxExample.xaml.cs
@@ -1,4 +1,7 @@
-using System.Windows;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Windows;
using System.Windows.Controls;
namespace WPFDevelopers.Samples.ExampleViews
@@ -8,13 +11,47 @@ namespace WPFDevelopers.Samples.ExampleViews
///
public partial class MultiSelectComboBoxExample : UserControl
{
+ public ObservableCollection SelectedItems
+ {
+ get { return (ObservableCollection)GetValue(SelectedItemsProperty); }
+ set { SetValue(SelectedItemsProperty, value); }
+ }
+
+ public static readonly DependencyProperty SelectedItemsProperty =
+ DependencyProperty.Register("SelectedItems", typeof(ObservableCollection), typeof(MultiSelectComboBoxExample), new PropertyMetadata(null));
+
+ public ObservableCollection ItemsSource
+ {
+ get { return (ObservableCollection)GetValue(ItemsSourceProperty); }
+ set { SetValue(ItemsSourceProperty, value); }
+ }
+
+ public static readonly DependencyProperty ItemsSourceProperty =
+ DependencyProperty.Register("ItemsSource", typeof(ObservableCollection), typeof(MultiSelectComboBoxExample), new PropertyMetadata(null));
public MultiSelectComboBoxExample()
{
InitializeComponent();
+ Loaded += MultiSelectComboBoxExample_Loaded;
+ }
+
+ private void MultiSelectComboBoxExample_Loaded(object sender, RoutedEventArgs e)
+ {
+ var list2 = new List();
+ list2.Add(new UserInfo() { ID = "0", Name = "343DST.com" });
+ list2.Add(new UserInfo() { ID = "1", Name = "ABCV.wang" });
+ list2.Add(new UserInfo() { ID = "2", Name = "PPOI.xu" });
+ list2.Add(new UserInfo() { ID = "3", Name = "josh.peng" });
+
+ ItemsSource = new ObservableCollection(list2);
+ SelectedItems = new ObservableCollection(list2.Where(x => x.ID == "1" || x.ID == "3"));
}
+
private void Button_Click(object sender, System.Windows.RoutedEventArgs e)
{
- WPFDevelopers.Controls.MessageBox.Show($"{MyMultiSelectComboBox.Text} \r\n总共选中:{MyMultiSelectComboBox.SelectedItems.Count} 条", "选中内容", MessageBoxButton.OK, MessageBoxImage.Information);
+ string message = MyMultiSelectComboBox.Text.Trim().Length > 0
+ ? $"{MyMultiSelectComboBox.Text} \r\n总共选中:{MyMultiSelectComboBox.SelectedItems.Count} 条"
+ : $"总共选中:{MyMultiSelectComboBox.SelectedItems.Count} 条";
+ WPFDevelopers.Controls.MessageBox.Show(message, "选中内容", MessageBoxButton.OK, MessageBoxImage.Information);
}
}
}
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/AnimationNavigationBar3DExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/NavMenu3DExample.xaml
similarity index 74%
rename from src/WPFDevelopers.Samples.Shared/ExampleViews/AnimationNavigationBar3DExample.xaml
rename to src/WPFDevelopers.Samples.Shared/ExampleViews/NavMenu3DExample.xaml
index 45122367..22b511ac 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/AnimationNavigationBar3DExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/NavMenu3DExample.xaml
@@ -1,5 +1,5 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+ Item 6
+
Github 源代码
@@ -135,8 +154,8 @@
-
-
+
+
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/AnimationNavigationBar3DExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/NavMenu3DExample.xaml.cs
similarity index 57%
rename from src/WPFDevelopers.Samples.Shared/ExampleViews/AnimationNavigationBar3DExample.xaml.cs
rename to src/WPFDevelopers.Samples.Shared/ExampleViews/NavMenu3DExample.xaml.cs
index 7b50628f..84b768a6 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/AnimationNavigationBar3DExample.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/NavMenu3DExample.xaml.cs
@@ -1,15 +1,16 @@
using System.Diagnostics;
using System.Windows.Controls;
using System.Windows.Navigation;
+using WPFDevelopers.Controls;
namespace WPFDevelopers.Samples.ExampleViews
{
///
- /// AnimationNavigationBar3DExample.xaml 的交互逻辑
+ /// NavMenu3DExample.xaml 的交互逻辑
///
- public partial class AnimationNavigationBar3DExample : UserControl
+ public partial class NavMenu3DExample : UserControl
{
- public AnimationNavigationBar3DExample()
+ public NavMenu3DExample()
{
InitializeComponent();
}
@@ -25,5 +26,13 @@ private void GiteeHyperlink_RequestNavigate(object sender, RequestNavigateEventA
Process.Start(new ProcessStartInfo(e.Uri.AbsoluteUri));
e.Handled = true;
}
+
+ private void NavMenu3D_SelectionChanged(object sender, SelectionChangedEventArgs e)
+ {
+ if (PART_NavMenu3D.SelectedItem == null) return;
+ var item = PART_NavMenu3D.SelectedItem as NavMenu3DItem;
+ if (item.Tag.ToString() != null)
+ Message.Push(item.Tag.ToString());
+ }
}
}
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/NumberCard/NumberCardControl.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/NumberCard/NumberCardControl.xaml
index 02bde8db..5ab796f0 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/NumberCard/NumberCardControl.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/NumberCard/NumberCardControl.xaml
@@ -16,7 +16,7 @@
-
+
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/OtherControlExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/OtherControlExample.xaml
index ee612981..6875f45e 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/OtherControlExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/OtherControlExample.xaml
@@ -15,7 +15,7 @@
Height="200"
HorizontalAlignment="Center"
VerticalAlignment="Center"
- Background="{StaticResource WD.BlackSolidColorBrush}">
+ Background="{DynamicResource WD.PrimaryTextBrush}">
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/RainbowButtonsExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/RainbowButtonsExample.xaml
index 5bee194b..8694c93d 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/RainbowButtonsExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/RainbowButtonsExample.xaml
@@ -7,7 +7,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="450"
d:DesignWidth="800"
- Background="{StaticResource WD.BlackSolidColorBrush}"
+ Background="{DynamicResource WD.PrimaryTextBrush}"
mc:Ignorable="d">
/WPFDevelopers.Samples;component/Resources/Fonts/fixedsys.ttf#Fixedsys Excelsior 3.01
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/RulerControlExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/RulerControlExample.xaml
index 1b30541c..900b4a89 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/RulerControlExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/RulerControlExample.xaml
@@ -28,11 +28,11 @@
+ Background="{StaticResource WD.CircleMenuDualBrush}">
+ Background="{StaticResource WD.DangerBrush}">
+ Background="{StaticResource WD.WarningBrush}">
@@ -50,13 +50,13 @@
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/SixGirdViewExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/SixGirdViewExample.xaml
index cc8498ac..4700f92a 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/SixGirdViewExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/SixGirdViewExample.xaml
@@ -25,7 +25,7 @@
-
- #CD7474
-
- #CFA0A0
-
- #B70404
-
-
- #B31B1B
-
-
-
- #BB5F5F
-
-
- #B70404
-
-
-
\ No newline at end of file
diff --git a/src/WPFDevelopers.Samples.Shared/Models/UserModel.cs b/src/WPFDevelopers.Samples.Shared/Models/UserModel.cs
index d700526c..07b173e7 100644
--- a/src/WPFDevelopers.Samples.Shared/Models/UserModel.cs
+++ b/src/WPFDevelopers.Samples.Shared/Models/UserModel.cs
@@ -1,6 +1,6 @@
using System;
using System.Collections.Generic;
-using WPFDevelopers.Helpers;
+using WPFDevelopers.Samples;
namespace WPFDevelopers.Sample.Models
{
diff --git a/src/WPFDevelopers.Samples.Shared/Resources/Images/AnimationNavigationBar3D/background.png b/src/WPFDevelopers.Samples.Shared/Resources/Images/NavMenu3D/background.png
similarity index 100%
rename from src/WPFDevelopers.Samples.Shared/Resources/Images/AnimationNavigationBar3D/background.png
rename to src/WPFDevelopers.Samples.Shared/Resources/Images/NavMenu3D/background.png
diff --git a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
index 27eda91e..10ecebcb 100644
--- a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
+++ b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
@@ -65,7 +65,7 @@ public MainVM()
NavigateMenuModelList.Add(new NavigateMenuModel { Name = menuEnum.ToString() });
}
NavigateMenuModelList.Add(new NavigateMenuModel { Name = "持续更新中" });
- ControlPanel = new AnimationNavigationBar3DExample();
+ ControlPanel = new NavMenu3DExample();
}
public ICommand ViewLoaded => new RelayCommand(obj =>
@@ -115,8 +115,14 @@ void MenuItemSelection(string _menuName)
var menuEnum = (MenuEnum)Enum.Parse(typeof(MenuEnum), _menuName, true);
switch (menuEnum)
{
- case MenuEnum.Navigation3D:
- ControlPanel = new AnimationNavigationBar3DExample();
+ case MenuEnum.NavMenu3D:
+ ControlPanel = new NavMenu3DExample();
+ break;
+ case MenuEnum.UsageGuide:
+ ControlPanel = new UsageGuide();
+ break;
+ case MenuEnum.UsageColor:
+ ControlPanel = new UsageColor();
break;
case MenuEnum.BasicControls:
ControlPanel = new BasicControlsExample();
@@ -370,6 +376,9 @@ void MenuItemSelection(string _menuName)
case MenuEnum.Gauge:
ControlPanel = new GaugeExample();
break;
+ case MenuEnum.Tag:
+ ControlPanel = new TagExample();
+ break;
case MenuEnum.VirtualizingWrapPanel:
ControlPanel = new VirtualizingWrapPanel();
new VirtualizingWrapPanelExample().MaskShowDialog();
diff --git a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
index 40fb2871..5ea670d5 100644
--- a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
+++ b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
@@ -27,6 +27,8 @@
+
+
@@ -63,9 +65,9 @@
Code
AnimationAudioExample.xaml
-
+
Code
- AnimationNavigationBar3DExample.xaml
+ NavMenu3DExample.xaml
Code
@@ -300,6 +302,15 @@
Code
MultiSelectSearchComboBoxExample.xaml
+
+ TagExample.xaml
+
+
+ UsageColor.xaml
+
+
+ UsageGuide.xaml
+
HighTitleBarWindow.xaml
@@ -524,6 +535,10 @@
MSBuild:Compile
Designer
+
+ MSBuild:Compile
+ Designer
+
MSBuild:Compile
Designer
@@ -572,7 +587,7 @@
MSBuild:Compile
Designer
-
+
MSBuild:Compile
Designer
@@ -829,6 +844,18 @@
MSBuild:Compile
Designer
+
+ MSBuild:Compile
+ Designer
+
+
+ MSBuild:Compile
+ Designer
+
+
+ MSBuild:Compile
+ Designer
+
MSBuild:Compile
Designer
@@ -1017,10 +1044,6 @@
MSBuild:Compile
Designer
-
- MSBuild:Compile
- Designer
-
diff --git a/src/WPFDevelopers.Samples.Shared/app.manifest b/src/WPFDevelopers.Samples.Shared/app.manifest
index bc6bbbbc..d43f804b 100644
--- a/src/WPFDevelopers.Samples.Shared/app.manifest
+++ b/src/WPFDevelopers.Samples.Shared/app.manifest
@@ -1,54 +1,48 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
- PerMonitor
- true
-
-
-
-
-
-
+
+
diff --git a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
index 20ec7fcc..7cb3653c 100644
--- a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
+++ b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
@@ -11,7 +11,7 @@
-
+
@@ -146,13 +146,16 @@
-
+
+
+
+
@@ -164,8 +167,8 @@
ExampleViews\AnimationAudioExample.xaml
-
- ExampleViews\AnimationNavigationBar3DExample.xaml
+
+ ExampleViews\NavMenu3DExample.xaml
ExampleViews\BarrageExample.xaml
@@ -524,5 +527,11 @@
ExampleViews\Window\NormalWindow.xaml
+
+ ExampleViews\TagExample.xaml
+
+
+ Controls\Theme\Theme.xaml
+
diff --git a/src/WPFDevelopers.Shared/Controls/AnimationNavigationBar3D/AnimationNavigationBar3D.cs b/src/WPFDevelopers.Shared/Controls/AnimationNavigationBar3D/AnimationNavigationBar3D.cs
deleted file mode 100644
index 9a60824f..00000000
--- a/src/WPFDevelopers.Shared/Controls/AnimationNavigationBar3D/AnimationNavigationBar3D.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Windows;
-using System.Windows.Controls;
-
-namespace WPFDevelopers.Controls
-{
- public class AnimationNavigationBar3D : ListBox
- {
- static AnimationNavigationBar3D()
- {
- DefaultStyleKeyProperty.OverrideMetadata(typeof(AnimationNavigationBar3D),
- new FrameworkPropertyMetadata(typeof(AnimationNavigationBar3D)));
- }
- protected override bool IsItemItsOwnContainerOverride(object item)
- {
- return item is AnimationNavigationBar3DItem;
- }
- protected override DependencyObject GetContainerForItemOverride()
- {
- return new AnimationNavigationBar3DItem();
- }
- }
-}
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Controls/Badge/Badge.cs b/src/WPFDevelopers.Shared/Controls/Badge/Badge.cs
index 3c973948..8b0f05b7 100644
--- a/src/WPFDevelopers.Shared/Controls/Badge/Badge.cs
+++ b/src/WPFDevelopers.Shared/Controls/Badge/Badge.cs
@@ -206,8 +206,7 @@ protected override void OnRender(DrawingContext drawingContext)
{
var adornedElement = AdornedElement as FrameworkElement;
var desiredWidth = adornedElement.ActualWidth;
- var brush = new SolidColorBrush((Color)Application.Current.TryFindResource("WD.DangerColor"));
- brush.Freeze();
+ var brush = ThemeManager.Instance.Resources.TryFindResource("WD.DangerBrush");
var radius = 5.0;
var center = new Point(desiredWidth + _horizontalOffset, _verticalOffset);
FormattedText formattedText = null;
diff --git a/src/WPFDevelopers.Shared/Controls/BreatheLight/BreathLamp.cs b/src/WPFDevelopers.Shared/Controls/BreatheLight/BreathLamp.cs
index 167c283a..80fa3c8f 100644
--- a/src/WPFDevelopers.Shared/Controls/BreatheLight/BreathLamp.cs
+++ b/src/WPFDevelopers.Shared/Controls/BreatheLight/BreathLamp.cs
@@ -16,7 +16,7 @@ public class BreathLamp : ContentControl
{
public static readonly DependencyProperty EffectColorProperty =
DependencyProperty.Register("EffectColor", typeof(Color), typeof(BreathLamp),
- new PropertyMetadata(Application.Current.TryFindResource("WD.DangerColor")));
+ new PropertyMetadata(ThemeManager.Instance.Resources.GetColorFromResource("Danger")));
public static readonly DependencyProperty GradientStopColor1Property =
DependencyProperty.Register("GradientStopColor1", typeof(Color), typeof(BreathLamp),
diff --git a/src/WPFDevelopers.Shared/Controls/Carousel/EmphasizerCarousel.cs b/src/WPFDevelopers.Shared/Controls/Carousel/EmphasizerCarousel.cs
index 59e0b53a..259b03cf 100644
--- a/src/WPFDevelopers.Shared/Controls/Carousel/EmphasizerCarousel.cs
+++ b/src/WPFDevelopers.Shared/Controls/Carousel/EmphasizerCarousel.cs
@@ -22,11 +22,7 @@ public class EmphasizerCarousel : Control, IAddChild
[ReadOnly(true)] private const string Part_BackCanvasName = "PART_BackCanvas";
private const int _maxSimpleHeight = 320;
-
- //private double _SimpleOffset = 10;
-
private double _DisplayHeight;
-
private FrameworkElement _DisplayItem;
private readonly double _DisplayOffset = 10d;
private double _DisplayWidth;
diff --git a/src/WPFDevelopers.Shared/Controls/Carousel/MasterCarousel.cs b/src/WPFDevelopers.Shared/Controls/Carousel/MasterCarousel.cs
index e25f06d2..82787d9e 100644
--- a/src/WPFDevelopers.Shared/Controls/Carousel/MasterCarousel.cs
+++ b/src/WPFDevelopers.Shared/Controls/Carousel/MasterCarousel.cs
@@ -3,6 +3,8 @@
using System.Collections.Generic;
using System.Collections.Specialized;
using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
using System.Timers;
using System.Windows;
using System.Windows.Controls;
@@ -35,35 +37,30 @@ internal enum CarouselZIndex
[DefaultProperty("Children")]
[ContentProperty("Children")]
[Localizability(LocalizationCategory.None, Readability = Readability.Unreadable)]
- [TemplatePart(Name = Part_ContentDockName, Type = typeof(Canvas))]
- [TemplatePart(Name = Part_ButtonDockName, Type = typeof(StackPanel))]
+ [TemplatePart(Name = PARTContentDockName, Type = typeof(Canvas))]
+ [TemplatePart(Name = PARTButtonDockName, Type = typeof(StackPanel))]
public class MasterCarousel : Control, IAddChild
{
- private const string Part_ContentDockName = "PART_ContentDock";
- private const string Part_ButtonDockName = "PART_ButtonDock";
+ private const string PARTContentDockName = "PART_ContentDock";
+ private const string PARTButtonDockName = "PART_ButtonDock";
- // Using a DependencyProperty as the backing store for IsStartAinimation. This enables animation, styling, binding, etc...
public static readonly DependencyProperty IsStartAinimationProperty =
DependencyProperty.Register("IsStartAinimation", typeof(bool), typeof(MasterCarousel),
new PropertyMetadata(default(bool), OnIsStartAinimationPropertyChangedCallback));
- // Using a DependencyProperty as the backing store for PlaySpeed. This enables animation, styling, binding, etc...
public static readonly DependencyProperty PlaySpeedProperty =
DependencyProperty.Register("PlaySpeed", typeof(double), typeof(MasterCarousel),
new PropertyMetadata(2000d, OnPlaySpeedPropertyChangedCallBack));
- // Using a DependencyProperty as the backing store for Childrens. This enables animation, styling, binding, etc...
public static readonly DependencyProperty ItemsSourceProperty =
DependencyProperty.Register("ItemsSource", typeof(IEnumerable), typeof(MasterCarousel),
new PropertyMetadata(default(IEnumerable), OnItemsSourcePropertyChangedCallBack));
#region timer
- private readonly Timer _PlayTimer = new Timer();
+ private readonly Timer _playTimer = new Timer();
#endregion
-
-
static MasterCarousel()
{
DefaultStyleKeyProperty.OverrideMetadata(typeof(MasterCarousel),
@@ -72,20 +69,15 @@ static MasterCarousel()
public MasterCarousel()
{
- //_uiElementCollection = new List
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.ToggleButton.xaml b/src/WPFDevelopers.Shared/Styles/Styles.ToggleButton.xaml
index 4f9cd01f..83430f73 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.ToggleButton.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.ToggleButton.xaml
@@ -14,7 +14,7 @@
TargetType="{x:Type ToggleButton}">
-
+
@@ -33,7 +33,7 @@
Margin="2,0"
HorizontalAlignment="Left"
VerticalAlignment="Center"
- Fill="{DynamicResource WD.WindowForegroundColorBrush}">
+ Fill="{DynamicResource WD.WindowTextBrush}">
@@ -78,7 +78,7 @@
-
+
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.TreeView.xaml b/src/WPFDevelopers.Shared/Styles/Styles.TreeView.xaml
index 14492274..77b6780c 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.TreeView.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.TreeView.xaml
@@ -15,9 +15,9 @@
-
-
-
+
+
+
@@ -97,7 +97,7 @@
-
+
@@ -112,7 +112,7 @@
@@ -129,6 +129,9 @@
+
+
+
@@ -189,7 +192,7 @@
-
+
@@ -198,14 +201,14 @@
-
+
-
+
diff --git a/src/WPFDevelopers.Shared/ThemeManager.cs b/src/WPFDevelopers.Shared/ThemeManager.cs
new file mode 100644
index 00000000..bd1a964c
--- /dev/null
+++ b/src/WPFDevelopers.Shared/ThemeManager.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Windows.Media;
+
+namespace WPFDevelopers
+{
+ public class ThemeManager
+ {
+
+ private static ThemeManager _instance;
+ public static ThemeManager Instance
+ {
+ get
+ {
+ if (_instance == null)
+ {
+ _instance = new ThemeManager();
+ }
+ return _instance;
+ }
+ }
+
+ public Resources Resources { get; set; }
+
+ public Color PrimaryColor
+ {
+ get => Resources.TryFindResource("WD.PrimaryColor");
+
+ }
+
+ public Brush PrimaryBrush
+ {
+ get => Resources.TryFindResource("WD.PrimaryBrush");
+
+ }
+ public Brush BackgroundBrush
+ {
+ get => Resources.TryFindResource("WD.BackgroundBrush");
+ }
+
+ public Dictionary, SolidColorBrush> PrimaryColorCache = new Dictionary, SolidColorBrush>();
+
+ public Dictionary, Color>> ColorCache =
+ new Dictionary, Color>>();
+
+ public void SetTheme(ThemeType themeType)
+ {
+ if (Resources != null)
+ Resources.Theme = themeType;
+ }
+
+ public void SetColor(Color color)
+ {
+ if (Resources != null)
+ Resources.Color = color;
+ }
+ }
+}
diff --git a/src/WPFDevelopers.Shared/Themes/AnimationAudio.xaml b/src/WPFDevelopers.Shared/Themes/AnimationAudio.xaml
index 1c80da1e..3fcf87cf 100644
--- a/src/WPFDevelopers.Shared/Themes/AnimationAudio.xaml
+++ b/src/WPFDevelopers.Shared/Themes/AnimationAudio.xaml
@@ -13,8 +13,8 @@
TargetType="{x:Type controls:AnimationAudio}">
-
-
+
+
diff --git a/src/WPFDevelopers.Shared/Themes/Basic/Colors.xaml b/src/WPFDevelopers.Shared/Themes/Basic/Colors.xaml
index 024691cb..274bc4ac 100644
--- a/src/WPFDevelopers.Shared/Themes/Basic/Colors.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Basic/Colors.xaml
@@ -10,173 +10,86 @@
Color="#60000000" />
#AA000000
-
- #909399
-
+
#C0C4CC
-
- #409EFF
-
- #FF13CE67
-
-
-
-
- #99FA68
+
+ #409EFF
+ Color="{StaticResource WD.PrimaryColor}" />
- #EFFCE9
+ #EBF4FF
+ Color="{DynamicResource WD.PrimaryMouseOverColor}" />
- #67C23A
+
+ #13CE67
-
- #85CE61
+ #EFFCE9
- #5DAF34
-
-
-
- #F8DBAF
-
-
- #FAF2E5
-
-
+
#E6A23C
- #EBB563
+ #FAF2E5
- #CF9236
-
-
-
-
- #F88C8C
-
-
- #FCE5E5
-
-
+
#F56C6C
- #F78989
+ #FCE5E5
- #DD6161
-
-
-
- #909399
-
-
- #A6A9AD
-
-
- #82848A
-
-
- #F2F6FC
-
-
#000000
- #BAE766
+ #BAE766
+ Color="{StaticResource WD.CircleMenuColor}" />
- #B0D440
+ #B0D440
-
+ Color="{StaticResource WD.CircleMenuDualColor}" />
-
-
+
+
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/Basic/ControlBasic.xaml b/src/WPFDevelopers.Shared/Themes/Basic/ControlBasic.xaml
index da17c2ad..3601846d 100644
--- a/src/WPFDevelopers.Shared/Themes/Basic/ControlBasic.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Basic/ControlBasic.xaml
@@ -9,23 +9,23 @@
0.7
- 4
- 32
+ 4
+ 32
16
8
6
- 6
+ 6
#FFFFFF
#C0C4CC
- #202020
+ #202020
+ Color="{StaticResource WD.PrimaryBackgroundColor}" />
#323232
- #202020
+ #202020
+ Color="{StaticResource WD.WindowBorderColor}" />
#202020
#202020
#202020
#202020
#42414F
#86849D
diff --git a/src/WPFDevelopers.Shared/Themes/Basic/Font.xaml b/src/WPFDevelopers.Shared/Themes/Basic/Font.xaml
index a8566135..e36113c4 100644
--- a/src/WPFDevelopers.Shared/Themes/Basic/Font.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Basic/Font.xaml
@@ -1,26 +1,27 @@
-
+
- 13
+ 13
14
16
-
- Helvetica Neue For Number,
- -apple-system,
- BlinkMacSystemFont,
+
+ Helvetica Neue For Number,
+ -apple-system,
+ BlinkMacSystemFont,
Segoe UI,
- Roboto,
- PingFang SC,
- Hiragino Sans GB,
- Microsoft YaHei,
- Helvetica Neue,
- Helvetica, Arial,
+ Roboto,
+ PingFang SC,
+ Hiragino Sans GB,
+ Microsoft YaHei,
+ Helvetica Neue,
+ Helvetica, Arial,
sans-serif
- Normal
- Normal
- Normal
+ Normal
+ Normal
+ Normal
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/Basic/Geometrys.xaml b/src/WPFDevelopers.Shared/Themes/Basic/Geometrys.xaml
index 97501963..0ed1e1a7 100644
--- a/src/WPFDevelopers.Shared/Themes/Basic/Geometrys.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Basic/Geometrys.xaml
@@ -102,4 +102,5 @@
M512 112c-229.792 0-416 186.24-416 416s186.208 416 416 416c229.728 0 416-186.24 416-416s-186.24-416-416-416zM508.64 864.864c-185.568 0-336-150.432-336-336s150.432-336 336-336c185.536 0 336 150.432 336 336 0 185.568-150.464 336-336 336zM605.76 548.192h-95.36v-161.024c0-17.472-14.176-31.68-31.648-31.68-17.504 0-31.68 14.176-31.68 31.68v192.672c0 17.504 14.176 31.648 31.68 31.648h127.008c17.504 0 31.68-14.144 31.68-31.648 0-17.472-14.176-31.648-31.68-31.648z
M873.1 596.2l-164-208A32 32 0 00684 376h-64.8c-6.7 0-10.4 7.7-6.3 13l144.3 183H152c-4.4 0-8 3.6-8 8v60c0 4.4 3.6 8 8 8h695.9c26.8 0 41.7-30.8 25.2-51.8z
M13 2h-1v1.5c0 .28-.22.5-.5.5h-2c-.28 0-.5-.22-.5-.5V2H6v1.5c0 .28-.22.5-.5.5h-2c-.28 0-.5-.22-.5-.5V2H2c-.55 0-1 .45-1 1v11c0 .55.45 1 1 1h11c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1zm0 12H2V5h11v9zM5 3H4V1h1v2zm6 0h-1V1h1v2zM6 7H5V6h1v1zm2 0H7V6h1v1zm2 0H9V6h1v1zm2 0h-1V6h1v1zM4 9H3V8h1v1zm2 0H5V8h1v1zm2 0H7V8h1v1zm2 0H9V8h1v1zm2 0h-1V8h1v1zm-8 2H3v-1h1v1zm2 0H5v-1h1v1zm2 0H7v-1h1v1zm2 0H9v-1h1v1zm2 0h-1v-1h1v1zm-8 2H3v-1h1v1zm2 0H5v-1h1v1zm2 0H7v-1h1v1zm2 0H9v-1h1v1z
+ M20 109.9988C20 93.43 33.4314 79.998 50 79.998H80L80 99.998H50C44.4772 99.998 40 104.476 40 109.9988L40 249.9988C40 255.5216 44.4772 259.9988 50 259.9988L190 259.9988C195.5228 259.9988 200 255.5216 200 249.9988V219.9996H110C93.4316 219.9996 80 206.5682 80 189.9996V50C80 33.432 93.4316 20 110 20H250C266.568 20 280 33.432 280 50V189.9996C280 206.5682 266.568 219.9996 250 219.9996H220V249.9988C220 266.5674 206.568 279.9988 190 279.9988H50C33.4314 279.9988 20 266.5674 20 249.9988V109.9988zM100 189.9996C100 195.5224 104.4772 199.9996 110 199.9996H250C255.522 199.9996 260 195.5224 260 189.9996V50C260 44.476 255.522 40 250 40H110C104.4772 40 100 44.476 100 50V189.9996z
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/Basic/Light.Color.xaml b/src/WPFDevelopers.Shared/Themes/Basic/Light.Color.xaml
index fba9cc3e..90ff9007 100644
--- a/src/WPFDevelopers.Shared/Themes/Basic/Light.Color.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Basic/Light.Color.xaml
@@ -7,59 +7,66 @@
#303133
#606266
#FFFFFF
+
+ #409EFF
+
+
#DCDFE6
#F5F7FA
#EBEEF5
#E4E7ED
#E0E6F1
#6E7079
diff --git a/src/WPFDevelopers.Shared/Themes/BreadCrumbBar.xaml b/src/WPFDevelopers.Shared/Themes/BreadCrumbBar.xaml
index 4a459cb8..3875a4e2 100644
--- a/src/WPFDevelopers.Shared/Themes/BreadCrumbBar.xaml
+++ b/src/WPFDevelopers.Shared/Themes/BreadCrumbBar.xaml
@@ -23,7 +23,7 @@
Width="9"
Height="9"
Data="{StaticResource WD.ChevronRightGeometry}"
- Fill="{DynamicResource WD.PlaceholderTextSolidColorBrush}"
+ Fill="{DynamicResource WD.PlaceholderTextBrush}"
IsHitTestVisible="False"
Stretch="Uniform">
@@ -43,7 +43,7 @@
-
+
diff --git a/src/WPFDevelopers.Shared/Themes/BreathLamp.xaml b/src/WPFDevelopers.Shared/Themes/BreathLamp.xaml
index aead8e0a..2c65e535 100644
--- a/src/WPFDevelopers.Shared/Themes/BreathLamp.xaml
+++ b/src/WPFDevelopers.Shared/Themes/BreathLamp.xaml
@@ -249,9 +249,9 @@
-
-
-
+
+
+
diff --git a/src/WPFDevelopers.Shared/Themes/BubblleControl.xaml b/src/WPFDevelopers.Shared/Themes/BubblleControl.xaml
index d009e552..9dbc1750 100644
--- a/src/WPFDevelopers.Shared/Themes/BubblleControl.xaml
+++ b/src/WPFDevelopers.Shared/Themes/BubblleControl.xaml
@@ -12,10 +12,10 @@
TargetType="controls:BubblleControl">
-
+
-
-
+
+
diff --git a/src/WPFDevelopers.Shared/Themes/Carousel.xaml b/src/WPFDevelopers.Shared/Themes/Carousel.xaml
index 7de45b15..8b175a44 100644
--- a/src/WPFDevelopers.Shared/Themes/Carousel.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Carousel.xaml
@@ -26,6 +26,31 @@
HorizontalAlignment="Center"
VerticalAlignment="Center"
Orientation="Horizontal" />
+
diff --git a/src/WPFDevelopers.Shared/Themes/CircleMenu.xaml b/src/WPFDevelopers.Shared/Themes/CircleMenu.xaml
index a85d8065..cad8dccc 100644
--- a/src/WPFDevelopers.Shared/Themes/CircleMenu.xaml
+++ b/src/WPFDevelopers.Shared/Themes/CircleMenu.xaml
@@ -38,7 +38,7 @@
-
+
@@ -91,12 +91,12 @@
x:Name="PART_Ellipse"
Width="100"
Height="100"
- Fill="{StaticResource WD.PrimaryNormalSolidColorBrush}" />
+ Fill="{DynamicResource WD.PrimaryBrush}" />
diff --git a/src/WPFDevelopers.Shared/Themes/CircleProgressBar.xaml b/src/WPFDevelopers.Shared/Themes/CircleProgressBar.xaml
index 4b4037bb..b781f683 100644
--- a/src/WPFDevelopers.Shared/Themes/CircleProgressBar.xaml
+++ b/src/WPFDevelopers.Shared/Themes/CircleProgressBar.xaml
@@ -16,11 +16,11 @@
-
-
+
+
-
+
@@ -80,53 +80,13 @@
-
+
-
+
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/ColorPicker.xaml b/src/WPFDevelopers.Shared/Themes/ColorPicker.xaml
index d655736c..ea311997 100644
--- a/src/WPFDevelopers.Shared/Themes/ColorPicker.xaml
+++ b/src/WPFDevelopers.Shared/Themes/ColorPicker.xaml
@@ -40,7 +40,6 @@
CornerRadius="{Binding ActualWidth, RelativeSource={RelativeSource Self}, Converter={StaticResource WD.HalfValueConverter}}" />
-
-
-
-
+
+
@@ -228,19 +226,19 @@
TargetType="{x:Type TextBox}">
-
+
diff --git a/src/WPFDevelopers.Shared/Themes/CropAvatar.xaml b/src/WPFDevelopers.Shared/Themes/CropAvatar.xaml
index 365290c0..9593205c 100644
--- a/src/WPFDevelopers.Shared/Themes/CropAvatar.xaml
+++ b/src/WPFDevelopers.Shared/Themes/CropAvatar.xaml
@@ -19,7 +19,7 @@
x:Name="PART_Layout"
Width="200"
Height="200"
- Fill="{DynamicResource WD.BlackSolidColorBrush}"
+ Fill="{DynamicResource WD.BlackBrush}"
Opacity=".5">
@@ -51,7 +51,7 @@
diff --git a/src/WPFDevelopers.Shared/Themes/CropImage.xaml b/src/WPFDevelopers.Shared/Themes/CropImage.xaml
index 500a43ee..96d5dc87 100644
--- a/src/WPFDevelopers.Shared/Themes/CropImage.xaml
+++ b/src/WPFDevelopers.Shared/Themes/CropImage.xaml
@@ -20,7 +20,7 @@
diff --git a/src/WPFDevelopers.Shared/Themes/Dark.Blue.xaml b/src/WPFDevelopers.Shared/Themes/Dark.Blue.xaml
deleted file mode 100644
index 02b99f70..00000000
--- a/src/WPFDevelopers.Shared/Themes/Dark.Blue.xaml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- #FFFFFF
-
-
- #FFC6E2FF
-
- #FFEBF4FF
-
- #FF398DE6
-
-
- #409EFF
-
-
- #66B1FF
-
-
- #3A8EE6
-
-
-
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/DateRangePicker.xaml b/src/WPFDevelopers.Shared/Themes/DateRangePicker.xaml
index 8c810d93..26823ad7 100644
--- a/src/WPFDevelopers.Shared/Themes/DateRangePicker.xaml
+++ b/src/WPFDevelopers.Shared/Themes/DateRangePicker.xaml
@@ -2,11 +2,11 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:WPFDevelopers.Controls"
- xmlns:helpers="clr-namespace:WPFDevelopers.Helpers">
+ xmlns:helpers="clr-namespace:WPFDevelopers.Helpers"
+ xmlns:resx="clr-namespace:WPFDevelopers">
-
+ Fill="{DynamicResource WD.BaseBrush}" />
-
+
-
-
+
+
@@ -189,6 +189,7 @@
+
+ SelectionBrush="{DynamicResource WD.WindowBorderBrush}" />
+ SelectionBrush="{DynamicResource WD.WindowBorderBrush}" />
+
+
+
+
diff --git a/src/WPFDevelopers.Shared/Themes/Drawer.xaml b/src/WPFDevelopers.Shared/Themes/Drawer.xaml
index 972a7850..5ae7ce49 100644
--- a/src/WPFDevelopers.Shared/Themes/Drawer.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Drawer.xaml
@@ -10,8 +10,8 @@
x:Key="WD.Drawer"
BasedOn="{StaticResource WD.ControlBasicStyle}"
TargetType="{x:Type controls:Drawer}">
-
-
+
+
@@ -30,13 +30,13 @@
+ Effect="{StaticResource WD.PrimaryShadowDepth}">
diff --git a/src/WPFDevelopers.Shared/Themes/DrawerMenu.xaml b/src/WPFDevelopers.Shared/Themes/DrawerMenu.xaml
index 49a3298f..11ad64d5 100644
--- a/src/WPFDevelopers.Shared/Themes/DrawerMenu.xaml
+++ b/src/WPFDevelopers.Shared/Themes/DrawerMenu.xaml
@@ -29,7 +29,7 @@
@@ -86,11 +86,11 @@
-
-
+
+
-
+
@@ -108,7 +108,7 @@
TargetType="controls:DrawerMenuItem">
-
+
@@ -156,11 +156,11 @@
-
+
-
+
@@ -185,13 +185,13 @@
TargetType="controls:DrawerMenu">
-
-
-
+
+
+
-
+
-
+
diff --git a/src/WPFDevelopers.Shared/Themes/EdgeLight.xaml b/src/WPFDevelopers.Shared/Themes/EdgeLight.xaml
index 56bd31da..6b333966 100644
--- a/src/WPFDevelopers.Shared/Themes/EdgeLight.xaml
+++ b/src/WPFDevelopers.Shared/Themes/EdgeLight.xaml
@@ -9,7 +9,7 @@
x:Key="WD.EdgeLight"
BasedOn="{StaticResource WD.ControlBasicStyle}"
TargetType="{x:Type controls:EdgeLight}">
-
+
diff --git a/src/WPFDevelopers.Shared/Themes/IPEditBox.xaml b/src/WPFDevelopers.Shared/Themes/IPEditBox.xaml
index 15cb15b9..1c6a7d19 100644
--- a/src/WPFDevelopers.Shared/Themes/IPEditBox.xaml
+++ b/src/WPFDevelopers.Shared/Themes/IPEditBox.xaml
@@ -11,11 +11,11 @@
BasedOn="{StaticResource WD.ControlBasicStyle}"
TargetType="{x:Type controls:IPEditBox}">
-
-
+
+
-
+
@@ -66,17 +66,17 @@
-
+
-
+
-
+
diff --git a/src/WPFDevelopers.Shared/Themes/Light.Blue.xaml b/src/WPFDevelopers.Shared/Themes/Light.Blue.xaml
deleted file mode 100644
index a57741b9..00000000
--- a/src/WPFDevelopers.Shared/Themes/Light.Blue.xaml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
- #FFC6E2FF
-
-
- #FFEBF4FF
-
-
- #FF398DE6
-
-
- #409EFF
-
-
-
- #66B1FF
-
-
- #3A8EE6
-
-
-
-
-
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/Light.Green.xaml b/src/WPFDevelopers.Shared/Themes/Light.Green.xaml
deleted file mode 100644
index 40160720..00000000
--- a/src/WPFDevelopers.Shared/Themes/Light.Green.xaml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
- #8CF4BB
-
-
- #DEFAEB
-
-
- #03C25A
-
-
- #00B050
-
-
-
- #6DE0A1
-
-
- #01A74C
-
-
-
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/Light.Orange.xaml b/src/WPFDevelopers.Shared/Themes/Light.Orange.xaml
deleted file mode 100644
index 936cbe46..00000000
--- a/src/WPFDevelopers.Shared/Themes/Light.Orange.xaml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- #FFCA93
-
-
- #FAEFE4
-
-
- #FF901D
-
-
- #FE9426
-
-
-
- #FAAD5E
-
-
- #FA840A
-
-
-
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/Light.Pink.xaml b/src/WPFDevelopers.Shared/Themes/Light.Pink.xaml
deleted file mode 100644
index 454b600f..00000000
--- a/src/WPFDevelopers.Shared/Themes/Light.Pink.xaml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
- #FA7FBC
-
- #F8D8E8
-
- #F8027D
-
-
- #FF007F
-
-
-
- #FE4EA6
-
-
- #F8027D
-
-
-
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/Light.Purple.xaml b/src/WPFDevelopers.Shared/Themes/Light.Purple.xaml
deleted file mode 100644
index 629944ff..00000000
--- a/src/WPFDevelopers.Shared/Themes/Light.Purple.xaml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- #D79BFE
-
-
- #F1E2FA
-
-
- #C167FC
-
-
- #A21BFC
-
-
-
- #B64BFC
-
-
- #9700FC
-
-
-
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/Light.Red.xaml b/src/WPFDevelopers.Shared/Themes/Light.Red.xaml
deleted file mode 100644
index e684a920..00000000
--- a/src/WPFDevelopers.Shared/Themes/Light.Red.xaml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
- #FF8DA7
-
- #FFD6DF
-
- #FF275A
-
-
- #FF033E
-
-
-
- #FE6E90
-
-
- #FF0943
-
-
-
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/LoadingGroup.xaml b/src/WPFDevelopers.Shared/Themes/LoadingGroup.xaml
index 965d0de3..5dbfd319 100644
--- a/src/WPFDevelopers.Shared/Themes/LoadingGroup.xaml
+++ b/src/WPFDevelopers.Shared/Themes/LoadingGroup.xaml
@@ -90,19 +90,19 @@
Canvas.Left="0"
Width="20"
Height="20"
- Fill="{StaticResource WD.DangerSolidColorBrush}" />
+ Fill="{StaticResource WD.DangerBrush}" />
+ Fill="{StaticResource WD.SuccessBrush}" />
+ Fill="{StaticResource WD.WarningBrush}" />
diff --git a/src/WPFDevelopers.Shared/Themes/Magnifier.xaml b/src/WPFDevelopers.Shared/Themes/Magnifier.xaml
index 08efbe83..7cadf6dc 100644
--- a/src/WPFDevelopers.Shared/Themes/Magnifier.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Magnifier.xaml
@@ -15,7 +15,7 @@
-
+
diff --git a/src/WPFDevelopers.Shared/Themes/Mask.xaml b/src/WPFDevelopers.Shared/Themes/Mask.xaml
index 4c709aa0..31d287d4 100644
--- a/src/WPFDevelopers.Shared/Themes/Mask.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Mask.xaml
@@ -11,7 +11,7 @@
TargetType="{x:Type controls:MaskControl}">
-
+
diff --git a/src/WPFDevelopers.Shared/Themes/Message.xaml b/src/WPFDevelopers.Shared/Themes/Message.xaml
index 78d3e421..ad70dfa9 100644
--- a/src/WPFDevelopers.Shared/Themes/Message.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Message.xaml
@@ -11,8 +11,8 @@
x:Key="WD.MessageListBoxItem"
BasedOn="{StaticResource WD.ControlBasicStyle}"
TargetType="{x:Type controls:MessageListBoxItem}">
-
-
+
+
@@ -83,7 +83,7 @@
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
- Effect="{StaticResource WD.NormalShadowDepth}"
+ Effect="{StaticResource WD.PrimaryShadowDepth}"
SnapsToDevicePixels="True"
UseLayoutRounding="True" />
@@ -98,7 +98,7 @@
Width="15"
Height="15"
Data="{StaticResource WD.InformationGeometry}"
- Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}"
+ Fill="{DynamicResource WD.PrimaryBrush}"
Stretch="Fill" />
@@ -141,23 +141,23 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/src/WPFDevelopers.Shared/Themes/MultiSelectComboBox.xaml b/src/WPFDevelopers.Shared/Themes/MultiSelectComboBox.xaml
index 130fde9c..d8a33caf 100644
--- a/src/WPFDevelopers.Shared/Themes/MultiSelectComboBox.xaml
+++ b/src/WPFDevelopers.Shared/Themes/MultiSelectComboBox.xaml
@@ -15,7 +15,7 @@
-
+
@@ -48,7 +48,7 @@
-
+
@@ -60,19 +60,16 @@
x:Key="WD.MultiSelectComboBox"
BasedOn="{StaticResource WD.ControlBasicStyle}"
TargetType="{x:Type controls:MultiSelectComboBox}">
-
-
-
-
+
-
-
+
+
@@ -105,11 +102,20 @@
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
SnapsToDevicePixels="True">
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
@@ -214,7 +258,7 @@
-
+
diff --git a/src/WPFDevelopers.Shared/Themes/MultiSelectSearchComboBox.xaml b/src/WPFDevelopers.Shared/Themes/MultiSelectSearchComboBox.xaml
index d7a7df3d..38bb0123 100644
--- a/src/WPFDevelopers.Shared/Themes/MultiSelectSearchComboBox.xaml
+++ b/src/WPFDevelopers.Shared/Themes/MultiSelectSearchComboBox.xaml
@@ -19,10 +19,10 @@
-
+
-
-
+
+
@@ -68,9 +68,9 @@
Panel.ZIndex="1"
Background="Transparent"
Focusable="True"
- Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}"
+ Foreground="{DynamicResource WD.PrimaryTextBrush}"
IsReadOnly="True"
- SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}"
+ SelectionBrush="{DynamicResource WD.WindowBorderBrush}"
Style="{x:Null}"
Template="{StaticResource WD.ComboBoxTextBox}"
Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" />
@@ -80,8 +80,8 @@
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Background="Transparent"
- FontSize="{StaticResource WD.NormalFontSize}"
- Foreground="{DynamicResource WD.RegularTextSolidColorBrush}"
+ FontSize="{StaticResource WD.PrimaryFontSize}"
+ Foreground="{DynamicResource WD.RegularTextBrush}"
IsHitTestVisible="False"
Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}"
TextTrimming="CharacterEllipsis"
@@ -90,7 +90,7 @@
x:Name="PART_ToggleButton"
Grid.ColumnSpan="2"
Background="{TemplateBinding Background}"
- ClickMode="Release"
+ ClickMode="Press"
Focusable="False"
IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
Style="{x:Null}"
@@ -98,6 +98,7 @@
-
+
diff --git a/src/WPFDevelopers.Shared/Themes/AnimationNavigationBar3D.xaml b/src/WPFDevelopers.Shared/Themes/NavMenu3D.xaml
similarity index 91%
rename from src/WPFDevelopers.Shared/Themes/AnimationNavigationBar3D.xaml
rename to src/WPFDevelopers.Shared/Themes/NavMenu3D.xaml
index 4c167ce2..0cf58a68 100644
--- a/src/WPFDevelopers.Shared/Themes/AnimationNavigationBar3D.xaml
+++ b/src/WPFDevelopers.Shared/Themes/NavMenu3D.xaml
@@ -7,17 +7,19 @@
-
-
+
+
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/NumericBox.xaml b/src/WPFDevelopers.Shared/Themes/NumericBox.xaml
index be3e5677..1920bee2 100644
--- a/src/WPFDevelopers.Shared/Themes/NumericBox.xaml
+++ b/src/WPFDevelopers.Shared/Themes/NumericBox.xaml
@@ -13,12 +13,12 @@
-
-
+
+
-
+
@@ -55,7 +55,7 @@
InputMethod.IsInputMethodEnabled="False"
IsReadOnly="{TemplateBinding IsReadOnly}"
IsTabStop="{TemplateBinding IsTabStop}"
- SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}"
+ SelectionBrush="{DynamicResource WD.WindowBorderBrush}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
Style="{x:Null}"
TabIndex="{TemplateBinding TabIndex}"
@@ -105,7 +105,7 @@
-
+
diff --git a/src/WPFDevelopers.Shared/Themes/Pagination.xaml b/src/WPFDevelopers.Shared/Themes/Pagination.xaml
index de2a2c1a..8fa1cb6d 100644
--- a/src/WPFDevelopers.Shared/Themes/Pagination.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Pagination.xaml
@@ -46,8 +46,8 @@
-
-
+
+
@@ -74,13 +74,13 @@
-
-
-
+
+
+
-
-
+
+
diff --git a/src/WPFDevelopers.Shared/Themes/PathIcon.xaml b/src/WPFDevelopers.Shared/Themes/PathIcon.xaml
index 0d908d0a..a9cb4c96 100644
--- a/src/WPFDevelopers.Shared/Themes/PathIcon.xaml
+++ b/src/WPFDevelopers.Shared/Themes/PathIcon.xaml
@@ -30,13 +30,15 @@
HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
VerticalAlignment="{TemplateBinding VerticalAlignment}"
UseLayoutRounding="True">
-
+
+
+
diff --git a/src/WPFDevelopers.Shared/Themes/ScreenCut.xaml b/src/WPFDevelopers.Shared/Themes/ScreenCut.xaml
index c3be26a1..6cf71b20 100644
--- a/src/WPFDevelopers.Shared/Themes/ScreenCut.xaml
+++ b/src/WPFDevelopers.Shared/Themes/ScreenCut.xaml
@@ -33,14 +33,14 @@
@@ -84,7 +84,7 @@
@@ -108,7 +108,7 @@
+ Stroke="{DynamicResource WD.PrimaryTextBrush}" />
@@ -181,7 +181,7 @@
@@ -190,7 +190,7 @@
Margin="0,-8,0,0"
VerticalAlignment="Top"
Data="{StaticResource WD.UpperTriangleGeometry}"
- Fill="{DynamicResource WD.BackgroundSolidColorBrush}"
+ Fill="{DynamicResource WD.BackgroundBrush}"
SnapsToDevicePixels="True"
Stretch="Uniform"
UseLayoutRounding="True" />
diff --git a/src/WPFDevelopers.Shared/Themes/SpotLight.xaml b/src/WPFDevelopers.Shared/Themes/SpotLight.xaml
index adce1a70..de44dbbf 100644
--- a/src/WPFDevelopers.Shared/Themes/SpotLight.xaml
+++ b/src/WPFDevelopers.Shared/Themes/SpotLight.xaml
@@ -9,11 +9,10 @@
x:Key="WD.SpotLight"
BasedOn="{StaticResource WD.ControlBasicStyle}"
TargetType="{x:Type controls:SpotLight}">
-
-
+
+
-
diff --git a/src/WPFDevelopers.Shared/Themes/StarrySky.xaml b/src/WPFDevelopers.Shared/Themes/StarrySky.xaml
index 1902b4b6..0b3a0199 100644
--- a/src/WPFDevelopers.Shared/Themes/StarrySky.xaml
+++ b/src/WPFDevelopers.Shared/Themes/StarrySky.xaml
@@ -9,7 +9,7 @@
x:Key="WD.StarrySky"
BasedOn="{StaticResource WD.ControlBasicStyle}"
TargetType="{x:Type controls:StarrySky}">
-
+
diff --git a/src/WPFDevelopers.Shared/Themes/Step.xaml b/src/WPFDevelopers.Shared/Themes/Step.xaml
index 1524181d..8b3ad75e 100644
--- a/src/WPFDevelopers.Shared/Themes/Step.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Step.xaml
@@ -26,7 +26,7 @@
Width="45"
Height="30"
HorizontalAlignment="Center"
- Fill="{DynamicResource WD.BackgroundSolidColorBrush}" />
+ Fill="{DynamicResource WD.BackgroundBrush}" />
+ TextElement.Foreground="{DynamicResource WD.RegularTextBrush}" />
@@ -70,23 +70,23 @@
-
+
-
+
-
+
-
+
-
-
+
+
-
+
diff --git a/src/WPFDevelopers.Shared/Themes/Tag.xaml b/src/WPFDevelopers.Shared/Themes/Tag.xaml
new file mode 100644
index 00000000..7f51e0bb
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Themes/Tag.xaml
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/Theme40.txt b/src/WPFDevelopers.Shared/Themes/Theme40.txt
index 39d174af..ab26a656 100644
--- a/src/WPFDevelopers.Shared/Themes/Theme40.txt
+++ b/src/WPFDevelopers.Shared/Themes/Theme40.txt
@@ -30,7 +30,6 @@ Basic\ControlBasic.xaml
..\Styles\Styles.TreeView.xaml
..\Styles\Styles.MessageBox.xaml
..\Styles\Styles.Loading.xaml
-..\Styles\Styles.Theme.xaml
..\Styles\Styles.GridSplitter.xaml
..\Styles\Styles.Label.xaml
..\Styles\Styles.RepeatButton.xaml
@@ -39,7 +38,7 @@ Basic\ControlBasic.xaml
..\Microsoft.Expression.Drawing\Themes\Generic.xaml
AnimationAudio.xaml
-AnimationNavigationBar3D.xaml
+NavMenu3D.xaml
BallLoading.xaml
BreathLamp.xaml
Carousel.xaml
@@ -69,4 +68,5 @@ ColorPicker.xaml
IPEditBox.xaml
TimePicker.xaml
Drawer.xaml
-DateRangePicker.xaml
\ No newline at end of file
+DateRangePicker.xaml
+Tag.xaml
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/Theme45x.txt b/src/WPFDevelopers.Shared/Themes/Theme45x.txt
index fb6070b2..bab8179c 100644
--- a/src/WPFDevelopers.Shared/Themes/Theme45x.txt
+++ b/src/WPFDevelopers.Shared/Themes/Theme45x.txt
@@ -30,7 +30,6 @@ Basic\ControlBasic.xaml
..\Styles\Styles.TreeView.xaml
..\Styles\Styles.MessageBox.xaml
..\Styles\Styles.Loading.xaml
-..\Styles\Styles.Theme.xaml
..\Styles\Styles.GridSplitter.xaml
..\Styles\Styles.Label.xaml
..\Styles\Styles.RepeatButton.xaml
@@ -40,7 +39,7 @@ Basic\ControlBasic.xaml
AnimationAudio.xaml
-AnimationNavigationBar3D.xaml
+NavMenu3D.xaml
BallLoading.xaml
BreathLamp.xaml
Carousel.xaml
@@ -70,4 +69,5 @@ ColorPicker.xaml
IPEditBox.xaml
TimePicker.xaml
Drawer.xaml
-DateRangePicker.xaml
\ No newline at end of file
+DateRangePicker.xaml
+Tag.xaml
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/TimePicker.xaml b/src/WPFDevelopers.Shared/Themes/TimePicker.xaml
index 1b6db6b0..20ebff10 100644
--- a/src/WPFDevelopers.Shared/Themes/TimePicker.xaml
+++ b/src/WPFDevelopers.Shared/Themes/TimePicker.xaml
@@ -30,17 +30,17 @@
Grid.Column="1"
HorizontalAlignment="Center"
VerticalAlignment="Center"
- Foreground="{DynamicResource WD.PlaceholderTextSolidColorBrush}"
+ Foreground="{DynamicResource WD.PlaceholderTextBrush}"
IsHitTestVisible="False"
Kind="Time" />
-
+
-
+
@@ -59,7 +59,7 @@
-
+
@@ -105,7 +105,7 @@
TargetType="{x:Type controls:TimeSelector}">
-
+
@@ -127,7 +127,7 @@
Height="{TemplateBinding ItemHeight}"
Margin="{TemplateBinding SelectorMargin}"
VerticalAlignment="Top"
- BorderBrush="{DynamicResource WD.BaseSolidColorBrush}"
+ BorderBrush="{DynamicResource WD.BaseBrush}"
BorderThickness="0,1"
IsHitTestVisible="False" />
@@ -143,10 +143,10 @@
TargetType="{x:Type controls:TimePicker}">
-
+
-
-
+
+
@@ -185,8 +185,8 @@
Panel.ZIndex="1"
Background="Transparent"
Focusable="True"
- Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}"
- SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}"
+ Foreground="{DynamicResource WD.PrimaryTextBrush}"
+ SelectionBrush="{DynamicResource WD.WindowBorderBrush}"
Style="{x:Null}"
Template="{StaticResource WD.ComboBoxTextBox}" />
-
+
diff --git a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
index dfd16bf8..457d23d5 100644
--- a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
+++ b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
@@ -27,11 +27,11 @@
+
-
-
+
@@ -55,6 +55,7 @@
+
@@ -63,6 +64,7 @@
+
@@ -73,8 +75,8 @@
-
-
+
+
@@ -163,8 +165,6 @@
-
-
@@ -386,10 +386,6 @@
MSBuild:Compile
Designer
-
- MSBuild:Compile
- Designer
-
MSBuild:Compile
Designer
@@ -402,7 +398,7 @@
MSBuild:Compile
Designer
-
+
MSBuild:Compile
Designer
@@ -474,10 +470,6 @@
MSBuild:Compile
Designer
-
- MSBuild:Compile
- Designer
-
MSBuild:Compile
Designer
@@ -522,30 +514,6 @@
MSBuild:Compile
Designer
-
- MSBuild:Compile
- Designer
-
-
- MSBuild:Compile
- Designer
-
-
- MSBuild:Compile
- Designer
-
-
- MSBuild:Compile
- Designer
-
-
- MSBuild:Compile
- Designer
-
-
- MSBuild:Compile
- Designer
-
MSBuild:Compile
Designer
@@ -574,6 +542,10 @@
MSBuild:Compile
Designer
+
+ MSBuild:Compile
+ Designer
+
MSBuild:Compile
Designer
diff --git a/src/WPFDevelopers.sln b/src/WPFDevelopers.sln
index 4014fd8b..3e8b4d97 100644
--- a/src/WPFDevelopers.sln
+++ b/src/WPFDevelopers.sln
@@ -80,9 +80,9 @@ Global
{88DD2697-4DF1-40DC-B33B-DE1FD9846800} = {2C729CA5-1110-40DA-8EF4-2A7549072C53}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
- RESX_SaveFilesImmediatelyUponChange = False
- RESX_NeutralResourcesLanguage = zh-CN
SolutionGuid = {641F8D5D-5514-4C9A-9FAB-7FAF38D9C008}
+ RESX_NeutralResourcesLanguage = zh-CN
+ RESX_SaveFilesImmediatelyUponChange = False
EndGlobalSection
GlobalSection(SharedMSBuildProjectFiles) = preSolution
WPFDevelopers.Samples.Shared\WPFDevelopers.Samples.Shared.projitems*{31f881a8-9ddf-4fc2-999b-d47bc25cb47d}*SharedItemsImports = 5
@@ -91,7 +91,6 @@ Global
WPFDevelopers.Samples.Shared\WPFDevelopers.Samples.Shared.projitems*{a0a4e0f8-745e-401a-a654-d4962ca9cc64}*SharedItemsImports = 13
Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems*{a608ceb8-62c0-47ab-8f8e-6f1e033cfd74}*SharedItemsImports = 5
WPFDevelopers.Shared\WPFDevelopers.Shared.projitems*{a608ceb8-62c0-47ab-8f8e-6f1e033cfd74}*SharedItemsImports = 5
- Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems*{ad525acc-1df1-4ff6-8cc8-412b866e748a}*SharedItemsImports = 5
WPFDevelopers.Shared\WPFDevelopers.Shared.projitems*{ad525acc-1df1-4ff6-8cc8-412b866e748a}*SharedItemsImports = 5
WPFDevelopers.Shared\WPFDevelopers.Shared.projitems*{f424a42d-ed95-4c4a-8b74-50a7c59658de}*SharedItemsImports = 13
EndGlobalSection