From 82cf0bfcdbd11d3b6e96a5bd91efa61dc33f83c4 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 15 Jun 2019 00:06:42 +0800
Subject: [PATCH] Modified Window Style
---
.../HandyControl_Core_30/Themes/Styles/Window.xaml | 3 ++-
.../HandyControl_Net_40/Themes/Styles/Window.xaml | 3 ++-
.../HandyControl_Net_GE45/Themes/Styles/Window.xaml | 3 ++-
.../HandyControlDemo_Shared/Service/DataService.cs | 2 +-
.../Controls/Attach/DataGridAttach.cs | 4 ++--
.../Controls/ColorPicker/ColorPicker.cs | 2 +-
.../HandyControl_Shared/Controls/Image/GifImage.cs | 2 +-
.../Controls/Loading/LoadingBase.cs | 4 ++--
.../Controls/Other/AnimationPath.cs | 2 +-
.../HandyControl_Shared/Controls/Other/Pagination.cs | 8 ++++----
.../HandyControl_Shared/Controls/Other/RadioGroup.cs | 2 +-
.../Controls/Slider/RangeSlider/RangeTrack.cs | 2 +-
.../HandyControl_Shared/Controls/StepBar/StepBar.cs | 4 ++--
.../Controls/Time/Clock/ListClock.cs | 2 +-
.../HandyControl_Shared/Controls/Window/Window.cs | 1 -
.../HandyControl_Shared/Data/Gif/GifImageInfo.cs | 2 +-
.../Expression/Drawing/CommonExtensions.cs | 4 ++--
.../Expression/Shapes/PrimitiveShape.cs | 3 ++-
.../HandyControl_Shared/Tools/GifImageAnimator.cs | 2 +-
.../Tools/GithubGravatarGenerator.cs | 12 ++++++------
.../Tools/Helper/ArithmeticHelper.cs | 4 ++--
.../HandyControl_Shared/Tools/Helper/IconHelper.cs | 2 +-
.../HandyControl_Shared/Tools/Helper/VisualHelper.cs | 2 +-
23 files changed, 39 insertions(+), 36 deletions(-)
diff --git a/src/Core_30/HandyControl_Core_30/Themes/Styles/Window.xaml b/src/Core_30/HandyControl_Core_30/Themes/Styles/Window.xaml
index 042c245e..7e5ec4c3 100644
--- a/src/Core_30/HandyControl_Core_30/Themes/Styles/Window.xaml
+++ b/src/Core_30/HandyControl_Core_30/Themes/Styles/Window.xaml
@@ -84,7 +84,7 @@
-
+
@@ -110,6 +110,7 @@
+
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/Window.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/Window.xaml
index 14fcb0ae..a49c4a49 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/Window.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/Window.xaml
@@ -84,7 +84,7 @@
-
+
@@ -110,6 +110,7 @@
+
diff --git a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Window.xaml b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Window.xaml
index 042c245e..7e5ec4c3 100644
--- a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Window.xaml
+++ b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Window.xaml
@@ -84,7 +84,7 @@
-
+
@@ -110,6 +110,7 @@
+
diff --git a/src/Shared/HandyControlDemo_Shared/Service/DataService.cs b/src/Shared/HandyControlDemo_Shared/Service/DataService.cs
index d48350b2..2e2cb04c 100644
--- a/src/Shared/HandyControlDemo_Shared/Service/DataService.cs
+++ b/src/Shared/HandyControlDemo_Shared/Service/DataService.cs
@@ -19,7 +19,7 @@ namespace HandyControlDemo.Service
for (var i = 1; i <= 20; i++)
{
var dataList = new List();
- for (int j = 0; j < 3; j++)
+ for (var j = 0; j < 3; j++)
{
dataList.Add(new DemoDataModel
{
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/DataGridAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/DataGridAttach.cs
index 42348946..12a0e725 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/DataGridAttach.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/DataGridAttach.cs
@@ -246,7 +246,7 @@ namespace HandyControl.Controls
{
if (show)
{
- for (int i = 0; i < itemsCount; i++)
+ for (var i = 0; i < itemsCount; i++)
{
var row = (DataGridRow)generator.ContainerFromIndex(i);
if (row != null)
@@ -257,7 +257,7 @@ namespace HandyControl.Controls
}
else
{
- for (int i = 0; i < itemsCount; i++)
+ for (var i = 0; i < itemsCount; i++)
{
var row = (DataGridRow)generator.ContainerFromIndex(i);
if (row != null)
diff --git a/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs b/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs
index 8f9cf4b8..04754ddd 100644
--- a/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs
+++ b/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs
@@ -333,7 +333,7 @@ namespace HandyControl.Controls
}
var list = new List();
- for (int i = 0; i < 2; i++)
+ for (var i = 0; i < 2; i++)
{
list.Add(false);
}
diff --git a/src/Shared/HandyControl_Shared/Controls/Image/GifImage.cs b/src/Shared/HandyControl_Shared/Controls/Image/GifImage.cs
index 9c7a91de..98557f94 100644
--- a/src/Shared/HandyControl_Shared/Controls/Image/GifImage.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Image/GifImage.cs
@@ -321,7 +321,7 @@ namespace HandyControl.Controls
try
{
- for (int i = 0; i < count; i++)
+ for (var i = 0; i < count; i++)
{
guids[i] = (Guid)ExternDllHelper.PtrToStructure((IntPtr)((long)buffer + size * i), typeof(Guid));
}
diff --git a/src/Shared/HandyControl_Shared/Controls/Loading/LoadingBase.cs b/src/Shared/HandyControl_Shared/Controls/Loading/LoadingBase.cs
index 07d9acf2..f0c8c906 100644
--- a/src/Shared/HandyControl_Shared/Controls/Loading/LoadingBase.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Loading/LoadingBase.cs
@@ -36,11 +36,11 @@ namespace HandyControl.Controls
public static readonly DependencyProperty DotCountProperty = DependencyProperty.Register(
"DotCount", typeof(int), typeof(LoadingBase),
- new FrameworkPropertyMetadata(5, FrameworkPropertyMetadataOptions.AffectsRender));
+ new FrameworkPropertyMetadata(ValueBoxes.Int5Box, FrameworkPropertyMetadataOptions.AffectsRender));
public static readonly DependencyProperty DotIntervalProperty = DependencyProperty.Register(
"DotInterval", typeof(double), typeof(LoadingBase),
- new FrameworkPropertyMetadata(10.0, FrameworkPropertyMetadataOptions.AffectsRender));
+ new FrameworkPropertyMetadata(ValueBoxes.Double10Box, FrameworkPropertyMetadataOptions.AffectsRender));
public static readonly DependencyProperty DotBorderBrushProperty = DependencyProperty.Register(
"DotBorderBrush", typeof(Brush), typeof(LoadingBase),
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/AnimationPath.cs b/src/Shared/HandyControl_Shared/Controls/Other/AnimationPath.cs
index e9e4a87e..be6feef0 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/AnimationPath.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/AnimationPath.cs
@@ -122,7 +122,7 @@ namespace HandyControl.Controls
StretchProperty.AddOwner(typeof(AnimationPath), new FrameworkPropertyMetadata(Stretch.Uniform,
OnPropertiesChanged));
- StrokeThicknessProperty.AddOwner(typeof(AnimationPath), new FrameworkPropertyMetadata(1.0,
+ StrokeThicknessProperty.AddOwner(typeof(AnimationPath), new FrameworkPropertyMetadata(ValueBoxes.Double1Box,
OnPropertiesChanged));
}
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs b/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs
index 1f774884..bc72ea0f 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs
@@ -82,7 +82,7 @@ namespace HandyControl.Controls
/// 最大页数
///
public static readonly DependencyProperty MaxPageCountProperty = DependencyProperty.Register(
- "MaxPageCount", typeof(int), typeof(Pagination), new PropertyMetadata(1, (o, args) =>
+ "MaxPageCount", typeof(int), typeof(Pagination), new PropertyMetadata(ValueBoxes.Int1Box, (o, args) =>
{
if (o is Pagination pagination && args.NewValue is int value)
{
@@ -156,7 +156,7 @@ namespace HandyControl.Controls
/// 当前页
///
public static readonly DependencyProperty PageIndexProperty = DependencyProperty.Register(
- "PageIndex", typeof(int), typeof(Pagination), new PropertyMetadata(1, (o, args) =>
+ "PageIndex", typeof(int), typeof(Pagination), new PropertyMetadata(ValueBoxes.Int1Box, (o, args) =>
{
if (o is Pagination pagination && args.NewValue is int value)
{
@@ -312,7 +312,7 @@ namespace HandyControl.Controls
}
var sub = PageIndex;
- for (int i = 0; i < MaxPageInterval - 1; i++)
+ for (var i = 0; i < MaxPageInterval - 1; i++)
{
if (--sub > 1)
{
@@ -324,7 +324,7 @@ namespace HandyControl.Controls
}
}
var add = PageIndex;
- for (int i = 0; i < MaxPageInterval - 1; i++)
+ for (var i = 0; i < MaxPageInterval - 1; i++)
{
if (++add < MaxPageCount)
{
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/RadioGroup.cs b/src/Shared/HandyControl_Shared/Controls/Other/RadioGroup.cs
index 97b9bc38..86a22690 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/RadioGroup.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/RadioGroup.cs
@@ -33,7 +33,7 @@ namespace HandyControl.Controls
base.OnVisualChildrenChanged(visualAdded, visualRemoved);
var count = Items.Count;
- for (int i = 0; i < count; i++)
+ for (var i = 0; i < count; i++)
{
var item = (RadioButton)Items[i];
item.Style = ItemStyleSelector?.SelectStyle(item, this);
diff --git a/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeTrack.cs b/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeTrack.cs
index 99e4dfad..678ba24f 100644
--- a/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeTrack.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeTrack.cs
@@ -353,7 +353,7 @@ namespace HandyControl.Controls
{
if (_visualChildren == null) return 0;
- for (int i = 0; i < _visualChildren.Length; i++)
+ for (var i = 0; i < _visualChildren.Length; i++)
{
if (_visualChildren[i] == null) return i;
}
diff --git a/src/Shared/HandyControl_Shared/Controls/StepBar/StepBar.cs b/src/Shared/HandyControl_Shared/Controls/StepBar/StepBar.cs
index d14056f4..4a085542 100644
--- a/src/Shared/HandyControl_Shared/Controls/StepBar/StepBar.cs
+++ b/src/Shared/HandyControl_Shared/Controls/StepBar/StepBar.cs
@@ -38,7 +38,7 @@ namespace HandyControl.Controls
var count = Items.Count;
if (count <= 0) return;
- for (int i = 0; i < count; i++)
+ for (var i = 0; i < count; i++)
{
if (ItemContainerGenerator.ContainerFromIndex(i) is StepBarItem stepBarItem)
{
@@ -48,7 +48,7 @@ namespace HandyControl.Controls
if (StepIndex < count)
{
- for (int i = 0; i < StepIndex; i++)
+ for (var i = 0; i < StepIndex; i++)
{
if (ItemContainerGenerator.ContainerFromIndex(i) is StepBarItem stepBarItem)
{
diff --git a/src/Shared/HandyControl_Shared/Controls/Time/Clock/ListClock.cs b/src/Shared/HandyControl_Shared/Controls/Time/Clock/ListClock.cs
index 80376a1d..dc739dda 100644
--- a/src/Shared/HandyControl_Shared/Controls/Time/Clock/ListClock.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Time/Clock/ListClock.cs
@@ -102,7 +102,7 @@ namespace HandyControl.Controls
private void CreateItemsSource(ItemsControl selector, int count)
{
var list = new List();
- for (int i = 0; i < count; i++)
+ for (var i = 0; i < count; i++)
{
list.Add(i.ToString("#00"));
}
diff --git a/src/Shared/HandyControl_Shared/Controls/Window/Window.cs b/src/Shared/HandyControl_Shared/Controls/Window/Window.cs
index 4da6e868..8e19d481 100644
--- a/src/Shared/HandyControl_Shared/Controls/Window/Window.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Window/Window.cs
@@ -9,7 +9,6 @@ using HandyControl.Tools.Extension;
using Microsoft.Windows.Shell;
#else
using System.Windows.Shell;
-
#endif
namespace HandyControl.Controls
diff --git a/src/Shared/HandyControl_Shared/Data/Gif/GifImageInfo.cs b/src/Shared/HandyControl_Shared/Data/Gif/GifImageInfo.cs
index 2a1aedb3..3da1c3b8 100644
--- a/src/Shared/HandyControl_Shared/Data/Gif/GifImageInfo.cs
+++ b/src/Shared/HandyControl_Shared/Data/Gif/GifImageInfo.cs
@@ -66,7 +66,7 @@ namespace HandyControl.Data
//
var values = frameDelayItem.Value;
_frameDelay = new int[FrameCount];
- for (int i = 0; i < FrameCount; ++i)
+ for (var i = 0; i < FrameCount; ++i)
{
_frameDelay[i] = values[i * 4] + 256 * values[i * 4 + 1] + 256 * 256 * values[i * 4 + 2] + 256 * 256 * 256 * values[i * 4 + 3];
}
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/CommonExtensions.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/CommonExtensions.cs
index a3e22a5a..8abc90c0 100644
--- a/src/Shared/HandyControl_Shared/Expression/Drawing/CommonExtensions.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Drawing/CommonExtensions.cs
@@ -59,7 +59,7 @@ namespace HandyControl.Expression.Drawing
}
else
{
- for (int i = list.Count - 1; i >= count; i--)
+ for (var i = list.Count - 1; i >= count; i--)
{
list.RemoveAt(i);
}
@@ -89,7 +89,7 @@ namespace HandyControl.Expression.Drawing
}
else
{
- for (int i = list.Count; i < count; i++)
+ for (var i = list.Count; i < count; i++)
{
list.Add((factory == null) ? default(T) : factory());
}
diff --git a/src/Shared/HandyControl_Shared/Expression/Shapes/PrimitiveShape.cs b/src/Shared/HandyControl_Shared/Expression/Shapes/PrimitiveShape.cs
index fd217485..716f48e3 100644
--- a/src/Shared/HandyControl_Shared/Expression/Shapes/PrimitiveShape.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Shapes/PrimitiveShape.cs
@@ -2,6 +2,7 @@
using System.Windows;
using System.Windows.Media;
using System.Windows.Shapes;
+using HandyControl.Data;
using HandyControl.Expression.Drawing;
using HandyControl.Expression.Media;
@@ -16,7 +17,7 @@ namespace HandyControl.Expression.Shapes
StretchProperty.OverrideMetadata(typeof(PrimitiveShape),
new DrawingPropertyMetadata(Stretch.Fill, DrawingPropertyMetadataOptions.AffectsRender));
StrokeThicknessProperty.OverrideMetadata(typeof(PrimitiveShape),
- new DrawingPropertyMetadata(1.0, DrawingPropertyMetadataOptions.AffectsRender));
+ new DrawingPropertyMetadata(ValueBoxes.Double1Box, DrawingPropertyMetadataOptions.AffectsRender));
}
protected sealed override Geometry DefiningGeometry =>
diff --git a/src/Shared/HandyControl_Shared/Tools/GifImageAnimator.cs b/src/Shared/HandyControl_Shared/Tools/GifImageAnimator.cs
index 84586d8c..2c6a58b3 100644
--- a/src/Shared/HandyControl_Shared/Tools/GifImageAnimator.cs
+++ b/src/Shared/HandyControl_Shared/Tools/GifImageAnimator.cs
@@ -162,7 +162,7 @@ namespace HandyControl.Tools
try
{
// Find the corresponding reference and remove it
- for (int i = 0; i < ImageInfoList.Count; i++)
+ for (var i = 0; i < ImageInfoList.Count; i++)
{
var imageInfo = ImageInfoList[i];
diff --git a/src/Shared/HandyControl_Shared/Tools/GithubGravatarGenerator.cs b/src/Shared/HandyControl_Shared/Tools/GithubGravatarGenerator.cs
index 30d0808c..7fe3d3e0 100644
--- a/src/Shared/HandyControl_Shared/Tools/GithubGravatarGenerator.cs
+++ b/src/Shared/HandyControl_Shared/Tools/GithubGravatarGenerator.cs
@@ -27,23 +27,23 @@ namespace HandyControl.Tools
}
var index = 0;
- for (int i = 0; i < 2; i++)
+ for (var i = 0; i < 2; i++)
{
- for (int j = 0; j < 5; j++, index++)
+ for (var j = 0; j < 5; j++, index++)
{
AddRec(i, j, renderData[index] == 0);
}
}
- for (int j = 0; j < 5; j++, index++)
+ for (var j = 0; j < 5; j++, index++)
{
AddRec(2, j, renderData[index] == 0);
}
index -= 10;
- for (int i = 3; i < 5; i++)
+ for (var i = 3; i < 5; i++)
{
- for (int j = 0; j < 5; j++, index++)
+ for (var j = 0; j < 5; j++, index++)
{
AddRec(i, j, renderData[index] == 0);
}
@@ -78,7 +78,7 @@ namespace HandyControl.Tools
private int[] GetRenderData(string hashcode)
{
var arr = new int[RenderDataMaxLength];
- for (int i = 0; i < RenderDataMaxLength; i++)
+ for (var i = 0; i < RenderDataMaxLength; i++)
{
var c = hashcode[i];
var v = (int) c;
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/ArithmeticHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/ArithmeticHelper.cs
index 6dffd905..4725b812 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/ArithmeticHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/ArithmeticHelper.cs
@@ -22,11 +22,11 @@ namespace HandyControl.Tools
var arr = new int[count];
var div = num / count;
var rest = num % count;
- for (int i = 0; i < count; i++)
+ for (var i = 0; i < count; i++)
{
arr[i] = div;
}
- for (int i = 0; i < rest; i++)
+ for (var i = 0; i < rest; i++)
{
arr[i] += 1;
}
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/IconHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/IconHelper.cs
index afecc130..225302dd 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/IconHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/IconHelper.cs
@@ -197,7 +197,7 @@ namespace HandyControl.Tools
var isBitmapIconDecoder = frames[0].Decoder is IconBitmapDecoder;
- for (int i = 0; i < frames.Count && bestScore != 0; ++i)
+ for (var i = 0; i < frames.Count && bestScore != 0; ++i)
{
var currentIconBitDepth = isBitmapIconDecoder ? frames[i].Thumbnail.Format.BitsPerPixel : frames[i].Format.BitsPerPixel;
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/VisualHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/VisualHelper.cs
index 363478e0..4600f471 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/VisualHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/VisualHelper.cs
@@ -34,7 +34,7 @@ namespace HandyControl.Tools
return t;
}
- for (int i = 0; i < VisualTreeHelper.GetChildrenCount(d); i++)
+ for (var i = 0; i < VisualTreeHelper.GetChildrenCount(d); i++)
{
var child = VisualTreeHelper.GetChild(d, i);