From 82c6509c7ad028b045705b04180cb40440e6ece4 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Fri, 12 Oct 2018 20:03:59 +0800
Subject: [PATCH] refactor ImageBrowser, add NumericUpDown, delete info
controls
---
HandyControl/Controls/Info/InfoControl.cs | 374 ------------------
.../Controls/Info/InfoNumericUpDown.xaml | 66 ----
.../Controls/Info/InfoNumericUpDown.xaml.cs | 181 ---------
HandyControl/Controls/Info/InfoTextBox.xaml | 62 ---
.../Controls/Info/InfoTextBox.xaml.cs | 45 ---
HandyControl/Controls/NumericUpDown.cs | 257 ++++++++++++
HandyControl/Controls/Picker/ColorPicker.xaml | 25 +-
.../Controls/Picker/ColorPicker.xaml.cs | 5 +-
HandyControl/Controls/TimeBar/TimeBar.cs | 3 +-
.../{ImageBrowser.xaml.cs => ImageBrowser.cs} | 241 +++++++----
.../Controls/Window/ImageBrowser.xaml | 81 ----
HandyControl/HandyControl.csproj | 35 +-
HandyControl/Interactivity/ControlCommands.cs | 37 +-
HandyControl/Properties/AssemblyInfo.cs | 4 +-
HandyControl/Resources/colorPickerBack.png | Bin 34435 -> 0 bytes
.../Themes/Styles/Base/ComboBoxBaseStyle.xaml | 1 -
.../Styles/Base/DatePickerBaseStyle.xaml | 1 -
.../Styles/Base/NumericUpDownBaseStyle.xaml | 60 +++
.../Styles/Base/PasswordBoxBaseStyle.xaml | 1 -
.../Themes/Styles/Base/TextBoxBaseStyle.xaml | 1 -
.../Styles/Base/TimePickerBaseStyle.xaml | 1 -
.../Styles/Base/ToggleButtonBaseStyle.xaml | 3 -
HandyControl/Themes/Styles/Border.xaml | 4 +-
HandyControl/Themes/Styles/Button.xaml | 4 +-
HandyControl/Themes/Styles/NumericUpDown.xaml | 13 +
HandyControl/Themes/Styles/Style.xaml | 1 +
HandyControl/Themes/Styles/Window.xaml | 79 ++++
HandyControlDemo/Data/MessageToken.cs | 2 +
HandyControlDemo/Data/MessageToken.tt | 3 +-
HandyControlDemo/HandyControlDemo.csproj | 7 +
HandyControlDemo/Properties/AssemblyInfo.cs | 4 +-
.../Properties/Langs/Lang.Designer.cs | 9 +
.../Properties/Langs/Lang.en.resx | 3 +
HandyControlDemo/Properties/Langs/Lang.resx | 3 +
.../Controls/NumericUpDownDemoCtl.xaml | 11 +
.../Controls/NumericUpDownDemoCtl.xaml.cs | 11 +
.../UserControl/Main/LeftMainContent.xaml | 39 +-
37 files changed, 712 insertions(+), 965 deletions(-)
delete mode 100644 HandyControl/Controls/Info/InfoControl.cs
delete mode 100644 HandyControl/Controls/Info/InfoNumericUpDown.xaml
delete mode 100644 HandyControl/Controls/Info/InfoNumericUpDown.xaml.cs
delete mode 100644 HandyControl/Controls/Info/InfoTextBox.xaml
delete mode 100644 HandyControl/Controls/Info/InfoTextBox.xaml.cs
create mode 100644 HandyControl/Controls/NumericUpDown.cs
rename HandyControl/Controls/Window/{ImageBrowser.xaml.cs => ImageBrowser.cs} (73%)
delete mode 100644 HandyControl/Controls/Window/ImageBrowser.xaml
delete mode 100644 HandyControl/Resources/colorPickerBack.png
create mode 100644 HandyControl/Themes/Styles/Base/NumericUpDownBaseStyle.xaml
create mode 100644 HandyControl/Themes/Styles/NumericUpDown.xaml
create mode 100644 HandyControlDemo/UserControl/Controls/NumericUpDownDemoCtl.xaml
create mode 100644 HandyControlDemo/UserControl/Controls/NumericUpDownDemoCtl.xaml.cs
diff --git a/HandyControl/Controls/Info/InfoControl.cs b/HandyControl/Controls/Info/InfoControl.cs
deleted file mode 100644
index 2b7eace3..00000000
--- a/HandyControl/Controls/Info/InfoControl.cs
+++ /dev/null
@@ -1,374 +0,0 @@
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Input;
-using System.Windows.Media.Animation;
-using HandyControl.Data.Enum;
-using HandyControl.Tools;
-using HandyControl.Tools.Converter;
-using HandyControl.Tools.Extension;
-
-// ReSharper disable once CheckNamespace
-namespace HandyControl.Controls
-{
- internal abstract class InfoControl : UserControl
- {
- private bool _isFocused;
-
- protected TextBlock ErrorTextBlock;
-
- protected TextBox ContentTextBox;
-
- protected StackPanel TitleStackPanel;
-
- ///
- /// 标题
- ///
- public static readonly DependencyProperty TitleProperty = DependencyProperty.Register(
- "Title", typeof(string), typeof(InfoControl), new PropertyMetadata(default(string)));
-
- ///
- /// 标题
- ///
- public string Title
- {
- get => (string)GetValue(TitleProperty);
- set => SetValue(TitleProperty, value);
- }
-
- ///
- /// 文本
- ///
- public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
- "Text", typeof(string), typeof(InfoControl), new FrameworkPropertyMetadata(default(string), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault));
-
- ///
- /// 文本
- ///
- public string Text
- {
- get => (string)GetValue(TextProperty);
- set => SetValue(TextProperty, value);
- }
-
- ///
- /// 是否为必填项
- ///
- public static readonly DependencyProperty IsNeedlyProperty = DependencyProperty.Register(
- "IsNeedly", typeof(bool), typeof(InfoControl), new PropertyMetadata(true));
-
- ///
- /// 是否为必填项
- ///
- public bool IsNeedly
- {
- get => (bool)GetValue(IsNeedlyProperty);
- set => SetValue(IsNeedlyProperty, value);
- }
-
- ///
- /// 占位符
- ///
- public static readonly DependencyProperty PlaceHolderProperty = DependencyProperty.Register(
- "PlaceHolder", typeof(string), typeof(InfoControl), new PropertyMetadata(default(string)));
-
- ///
- /// 占位符
- ///
- public string PlaceHolder
- {
- get => (string)GetValue(PlaceHolderProperty);
- set => SetValue(PlaceHolderProperty, value);
- }
-
- ///
- /// 错误信息
- ///
- public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register(
- "ErrorStr", typeof(string), typeof(InfoControl), new PropertyMetadata(default(string)));
-
- ///
- /// 错误信息
- ///
- public string ErrorStr
- {
- get => (string)GetValue(ErrorStrProperty);
- set => SetValue(ErrorStrProperty, value);
- }
-
- ///
- /// 控件是否包含错误
- ///
- public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register(
- "IsError", typeof(bool), typeof(InfoControl), new PropertyMetadata(default(bool)));
-
- ///
- /// 控件是否包含错误
- ///
- public bool IsError
- {
- get => (bool)GetValue(IsErrorProperty);
- set => SetValue(IsErrorProperty, value);
- }
-
- ///
- /// 标题宽度
- ///
- public static readonly DependencyProperty TitleWidthProperty = DependencyProperty.RegisterAttached(
- "TitleWidth", typeof(GridLength), typeof(InfoControl),
- new FrameworkPropertyMetadata(GridLength.Auto, FrameworkPropertyMetadataOptions.Inherits));
-
- ///
- /// 设置标题宽度
- ///
- public static void SetTitleWidth(DependencyObject element, GridLength value)
- {
- element.SetValue(TitleWidthProperty, value);
- }
-
- ///
- /// 标题宽度
- ///
- public static GridLength GetTitleWidth(DependencyObject element)
- {
- return (GridLength)element.GetValue(TitleWidthProperty);
- }
-
- ///
- /// 标题宽度
- ///
- public GridLength TitleWidth
- {
- get => (GridLength)GetValue(TitleWidthProperty);
- set => SetValue(TitleWidthProperty, value);
- }
-
- ///
- /// 标题对齐方式
- ///
- public static readonly DependencyProperty TitleAlignmentProperty = DependencyProperty.Register(
- "TitleAlignment", typeof(TitleAlignment), typeof(InfoControl), new PropertyMetadata(TitleAlignment.Left,
- (o, args) =>
- {
- var ctl = (InfoControl)o;
- var v = (TitleAlignment)args.NewValue;
- if (v == TitleAlignment.Left)
- {
- Grid.SetColumn(ctl.TitleStackPanel, 0);
- Grid.SetRow(ctl.TitleStackPanel, 1);
- ctl.HorizontalAlignment = HorizontalAlignment.Right;
- ctl.Height = ctl.MaxHeight;
- }
- else
- {
- Grid.SetColumn(ctl.TitleStackPanel, 1);
- Grid.SetRow(ctl.TitleStackPanel, 0);
- ctl.TitleStackPanel.HorizontalAlignment = HorizontalAlignment.Left;
- ctl.TitleStackPanel.Margin = new Thickness(4, 0, 0, 4);
- ctl.Height += 18;
- }
- }));
-
- ///
- /// 标题对齐方式
- ///
- public TitleAlignment TitleAlignment
- {
- get => (TitleAlignment)GetValue(TitleAlignmentProperty);
- set => SetValue(TitleAlignmentProperty, value);
- }
-
- ///
- /// 文本的水平对齐方式
- ///
- public static readonly DependencyProperty HorizontalTextAlignmentProperty = DependencyProperty.Register(
- "HorizontalTextAlignment", typeof(HorizontalAlignment), typeof(InfoControl), new PropertyMetadata(HorizontalAlignment.Left));
-
- ///
- /// 文本的水平对齐方式
- ///
- public HorizontalAlignment HorizontalTextAlignment
- {
- get => (HorizontalAlignment)GetValue(HorizontalTextAlignmentProperty);
- set => SetValue(HorizontalTextAlignmentProperty, value);
- }
-
- ///
- /// 是否显示清除按钮
- ///
- public static readonly DependencyProperty ShowClearButtonProperty = DependencyProperty.Register(
- "ShowClearButton", typeof(bool), typeof(InfoControl), new PropertyMetadata(true, (o, args) =>
- {
- var ctl = (InfoControl)o;
- var v = (bool)args.NewValue;
- if (!(ctl.FindName("ButtonClear") is Button button)) return;
- BindingOperations.ClearBinding(button, VisibilityProperty);
- button.IsEnabled = v;
- if (v)
- {
- button.SetBinding(VisibilityProperty, new Binding("Text")
- {
- Source = ctl,
- Converter = new String2VisibilityConverter()
- });
- }
- else
- {
- button.Collapse();
- }
- }));
-
- ///
- /// 是否显示清除按钮
- ///
- public bool ShowClearButton
- {
- get => (bool)GetValue(ShowClearButtonProperty);
- set => SetValue(ShowClearButtonProperty, value);
- }
-
- ///
- /// 是否显示小圆角
- ///
- public static readonly DependencyProperty ShowSmallCornerRadiusProperty = DependencyProperty.Register(
- "ShowSmallCornerRadius", typeof(bool), typeof(InfoControl), new PropertyMetadata(default(bool), (o, args) =>
- {
- var ctl = (InfoControl)o;
- var v = (bool)args.NewValue;
- ctl.CornerRadius = v ? new CornerRadius(2, 2, 2, 2) : new CornerRadius(4, 4, 4, 4);
- }));
-
- ///
- /// 是否显示小圆角
- ///
- public bool ShowSmallCornerRadius
- {
- get => (bool)GetValue(ShowSmallCornerRadiusProperty);
- set => SetValue(ShowSmallCornerRadiusProperty, value);
- }
-
- ///
- /// 圆角
- ///
- protected static readonly DependencyProperty CornerRadiusProperty = DependencyProperty.Register(
- "CornerRadius", typeof(CornerRadius), typeof(InfoControl), new PropertyMetadata(new CornerRadius(4, 4, 4, 4)));
-
- ///
- /// 圆角
- ///
- protected CornerRadius CornerRadius
- {
- get => (CornerRadius)GetValue(CornerRadiusProperty);
- set => SetValue(CornerRadiusProperty, value);
- }
-
- ///
- /// 文本内边距
- ///
- public static readonly DependencyProperty TextPaddingProperty = DependencyProperty.Register(
- "TextPadding", typeof(Thickness), typeof(InfoControl), new PropertyMetadata(new Thickness(6, 0, 0, 0)));
-
- ///
- /// 文本内边距
- ///
- public Thickness TextPadding
- {
- get => (Thickness)GetValue(TextPaddingProperty);
- set => SetValue(TextPaddingProperty, value);
- }
-
- ///
- /// 更新状态
- ///
- public virtual void Update()
- {
- if (!IsError)
- {
- if (!_isFocused)
- {
- (TryFindResource("Storyboard2") as Storyboard)?.Begin();
- }
- else
- {
- (TryFindResource("Storyboard3") as Storyboard)?.Begin();
- }
- ErrorTextBlock.BeginAnimation(MarginProperty, AnimationHelper.CreateAnimation(new Thickness(4, 0, 0, 1)));
- return;
- }
- (TryFindResource("Storyboard4") as Storyboard)?.Begin();
- ErrorTextBlock.BeginAnimation(MarginProperty, AnimationHelper.CreateAnimation(new Thickness(4, 0, 0, -ErrorTextBlock.ActualHeight - 2)));
- }
-
- protected virtual void InputBox_OnLostFocus(object sender, RoutedEventArgs e)
- {
- _isFocused = false;
- CheckInfo();
- }
-
- protected virtual void InputBox_OnGotFocus(object sender, RoutedEventArgs e)
- {
- _isFocused = true;
- if (!IsError)
- {
- (TryFindResource("Storyboard3") as Storyboard)?.Begin();
- }
- }
-
- protected virtual void InputBox_OnMouseEnter(object sender, MouseEventArgs e)
- {
- if (!IsError && !ContentTextBox.IsFocused)
- {
- (TryFindResource("Storyboard1") as Storyboard)?.Begin();
- }
- }
-
- protected virtual void InputBox_OnMouseLeave(object sender, MouseEventArgs e)
- {
- if (!IsError && !ContentTextBox.IsFocused)
- {
- (TryFindResource("Storyboard2") as Storyboard)?.Begin();
- }
- }
-
- protected virtual void InputBox_OnTextChanged(object sender, TextChangedEventArgs e) => CheckInfo();
-
- protected virtual void ButtonClear_OnClick(object sender, RoutedEventArgs e) => Text = string.Empty;
-
- ///
- /// 文本类型
- ///
- public TextType TextType { get; set; }
-
- ///
- /// 正则字符串（当文本类型为Common时，此属性才生效）
- ///
- public string RegularStr { get; set; }
-
- ///
- /// 用于监测数据的正确性
- ///
- ///
- public virtual bool CheckInfo()
- {
- bool result;
- if (TextType == TextType.Common)
- {
- if (string.IsNullOrEmpty(RegularStr))
- {
- result = !IsNeedly || !string.IsNullOrEmpty(Text);
- }
- else
- {
- result = Text.IsKindOf(RegularStr);
- }
- }
- else
- {
- result = Text.IsKindOf(TextType);
- }
- IsError = !result;
- Update();
- return result;
- }
- }
-}
\ No newline at end of file
diff --git a/HandyControl/Controls/Info/InfoNumericUpDown.xaml b/HandyControl/Controls/Info/InfoNumericUpDown.xaml
deleted file mode 100644
index 65c786c3..00000000
--- a/HandyControl/Controls/Info/InfoNumericUpDown.xaml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/HandyControl/Controls/Info/InfoNumericUpDown.xaml.cs b/HandyControl/Controls/Info/InfoNumericUpDown.xaml.cs
deleted file mode 100644
index de4606f6..00000000
--- a/HandyControl/Controls/Info/InfoNumericUpDown.xaml.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-using System;
-using System.Windows;
-using System.Windows.Input;
-using System.Windows.Media.Animation;
-using HandyControl.Data;
-using HandyControl.Tools;
-
-// ReSharper disable once CheckNamespace
-namespace HandyControl.Controls
-{
- ///
- /// InfoNumericUpDown.xaml 的交互逻辑
- ///
- internal partial class InfoNumericUpDown
- {
- public InfoNumericUpDown()
- {
- InitializeComponent();
-
- ErrorTextBlock = TextBlockError;
- ContentTextBox = MyTextBox;
- TitleStackPanel = StackPanelTitle;
-
- (TryFindResource("Storyboard2") as Storyboard)?.Begin();
-
- Loaded += (s, e) =>
- {
- StackPanelTitle.Focusable = true;
- StackPanelTitle.Focus();
- StackPanelTitle.Focusable = false;
- };
- }
-
- ///
- /// 最大值
- ///
- public static readonly DependencyProperty MaximumProperty = DependencyProperty.Register(
- "Maximum", typeof(double), typeof(InfoNumericUpDown), new PropertyMetadata(100.0, (o, args) =>
- {
- o.CoerceValue(MinimumProperty);
- o.CoerceValue(ValueProperty);
- }, (o, value) =>
- {
- var info = (InfoNumericUpDown)o;
- var max = (double)value;
- if (max < info.Minimum) max = info.Minimum;
- return max;
- }), ValidateHelper.IsInRangeOfDouble);
-
- ///
- /// 最大值
- ///
- public double Maximum
- {
- get => (double)GetValue(MaximumProperty);
- set => SetValue(MaximumProperty, value);
- }
-
- ///
- /// 最小值
- ///
- public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register(
- "Minimum", typeof(double), typeof(InfoNumericUpDown), new PropertyMetadata(0.0, (o, args) =>
- {
- o.CoerceValue(MaximumProperty);
- o.CoerceValue(ValueProperty);
- }, (o, value) =>
- {
- var info = (InfoNumericUpDown)o;
- var min = (double)value;
- if (min > info.Maximum) min = info.Maximum;
- return min;
- }), ValidateHelper.IsInRangeOfDouble);
-
- ///
- /// 最小值
- ///
- public double Minimum
- {
- get => (double)GetValue(MinimumProperty);
- set => SetValue(MinimumProperty, value);
- }
-
- ///
- /// 当前值
- ///
- public static readonly DependencyProperty ValueProperty = DependencyProperty.Register(
- "Value", typeof(double), typeof(InfoNumericUpDown), new PropertyMetadata(1.0, (o, args) =>
- {
- o.CoerceValue(MinimumProperty);
- o.CoerceValue(MaximumProperty);
- var ctl = (InfoNumericUpDown)o;
- ctl.RaiseEvent(new FunctionEventArgs(ValueChangedEvent, ctl)
- {
- Info = (double)args.NewValue
- });
- }, (o, value) =>
- {
- var info = (InfoNumericUpDown)o;
- var current = (double)value;
-
- if (current < info.Minimum) current = info.Minimum;
- if (current > info.Maximum) current = info.Maximum;
-
- return current;
- }), ValidateHelper.IsInRangeOfDouble);
-
- ///
- /// 当前值
- ///
- public double Value
- {
- get => (double)GetValue(ValueProperty);
- set => SetValue(ValueProperty, value);
- }
-
- ///
- /// 最小改变值
- ///
- public static readonly DependencyProperty SmallChangeProperty = DependencyProperty.Register(
- "SmallChange", typeof(double), typeof(InfoNumericUpDown), new PropertyMetadata(1.0), ValidateHelper.IsInRangeOfDouble);
-
- ///
- /// 最小改变值
- ///
- public double SmallChange
- {
- get => (double)GetValue(SmallChangeProperty);
- set => SetValue(SmallChangeProperty, value);
- }
-
- ///
- /// 是否显示上下调整按钮
- ///
- public static readonly DependencyProperty ShowUpDownButtonProperty = DependencyProperty.Register(
- "ShowUpDownButton", typeof(bool), typeof(InfoNumericUpDown), new PropertyMetadata(true));
-
- ///
- /// 是否显示上下调整按钮
- ///
- public bool ShowUpDownButton
- {
- get => (bool)GetValue(ShowUpDownButtonProperty);
- set => SetValue(ShowUpDownButtonProperty, value);
- }
-
- ///
- /// 值改变事件
- ///
- public static readonly RoutedEvent ValueChangedEvent =
- EventManager.RegisterRoutedEvent("ValueChanged", RoutingStrategy.Bubble,
- typeof(EventHandler>), typeof(InfoNumericUpDown));
-
- ///
- /// 值改变事件
- ///
- public event EventHandler> ValueChanged
- {
- add => AddHandler(ValueChangedEvent, value);
- remove => RemoveHandler(ValueChangedEvent, value);
- }
-
- private void ButtonUp_OnClick(object sender, RoutedEventArgs e) => Value += SmallChange;
-
- private void ButtonDown_OnClick(object sender, RoutedEventArgs e) => Value -= SmallChange;
-
- private void MyTextBox_OnMouseWheel(object sender, MouseWheelEventArgs e)
- {
- if (e.Delta > 0)
- {
- Value += SmallChange;
- }
- else
- {
- Value -= SmallChange;
- }
- MyTextBox.Select(MyTextBox.Text.Length, 0);
- e.Handled = true;
- }
- }
-}
\ No newline at end of file
diff --git a/HandyControl/Controls/Info/InfoTextBox.xaml b/HandyControl/Controls/Info/InfoTextBox.xaml
deleted file mode 100644
index 364e462a..00000000
--- a/HandyControl/Controls/Info/InfoTextBox.xaml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/HandyControl/Controls/Info/InfoTextBox.xaml.cs b/HandyControl/Controls/Info/InfoTextBox.xaml.cs
deleted file mode 100644
index c633d476..00000000
--- a/HandyControl/Controls/Info/InfoTextBox.xaml.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System.Windows;
-using System.Windows.Media.Animation;
-
-// ReSharper disable once CheckNamespace
-namespace HandyControl.Controls
-{
- ///
- /// InfoTextBox.xaml 的交互逻辑
- ///
- internal partial class InfoTextBox
- {
- ///
- /// 可输入的最大字符数
- ///
- public static readonly DependencyProperty MaxLengthProperty = DependencyProperty.Register(
- "MaxLength", typeof(int), typeof(InfoTextBox), new PropertyMetadata(default(int)));
-
- ///
- /// 可输入的最大字符数
- ///
- public int MaxLength
- {
- get => (int)GetValue(MaxLengthProperty);
- set => SetValue(MaxLengthProperty, value);
- }
-
- public InfoTextBox()
- {
- InitializeComponent();
-
- ErrorTextBlock = TextBlockError;
- ContentTextBox = MyTextBox;
- TitleStackPanel = StackPanelTitle;
-
- (TryFindResource("Storyboard2") as Storyboard)?.Begin();
-
- Loaded += (s, e) =>
- {
- StackPanelTitle.Focusable = true;
- StackPanelTitle.Focus();
- StackPanelTitle.Focusable = false;
- };
- }
- }
-}
\ No newline at end of file
diff --git a/HandyControl/Controls/NumericUpDown.cs b/HandyControl/Controls/NumericUpDown.cs
new file mode 100644
index 00000000..90dde33d
--- /dev/null
+++ b/HandyControl/Controls/NumericUpDown.cs
@@ -0,0 +1,257 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using HandyControl.Data;
+using HandyControl.Interactivity;
+
+namespace HandyControl.Controls
+{
+ ///
+ /// 数值选择控件
+ ///
+ [TemplatePart(Name = ElementTextBox, Type = typeof(TextBox))]
+ public class NumericUpDown : Control
+ {
+ #region Constants
+
+ private const string ElementTextBox = "PART_TextBox";
+
+ #endregion Constants
+
+ #region Data
+
+ private TextBox _textBox;
+
+ #endregion Data
+
+ public NumericUpDown()
+ {
+ CommandBindings.Add(new CommandBinding(ControlCommands.Prev, (s, e) => Value += Increment));
+ CommandBindings.Add(new CommandBinding(ControlCommands.Next, (s, e) => Value -= Increment));
+ }
+
+ protected override void OnGotFocus(RoutedEventArgs e)
+ {
+ base.OnGotFocus(e);
+
+ if (_textBox != null)
+ {
+ _textBox?.Focus();
+ _textBox.Select(_textBox.Text.Length, 0);
+ }
+ }
+
+ public override void OnApplyTemplate()
+ {
+ if (_textBox != null)
+ {
+ _textBox.PreviewTextInput -= TextBoxValue_TextInput;
+ }
+
+ base.OnApplyTemplate();
+
+ _textBox = GetTemplateChild(ElementTextBox) as TextBox;
+
+ if (_textBox != null)
+ {
+ _textBox.PreviewTextInput += TextBoxValue_TextInput;
+ _textBox.Text = Value.ToString($"#0.{new string('0', DecimalPlaces)}");
+ }
+ }
+
+ private void TextBoxValue_TextInput(object sender, TextCompositionEventArgs e)
+ {
+ if (double.TryParse(_textBox.Text, out var value))
+ {
+ Value = value;
+ }
+
+ if (_textBox != null)
+ {
+ _textBox.Text = Value.ToString($"#0.{new string('0', DecimalPlaces)}");
+ _textBox.Select(_textBox.Text.Length, 0);
+ }
+ }
+
+ protected override void OnMouseWheel(MouseWheelEventArgs e)
+ {
+ base.OnMouseWheel(e);
+
+ if (_textBox.IsFocused)
+ {
+ Value += e.Delta > 0 ? Increment : -Increment;
+ e.Handled = true;
+ }
+ }
+
+ protected virtual void OnValueChanged(FunctionEventArgs e) => RaiseEvent(e);
+
+ ///
+ /// 值改变事件
+ ///
+ public static readonly RoutedEvent ValueChangedEvent =
+ EventManager.RegisterRoutedEvent("ValueChanged", RoutingStrategy.Bubble,
+ typeof(EventHandler>), typeof(NumericUpDown));
+
+ ///
+ /// 值改变事件
+ ///
+ public event EventHandler> ValueChanged
+ {
+ add => AddHandler(ValueChangedEvent, value);
+ remove => RemoveHandler(ValueChangedEvent, value);
+ }
+
+ ///
+ /// 当前值
+ ///
+ public static readonly DependencyProperty ValueProperty = DependencyProperty.Register(
+ "Value", typeof(double), typeof(NumericUpDown), new PropertyMetadata(default(double), OnValueChanged, CoerceValue), IsValidDoubleValue);
+
+ private static void OnValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+ {
+ var ctl = (NumericUpDown) d;
+ var v = (double) e.NewValue;
+ if (ctl._textBox != null)
+ {
+ ctl._textBox.Text = v.ToString($"#0.{new string('0', ctl.DecimalPlaces)}");
+ ctl._textBox.Select(ctl._textBox.Text.Length, 0);
+ }
+ ctl.OnValueChanged(new FunctionEventArgs(ValueChangedEvent, ctl)
+ {
+ Info = v
+ });
+ }
+
+ private static object CoerceValue(DependencyObject d, object basevalue)
+ {
+ var ctl = (NumericUpDown)d;
+ var minimum = ctl.Minimum;
+ var num = (double)basevalue;
+ if (num < minimum)
+ {
+ ctl.Value = minimum;
+ return minimum;
+ }
+ var maximum = ctl.Maximum;
+ if (num > maximum)
+ {
+ ctl.Value = maximum;
+ }
+ return num > maximum ? maximum : basevalue;
+ }
+
+ ///
+ /// 当前值
+ ///
+ public double Value
+ {
+ get => (double) GetValue(ValueProperty);
+ set => SetValue(ValueProperty, value);
+ }
+
+ ///
+ /// 最大值
+ ///
+ public static readonly DependencyProperty MaximumProperty = DependencyProperty.Register(
+ "Maximum", typeof(double), typeof(NumericUpDown), new PropertyMetadata(100.0, OnMaximumChanged, CoerceMaximum), IsValidDoubleValue);
+
+ private static void OnMaximumChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+ {
+ var ctl = (NumericUpDown)d;
+ ctl.CoerceValue(MinimumProperty);
+ ctl.CoerceValue(ValueProperty);
+ }
+
+ private static object CoerceMaximum(DependencyObject d, object basevalue)
+ {
+ var minimum = ((NumericUpDown)d).Minimum;
+ return (double)basevalue < minimum ? minimum : basevalue;
+ }
+
+ ///
+ /// 最大值
+ ///
+ public double Maximum
+ {
+ get => (double) GetValue(MaximumProperty);
+ set => SetValue(MaximumProperty, value);
+ }
+
+ ///
+ /// 最小值
+ ///
+ public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register(
+ "Minimum", typeof(double), typeof(NumericUpDown), new PropertyMetadata(default(double), OnMinimumChanged, CoerceMinimum), IsValidDoubleValue);
+
+ private static void OnMinimumChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+ {
+ var ctl = (NumericUpDown)d;
+ ctl.CoerceValue(MaximumProperty);
+ ctl.CoerceValue(ValueProperty);
+ }
+
+ private static object CoerceMinimum(DependencyObject d, object basevalue)
+ {
+ var maximum = ((NumericUpDown)d).Maximum;
+ return (double)basevalue > maximum ? maximum : basevalue;
+ }
+
+ ///
+ /// 最小值
+ ///
+ public double Minimum
+ {
+ get => (double) GetValue(MinimumProperty);
+ set => SetValue(MinimumProperty, value);
+ }
+
+ private static bool IsValidDoubleValue(object value)
+ {
+ var d = (double)value;
+ if (!double.IsNaN(d))
+ return !double.IsInfinity(d);
+ return false;
+ }
+
+ ///
+ /// 指示每单击一下按钮时增加或减少的数量
+ ///
+ public static readonly DependencyProperty IncrementProperty = DependencyProperty.Register(
+ "Increment", typeof(double), typeof(NumericUpDown), new PropertyMetadata(1.0));
+
+ ///
+ /// 指示每单击一下按钮时增加或减少的数量
+ ///
+ public double Increment
+ {
+ get => (double) GetValue(IncrementProperty);
+ set => SetValue(IncrementProperty, value);
+ }
+
+ ///
+ /// 指示要显示的小数位数
+ ///
+ public static readonly DependencyProperty DecimalPlacesProperty = DependencyProperty.Register(
+ "DecimalPlaces", typeof(int), typeof(NumericUpDown), new PropertyMetadata(default(int)));
+
+ ///
+ /// 指示要显示的小数位数
+ ///
+ public int DecimalPlaces
+ {
+ get => (int) GetValue(DecimalPlacesProperty);
+ set => SetValue(DecimalPlacesProperty, value);
+ }
+
+ internal static readonly DependencyProperty ShowUpDownButtonProperty = DependencyProperty.Register(
+ "ShowUpDownButton", typeof(bool), typeof(NumericUpDown), new PropertyMetadata(true));
+
+ internal bool ShowUpDownButton
+ {
+ get => (bool) GetValue(ShowUpDownButtonProperty);
+ set => SetValue(ShowUpDownButtonProperty, value);
+ }
+ }
+}
\ No newline at end of file
diff --git a/HandyControl/Controls/Picker/ColorPicker.xaml b/HandyControl/Controls/Picker/ColorPicker.xaml
index b6d8951f..3ca152cb 100644
--- a/HandyControl/Controls/Picker/ColorPicker.xaml
+++ b/HandyControl/Controls/Picker/ColorPicker.xaml
@@ -22,7 +22,20 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -58,21 +71,21 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/HandyControl/Controls/Picker/ColorPicker.xaml.cs b/HandyControl/Controls/Picker/ColorPicker.xaml.cs
index bdb86adb..396c48dd 100644
--- a/HandyControl/Controls/Picker/ColorPicker.xaml.cs
+++ b/HandyControl/Controls/Picker/ColorPicker.xaml.cs
@@ -8,6 +8,7 @@ using System.Windows.Media;
using HandyControl.Data;
using HandyControl.Tools.Extension;
+// ReSharper disable once CheckNamespace
namespace HandyControl.Controls
{
///
@@ -510,10 +511,10 @@ namespace HandyControl.Controls
private void ButtonSwitch_OnClick(object sender, RoutedEventArgs e) => ColorType++;
- private void InfoNumericUpDownRgb_OnValueChanged(object sender, FunctionEventArgs e)
+ private void NumericUpDownRgb_OnValueChanged(object sender, FunctionEventArgs e)
{
if (!_isLoaded || !IsNeedUpdateInfo) return;
- if (e.OriginalSource is InfoNumericUpDown ctl && ctl.Tag is string tag)
+ if (e.OriginalSource is NumericUpDown ctl && ctl.Tag is string tag)
{
var color = SelectedBrush.Color;
IsNeedUpdateInfo = false;
diff --git a/HandyControl/Controls/TimeBar/TimeBar.cs b/HandyControl/Controls/TimeBar/TimeBar.cs
index 6541c40b..83ba1e63 100644
--- a/HandyControl/Controls/TimeBar/TimeBar.cs
+++ b/HandyControl/Controls/TimeBar/TimeBar.cs
@@ -31,8 +31,7 @@ namespace HandyControl.Controls
private const string ElementCanvasSpe = "PART_CanvasSpe";
#endregion Constants
-
-
+
#region Data
private Border _borderTop;
diff --git a/HandyControl/Controls/Window/ImageBrowser.xaml.cs b/HandyControl/Controls/Window/ImageBrowser.cs
similarity index 73%
rename from HandyControl/Controls/Window/ImageBrowser.xaml.cs
rename to HandyControl/Controls/Window/ImageBrowser.cs
index 54b3ece3..e9d7ea85 100644
--- a/HandyControl/Controls/Window/ImageBrowser.xaml.cs
+++ b/HandyControl/Controls/Window/ImageBrowser.cs
@@ -2,10 +2,13 @@
using System.Diagnostics;
using System.IO;
using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Animation;
using System.Windows.Media.Imaging;
+using HandyControl.Interactivity;
using HandyControl.Tools;
using Microsoft.Win32;
@@ -15,40 +18,87 @@ namespace HandyControl.Controls
///
/// 图片浏览器
///
- public partial class ImageBrowser
+ [TemplatePart(Name = ElementGridTop, Type = typeof(Grid))]
+ [TemplatePart(Name = ElementGridMain, Type = typeof(Grid))]
+ [TemplatePart(Name = ElementCanvasSmallImg, Type = typeof(Canvas))]
+ [TemplatePart(Name = ElementBorderMove, Type = typeof(Border))]
+ [TemplatePart(Name = ElementBorderBottom, Type = typeof(Border))]
+ [TemplatePart(Name = ElementImageMain, Type = typeof(Image))]
+ public class ImageBrowser : WindowBorderless
{
+ #region Constants
+
+ private const string ElementGridTop = "PART_GridTop";
+
+ private const string ElementGridMain = "PART_GridMain";
+
+ private const string ElementCanvasSmallImg = "PART_CanvasSmallImg";
+
+ private const string ElementBorderMove = "PART_BorderMove";
+
+ private const string ElementBorderBottom = "PART_BorderBottom";
+
+ private const string ElementImageMain = "PART_ImageMain";
+
///
/// 缩放比间隔
///
private const double ScaleInternal = 0.2;
+ #endregion Constants
+
+ #region Data
+
+ private Grid _gridTop;
+
+ private Grid _canvasMain;
+
+ private Canvas _canvasSmallImg;
+
+ private Border _borderMove;
+
+ private Border _borderBottom;
+
+ private Image _imageMain;
+
+ #endregion Data
+
static ImageBrowser()
{
IsFullScreenProperty.AddOwner(typeof(ImageBrowser), new PropertyMetadata(default(bool)));
}
- private static readonly DependencyProperty ImageSourceProperty = DependencyProperty.Register(
+ internal static readonly DependencyProperty ImageContentProperty = DependencyProperty.Register(
+ "ImageContent", typeof(object), typeof(ImageBrowser), new PropertyMetadata(default(object)));
+
+ internal object ImageContent
+ {
+ get => GetValue(ImageContentProperty);
+ set => SetValue(ImageContentProperty, value);
+ }
+
+ internal static readonly DependencyProperty ImageSourceProperty = DependencyProperty.Register(
"ImageSource", typeof(BitmapFrame), typeof(ImageBrowser), new PropertyMetadata(default(BitmapFrame)));
- private static readonly DependencyProperty ImageMarginProperty = DependencyProperty.Register(
+ internal static readonly DependencyProperty ImageMarginProperty = DependencyProperty.Register(
"ImageMargin", typeof(Thickness), typeof(ImageBrowser), new PropertyMetadata(default(Thickness)));
- private static readonly DependencyProperty ImageWidthProperty = DependencyProperty.Register(
+ internal static readonly DependencyProperty ImageWidthProperty = DependencyProperty.Register(
"ImageWidth", typeof(double), typeof(ImageBrowser), new PropertyMetadata(default(double)));
- private static readonly DependencyProperty ImageHeightProperty = DependencyProperty.Register(
+ internal static readonly DependencyProperty ImageHeightProperty = DependencyProperty.Register(
"ImageHeight", typeof(double), typeof(ImageBrowser), new PropertyMetadata(default(double)));
public static readonly DependencyProperty ImageScaleProperty = DependencyProperty.Register(
"ImageScale", typeof(double), typeof(ImageBrowser), new PropertyMetadata(1.0, OnImageScaleChanged));
- private static readonly DependencyProperty ScaleStrProperty = DependencyProperty.Register(
+ internal static readonly DependencyProperty ScaleStrProperty = DependencyProperty.Register(
"ScaleStr", typeof(string), typeof(ImageBrowser), new PropertyMetadata("100%"));
- private static readonly DependencyProperty ImageRotateProperty = DependencyProperty.Register(
+ internal static readonly DependencyProperty ImageRotateProperty = DependencyProperty.Register(
"ImageRotate", typeof(double), typeof(ImageBrowser), new PropertyMetadata(default(double)));
- private static readonly DependencyProperty ShowSmallImgProperty = DependencyProperty.Register(
+ internal static readonly DependencyProperty ShowSmallImgProperty = DependencyProperty.Register(
"ShowSmallImg", typeof(bool), typeof(ImageBrowser), new PropertyMetadata(false));
///
@@ -182,15 +232,22 @@ namespace HandyControl.Controls
///
private bool _isOblique;
- public ImageBrowser() => InitializeComponent();
-
- ///
- /// 带一个图片路径的构造函数
- ///
- ///
- public ImageBrowser(string path) : this(new Uri(path))
+ public ImageBrowser()
{
+ Loaded += ImageBrowser_OnLoaded;
+ CommandBindings.Add(new CommandBinding(ControlCommands.Close, ButtonClose_OnClick));
+ CommandBindings.Add(new CommandBinding(ControlCommands.Save, ButtonSave_OnClick));
+ CommandBindings.Add(new CommandBinding(ControlCommands.Open, ButtonWindowsOpen_OnClick));
+ CommandBindings.Add(new CommandBinding(ControlCommands.Restore, ButtonActual_OnClick));
+ CommandBindings.Add(new CommandBinding(ControlCommands.Reduce, ButtonReduce_OnClick));
+ CommandBindings.Add(new CommandBinding(ControlCommands.Enlarge, ButtonEnlarge_OnClick));
+ CommandBindings.Add(new CommandBinding(ControlCommands.RotateLeft, ButtonRotateLeft_OnClick));
+ CommandBindings.Add(new CommandBinding(ControlCommands.RotateRight, ButtonRotateRight_OnClick));
+
+ WindowStartupLocation = WindowStartupLocation.CenterScreen;
+ WindowStyle = WindowStyle.None;
+ AllowsTransparency = true;
}
///
@@ -215,25 +272,82 @@ namespace HandyControl.Controls
}
}
- private BitmapFrame ImageSource
+ ///
+ /// 带一个图片路径的构造函数
+ ///
+ ///
+ public ImageBrowser(string path) : this(new Uri(path))
+ {
+
+ }
+
+ public override void OnApplyTemplate()
+ {
+ if (_imageMain != null)
+ {
+ _imageMain.MouseLeftButtonDown -= ImageMain_OnMouseLeftButtonDown;
+ }
+
+ if (_gridTop != null)
+ {
+ _gridTop.MouseLeftButtonDown -= GridTop_OnMouseLeftButtonDown;
+ }
+
+ if (_canvasSmallImg != null)
+ {
+ _canvasSmallImg.MouseLeftButtonDown -= CanvasSmallImg_OnMouseLeftButtonDown;
+ _canvasSmallImg.MouseLeftButtonUp -= CanvasSmallImg_OnMouseLeftButtonUp;
+ _canvasSmallImg.MouseMove -= CanvasSmallImg_OnMouseMove;
+ _canvasSmallImg.MouseLeave -= CanvasSmallImg_OnMouseLeave;
+ }
+
+ base.OnApplyTemplate();
+
+ _gridTop = GetTemplateChild(ElementGridTop) as Grid;
+ _canvasMain = GetTemplateChild(ElementGridMain) as Grid;
+ _canvasSmallImg = GetTemplateChild(ElementCanvasSmallImg) as Canvas;
+ _borderMove = GetTemplateChild(ElementBorderMove) as Border;
+ _imageMain = GetTemplateChild(ElementImageMain) as Image;
+ _borderBottom = GetTemplateChild(ElementBorderBottom) as Border;
+
+ if (_imageMain != null)
+ {
+ _imageMain.MouseLeftButtonDown += ImageMain_OnMouseLeftButtonDown;
+ }
+
+ if (_gridTop != null)
+ {
+ _gridTop.MouseLeftButtonDown += GridTop_OnMouseLeftButtonDown;
+ }
+
+ if (_canvasSmallImg != null)
+ {
+ _canvasSmallImg.MouseLeftButtonDown += CanvasSmallImg_OnMouseLeftButtonDown;
+ _canvasSmallImg.MouseLeftButtonUp += CanvasSmallImg_OnMouseLeftButtonUp;
+ _canvasSmallImg.MouseMove += CanvasSmallImg_OnMouseMove;
+ _canvasSmallImg.MouseLeave += CanvasSmallImg_OnMouseLeave;
+ }
+ }
+
+ internal BitmapFrame ImageSource
{
get => (BitmapFrame)GetValue(ImageSourceProperty);
set => SetValue(ImageSourceProperty, value);
}
- private Thickness ImageMargin
+ internal Thickness ImageMargin
{
get => (Thickness)GetValue(ImageMarginProperty);
set => SetValue(ImageMarginProperty, value);
}
- private double ImageWidth
+ internal double ImageWidth
{
get => (double)GetValue(ImageWidthProperty);
set => SetValue(ImageWidthProperty, value);
}
- private double ImageHeight
+ internal double ImageHeight
{
get => (double)GetValue(ImageHeightProperty);
set => SetValue(ImageHeightProperty, value);
@@ -245,19 +359,19 @@ namespace HandyControl.Controls
set => SetValue(ImageScaleProperty, value);
}
- private string ScaleStr
+ internal string ScaleStr
{
get => (string)GetValue(ScaleStrProperty);
set => SetValue(ScaleStrProperty, value);
}
- private double ImageRotate
+ internal double ImageRotate
{
get => (double)GetValue(ImageRotateProperty);
set => SetValue(ImageRotateProperty, value);
}
- private bool ShowSmallImg
+ internal bool ShowSmallImg
{
get => (bool)GetValue(ShowSmallImgProperty);
set => SetValue(ShowSmallImgProperty, value);
@@ -282,7 +396,7 @@ namespace HandyControl.Controls
set
{
if (_showCloseButton == value) return;
- GridTop.BeginAnimation(OpacityProperty,
+ _gridTop.BeginAnimation(OpacityProperty,
value ? AnimationHelper.CreateAnimation(1, 100) : AnimationHelper.CreateAnimation(0, 400));
_showCloseButton = value;
}
@@ -297,7 +411,7 @@ namespace HandyControl.Controls
set
{
if (_showBorderBottom == value) return;
- BorderBottom.BeginAnimation(OpacityProperty,
+ _borderBottom?.BeginAnimation(OpacityProperty,
value ? AnimationHelper.CreateAnimation(1, 100) : AnimationHelper.CreateAnimation(0, 400));
_showBorderBottom = value;
}
@@ -359,7 +473,7 @@ namespace HandyControl.Controls
}
ImageMargin = new Thickness((ActualWidth - ImageWidth) / 2, (ActualHeight - ImageHeight) / 2, 0, 0);
- _imgActualScale = ImageScale;
+ _imgActualScale = 1;
_imgActualMargin = ImageMargin;
}
@@ -420,20 +534,16 @@ namespace HandyControl.Controls
}
}
- private void ButtonScreenChange_OnClick(object sender, RoutedEventArgs e) => WindowState = IsFullScreen ? WindowState.Maximized : WindowState.Normal;
+ //private void ButtonScreenChange_OnClick(object sender, RoutedEventArgs e) => WindowState = IsFullScreen ? WindowState.Maximized : WindowState.Normal;
private void ButtonClose_OnClick(object sender, RoutedEventArgs e) => Close();
- private void CanvasBack_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+ private void GridTop_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
{
- try
+ if (e.LeftButton == MouseButtonState.Pressed)
{
DragMove();
}
- catch
- {
- // ignored
- }
}
protected override void OnMouseMove(MouseEventArgs e)
@@ -480,7 +590,7 @@ namespace HandyControl.Controls
}
else
{
- var right = Math.Abs(BorderMove.Width - CanvasSmallImg.ActualWidth + BorderMove.Margin.Left);
+ var right = Math.Abs(_borderMove.Width - _canvasSmallImg.ActualWidth + _borderMove.Margin.Left);
if (right < 0.001)
{
marginX = ActualWidth - ImageWidth;
@@ -497,7 +607,7 @@ namespace HandyControl.Controls
}
else
{
- var top = Math.Abs(BorderMove.Height - CanvasSmallImg.ActualHeight + BorderMove.Margin.Top);
+ var top = Math.Abs(_borderMove.Height - _canvasSmallImg.ActualHeight + _borderMove.Margin.Top);
if (top < 0.001)
{
marginY = ActualHeight - ImageHeight;
@@ -513,9 +623,8 @@ namespace HandyControl.Controls
{
base.OnMouseDoubleClick(e);
- if (e.GetPosition(GridTop).Y > GridTop.ActualHeight) return;
+ if (e.GetPosition(_gridTop).Y > _gridTop.ActualHeight) return;
IsFullScreen = !IsFullScreen;
- ButtonScreenChange_OnClick(null, null);
}
private void ImageBrowser_OnLoaded(object sender, RoutedEventArgs e)
@@ -532,7 +641,7 @@ namespace HandyControl.Controls
DragMove();
return;
}
- _imgMouseDownPoint = Mouse.GetPosition(CanvasMain);
+ _imgMouseDownPoint = Mouse.GetPosition(_canvasMain);
_imgMouseDownMargin = ImageMargin;
_imgIsMouseLeftButtonDown = true;
e.Handled = true;
@@ -553,7 +662,7 @@ namespace HandyControl.Controls
{
if (!_borderSmallIsLoaded)
{
- CanvasSmallImg.Background = new VisualBrush(ImageMain);
+ _canvasSmallImg.Background = new VisualBrush(_imageMain);
InitBorderSmall();
_borderSmallIsLoaded = true;
}
@@ -571,16 +680,16 @@ namespace HandyControl.Controls
///
private void InitBorderSmall()
{
- var scaleWindow = CanvasSmallImg.MaxWidth / CanvasSmallImg.MaxHeight;
+ var scaleWindow = _canvasSmallImg.MaxWidth / _canvasSmallImg.MaxHeight;
if (_imgWidHeiScale > scaleWindow)
{
- CanvasSmallImg.Width = CanvasSmallImg.MaxWidth;
- CanvasSmallImg.Height = CanvasSmallImg.Width / _imgWidHeiScale;
+ _canvasSmallImg.Width = _canvasSmallImg.MaxWidth;
+ _canvasSmallImg.Height = _canvasSmallImg.Width / _imgWidHeiScale;
}
else
{
- CanvasSmallImg.Width = CanvasSmallImg.MaxHeight * _imgWidHeiScale;
- CanvasSmallImg.Height = CanvasSmallImg.MaxHeight;
+ _canvasSmallImg.Width = _canvasSmallImg.MaxHeight * _imgWidHeiScale;
+ _canvasSmallImg.Height = _canvasSmallImg.MaxHeight;
}
}
@@ -594,21 +703,21 @@ namespace HandyControl.Controls
var widthMin = Math.Min(ImageWidth, ActualWidth);
var heightMin = Math.Min(ImageHeight, ActualHeight);
- BorderMove.Width = widthMin / ImageWidth * CanvasSmallImg.Width;
- BorderMove.Height = heightMin / ImageHeight * CanvasSmallImg.Height;
+ _borderMove.Width = widthMin / ImageWidth * _canvasSmallImg.Width;
+ _borderMove.Height = heightMin / ImageHeight * _canvasSmallImg.Height;
- var marginX = -ImageMargin.Left / ImageWidth * CanvasSmallImg.Width;
- var marginY = -ImageMargin.Top / ImageHeight * CanvasSmallImg.Height;
+ var marginX = -ImageMargin.Left / ImageWidth * _canvasSmallImg.Width;
+ var marginY = -ImageMargin.Top / ImageHeight * _canvasSmallImg.Height;
- var marginXMax = CanvasSmallImg.Width - BorderMove.Width;
- var marginYMax = CanvasSmallImg.Height - BorderMove.Height;
+ var marginXMax = _canvasSmallImg.Width - _borderMove.Width;
+ var marginYMax = _canvasSmallImg.Height - _borderMove.Height;
marginX = Math.Max(0, marginX);
marginX = Math.Min(marginXMax, marginX);
marginY = Math.Max(0, marginY);
marginY = Math.Min(marginYMax, marginY);
- BorderMove.Margin = new Thickness(marginX, marginY, 0, 0);
+ _borderMove.Margin = new Thickness(marginX, marginY, 0, 0);
}
///
@@ -627,7 +736,7 @@ namespace HandyControl.Controls
ImageScale = tempScale;
- var posCanvas = Mouse.GetPosition(CanvasMain);
+ var posCanvas = Mouse.GetPosition(_canvasMain);
var posImg = new Point(posCanvas.X - _imgActualMargin.Left, posCanvas.Y - _imgActualMargin.Top);
var marginX = .5 * _scaleInternalWidth;
@@ -665,15 +774,15 @@ namespace HandyControl.Controls
var subX = ImageWidth - ActualWidth;
var subY = ImageHeight - ActualHeight;
- var right = Math.Abs(BorderMove.Width - CanvasSmallImg.ActualWidth + BorderMove.Margin.Left);
- var top = Math.Abs(BorderMove.Height - CanvasSmallImg.ActualHeight + BorderMove.Margin.Top);
+ var right = Math.Abs(_borderMove.Width - _canvasSmallImg.ActualWidth + _borderMove.Margin.Left);
+ var top = Math.Abs(_borderMove.Height - _canvasSmallImg.ActualHeight + _borderMove.Margin.Top);
if (Math.Abs(ImageMargin.Left) < 0.001 || right < 0.001)
{
- marginActualX = _imgActualMargin.Left + BorderMove.Margin.Left / (CanvasSmallImg.ActualWidth - BorderMove.Width) * _scaleInternalWidth;
+ marginActualX = _imgActualMargin.Left + _borderMove.Margin.Left / (_canvasSmallImg.ActualWidth - _borderMove.Width) * _scaleInternalWidth;
}
if (Math.Abs(ImageMargin.Top) < 0.001 || top < 0.001)
{
- marginActualY = _imgActualMargin.Top + BorderMove.Margin.Top / (CanvasSmallImg.ActualHeight - BorderMove.Height) * _scaleInternalHeight;
+ marginActualY = _imgActualMargin.Top + _borderMove.Margin.Top / (_canvasSmallImg.ActualHeight - _borderMove.Height) * _scaleInternalHeight;
}
if (subX < 0.001)
{
@@ -716,7 +825,7 @@ namespace HandyControl.Controls
///
private void MoveImg()
{
- _imgCurrentPoint = Mouse.GetPosition(CanvasMain);
+ _imgCurrentPoint = Mouse.GetPosition(_canvasMain);
ShowCloseButton = _imgCurrentPoint.Y < 200;
ShowBorderBottom = _imgCurrentPoint.Y > ActualHeight - 200;
@@ -769,7 +878,7 @@ namespace HandyControl.Controls
{
if (_imgSmallIsMouseLeftButtonDown)
{
- _imgSmallCurrentPoint = Mouse.GetPosition(CanvasSmallImg);
+ _imgSmallCurrentPoint = Mouse.GetPosition(_canvasSmallImg);
var subX = _imgSmallCurrentPoint.X - _imgSmallMouseDownPoint.X;
var subY = _imgSmallCurrentPoint.Y - _imgSmallMouseDownPoint.Y;
@@ -779,9 +888,9 @@ namespace HandyControl.Controls
{
marginX = 0;
}
- else if (marginX + BorderMove.Width >= CanvasSmallImg.ActualWidth)
+ else if (marginX + _borderMove.Width >= _canvasSmallImg.ActualWidth)
{
- marginX = CanvasSmallImg.ActualWidth - BorderMove.Width;
+ marginX = _canvasSmallImg.ActualWidth - _borderMove.Width;
}
var marginY = _imgSmallMouseDownMargin.Top + subY;
@@ -789,22 +898,22 @@ namespace HandyControl.Controls
{
marginY = 0;
}
- else if (marginY + BorderMove.Height >= CanvasSmallImg.ActualHeight)
+ else if (marginY + _borderMove.Height >= _canvasSmallImg.ActualHeight)
{
- marginY = CanvasSmallImg.ActualHeight - BorderMove.Height;
+ marginY = _canvasSmallImg.ActualHeight - _borderMove.Height;
}
- BorderMove.Margin = new Thickness(marginX, marginY, 0, 0);
+ _borderMove.Margin = new Thickness(marginX, marginY, 0, 0);
var marginActualX = (ActualWidth - ImageWidth) / 2;
var marginActualY = (ActualHeight - ImageHeight) / 2;
if (_canMoveX)
{
- marginActualX = -marginX / CanvasSmallImg.ActualWidth * ImageWidth;
+ marginActualX = -marginX / _canvasSmallImg.ActualWidth * ImageWidth;
}
if (_canMoveY)
{
- marginActualY = -marginY / CanvasSmallImg.ActualHeight * ImageHeight;
+ marginActualY = -marginY / _canvasSmallImg.ActualHeight * ImageHeight;
}
ImageMargin = new Thickness(marginActualX, marginActualY, 0, 0);
@@ -814,8 +923,8 @@ namespace HandyControl.Controls
private void CanvasSmallImg_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
{
- _imgSmallMouseDownPoint = Mouse.GetPosition(CanvasSmallImg);
- _imgSmallMouseDownMargin = BorderMove.Margin;
+ _imgSmallMouseDownPoint = Mouse.GetPosition(_canvasSmallImg);
+ _imgSmallMouseDownMargin = _borderMove.Margin;
_imgSmallIsMouseLeftButtonDown = true;
e.Handled = true;
}
diff --git a/HandyControl/Controls/Window/ImageBrowser.xaml b/HandyControl/Controls/Window/ImageBrowser.xaml
deleted file mode 100644
index b0e0ab84..00000000
--- a/HandyControl/Controls/Window/ImageBrowser.xaml
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/HandyControl/HandyControl.csproj b/HandyControl/HandyControl.csproj
index 8e2d91c0..07607d04 100644
--- a/HandyControl/HandyControl.csproj
+++ b/HandyControl/HandyControl.csproj
@@ -47,6 +47,7 @@
+
ColorPicker.xaml
@@ -54,13 +55,6 @@
-
-
- InfoNumericUpDown.xaml
-
-
- InfoTextBox.xaml
-
@@ -74,9 +68,7 @@
-
- ImageBrowser.xaml
-
+
@@ -153,26 +145,11 @@
-
-
-
Designer
MSBuild:Compile
-
- Designer
- MSBuild:Compile
-
-
- Designer
- MSBuild:Compile
-
-
- Designer
- MSBuild:Compile
-
Designer
MSBuild:Compile
@@ -213,6 +190,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
@@ -337,6 +318,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
diff --git a/HandyControl/Interactivity/ControlCommands.cs b/HandyControl/Interactivity/ControlCommands.cs
index 2bb1b1cc..50c70f73 100644
--- a/HandyControl/Interactivity/ControlCommands.cs
+++ b/HandyControl/Interactivity/ControlCommands.cs
@@ -3,10 +3,45 @@
namespace HandyControl.Interactivity
{
///
- /// 控件库使用的所有命令
+ /// 控件库使用的所有命令（为了统一，不使用wpf自带的命令）
///
public static class ControlCommands
{
+ ///
+ /// 右转
+ ///
+ public static RoutedCommand RotateRight { get; } = new RoutedCommand("RotateRight", typeof(ControlCommands));
+
+ ///
+ /// 左转
+ ///
+ public static RoutedCommand RotateLeft { get; } = new RoutedCommand("RotateLeft", typeof(ControlCommands));
+
+ ///
+ /// 小
+ ///
+ public static RoutedCommand Reduce { get; } = new RoutedCommand("Reduce", typeof(ControlCommands));
+
+ ///
+ /// 大
+ ///
+ public static RoutedCommand Enlarge { get; } = new RoutedCommand("Enlarge", typeof(ControlCommands));
+
+ ///
+ /// 还原
+ ///
+ public static RoutedCommand Restore { get; } = new RoutedCommand("Restore", typeof(ControlCommands));
+
+ ///
+ /// 打开
+ ///
+ public static RoutedCommand Open { get; } = new RoutedCommand("Open", typeof(ControlCommands));
+
+ ///
+ /// 保存
+ ///
+ public static RoutedCommand Save { get; } = new RoutedCommand("Save", typeof(ControlCommands));
+
///
/// 选中
///
diff --git a/HandyControl/Properties/AssemblyInfo.cs b/HandyControl/Properties/AssemblyInfo.cs
index 59ab3326..8399a9fa 100644
--- a/HandyControl/Properties/AssemblyInfo.cs
+++ b/HandyControl/Properties/AssemblyInfo.cs
@@ -10,5 +10,5 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.3.2.2")]
-[assembly: AssemblyFileVersion("1.3.2.2")]
+[assembly: AssemblyVersion("1.3.3")]
+[assembly: AssemblyFileVersion("1.3.3")]
diff --git a/HandyControl/Resources/colorPickerBack.png b/HandyControl/Resources/colorPickerBack.png
deleted file mode 100644
index 770865e9547abe10771b6b18121fed173f904860..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 34435
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
wc$R
-
diff --git a/HandyControl/Themes/Styles/Base/DatePickerBaseStyle.xaml b/HandyControl/Themes/Styles/Base/DatePickerBaseStyle.xaml
index 48ef45a7..be2295c7 100644
--- a/HandyControl/Themes/Styles/Base/DatePickerBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/DatePickerBaseStyle.xaml
@@ -34,7 +34,6 @@
-
diff --git a/HandyControl/Themes/Styles/Base/NumericUpDownBaseStyle.xaml b/HandyControl/Themes/Styles/Base/NumericUpDownBaseStyle.xaml
new file mode 100644
index 00000000..42a61e02
--- /dev/null
+++ b/HandyControl/Themes/Styles/Base/NumericUpDownBaseStyle.xaml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/Base/PasswordBoxBaseStyle.xaml b/HandyControl/Themes/Styles/Base/PasswordBoxBaseStyle.xaml
index bc102f40..7e9841f8 100644
--- a/HandyControl/Themes/Styles/Base/PasswordBoxBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/PasswordBoxBaseStyle.xaml
@@ -13,7 +13,6 @@
-
diff --git a/HandyControl/Themes/Styles/Base/TextBoxBaseStyle.xaml b/HandyControl/Themes/Styles/Base/TextBoxBaseStyle.xaml
index e7d40ae3..492c7634 100644
--- a/HandyControl/Themes/Styles/Base/TextBoxBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/TextBoxBaseStyle.xaml
@@ -36,7 +36,6 @@
-
diff --git a/HandyControl/Themes/Styles/Base/TimePickerBaseStyle.xaml b/HandyControl/Themes/Styles/Base/TimePickerBaseStyle.xaml
index 0249997e..d98952de 100644
--- a/HandyControl/Themes/Styles/Base/TimePickerBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/TimePickerBaseStyle.xaml
@@ -12,7 +12,6 @@
-
diff --git a/HandyControl/Themes/Styles/Base/ToggleButtonBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ToggleButtonBaseStyle.xaml
index 33e3c5d8..01f0498b 100644
--- a/HandyControl/Themes/Styles/Base/ToggleButtonBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/ToggleButtonBaseStyle.xaml
@@ -14,9 +14,6 @@
-
diff --git a/HandyControl/Themes/Styles/Border.xaml b/HandyControl/Themes/Styles/Border.xaml
index 174be80e..cb6ea280 100644
--- a/HandyControl/Themes/Styles/Border.xaml
+++ b/HandyControl/Themes/Styles/Border.xaml
@@ -9,13 +9,13 @@
-
-
+
+
\ No newline at end of file
diff --git a/HandyControlDemo/Data/MessageToken.cs b/HandyControlDemo/Data/MessageToken.cs
index 6be64883..185d6790 100644
--- a/HandyControlDemo/Data/MessageToken.cs
+++ b/HandyControlDemo/Data/MessageToken.cs
@@ -28,6 +28,8 @@
public static readonly string CirclePanelDemoCtl = nameof(CirclePanelDemoCtl);
+ public static readonly string NumericUpDownDemoCtl = nameof(NumericUpDownDemoCtl);
+
public static readonly string ButtonDemoCtl = nameof(ButtonDemoCtl);
public static readonly string ToggleButtonDemoCtl = nameof(ToggleButtonDemoCtl);
diff --git a/HandyControlDemo/Data/MessageToken.tt b/HandyControlDemo/Data/MessageToken.tt
index cc7d34cd..d7a2467e 100644
--- a/HandyControlDemo/Data/MessageToken.tt
+++ b/HandyControlDemo/Data/MessageToken.tt
@@ -16,7 +16,8 @@ var controlList = new List
"StepBarDemoCtl",
"ClockDemoCtl",
"TimePickerDemoCtl",
- "CirclePanelDemoCtl"
+ "CirclePanelDemoCtl",
+ "NumericUpDownDemoCtl"
};
var styleList = new List
{
diff --git a/HandyControlDemo/HandyControlDemo.csproj b/HandyControlDemo/HandyControlDemo.csproj
index 8f28510d..8095c7b9 100644
--- a/HandyControlDemo/HandyControlDemo.csproj
+++ b/HandyControlDemo/HandyControlDemo.csproj
@@ -106,6 +106,9 @@
LoadingDemoCtl.xaml
+
+ NumericUpDownDemoCtl.xaml
+
StepBarDemoCtl.xaml
@@ -248,6 +251,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
diff --git a/HandyControlDemo/Properties/AssemblyInfo.cs b/HandyControlDemo/Properties/AssemblyInfo.cs
index 1e33adb5..db61bf36 100644
--- a/HandyControlDemo/Properties/AssemblyInfo.cs
+++ b/HandyControlDemo/Properties/AssemblyInfo.cs
@@ -12,5 +12,5 @@ using System.Windows;
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]
[assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
-[assembly: AssemblyVersion("1.3.2.2")]
-[assembly: AssemblyFileVersion("1.3.2.2")]
+[assembly: AssemblyVersion("1.3.3")]
+[assembly: AssemblyFileVersion("1.3.3")]
diff --git a/HandyControlDemo/Properties/Langs/Lang.Designer.cs b/HandyControlDemo/Properties/Langs/Lang.Designer.cs
index 91f27645..a106e2e9 100644
--- a/HandyControlDemo/Properties/Langs/Lang.Designer.cs
+++ b/HandyControlDemo/Properties/Langs/Lang.Designer.cs
@@ -330,6 +330,15 @@ namespace HandyControlDemo.Properties.Langs {
}
}
+ ///
+ /// 查找类似 数值选择控件 的本地化字符串。
+ ///
+ public static string NumericUpDown {
+ get {
+ return ResourceManager.GetString("NumericUpDown", resourceCulture);
+ }
+ }
+
///
/// 查找类似 点击打开图片浏览器 的本地化字符串。
///
diff --git a/HandyControlDemo/Properties/Langs/Lang.en.resx b/HandyControlDemo/Properties/Langs/Lang.en.resx
index 741cf0ce..456eadb3 100644
--- a/HandyControlDemo/Properties/Langs/Lang.en.resx
+++ b/HandyControlDemo/Properties/Langs/Lang.en.resx
@@ -282,4 +282,7 @@
ComboBox
+
+ NumericUpDown
+
\ No newline at end of file
diff --git a/HandyControlDemo/Properties/Langs/Lang.resx b/HandyControlDemo/Properties/Langs/Lang.resx
index b5a6042d..4956b5ff 100644
--- a/HandyControlDemo/Properties/Langs/Lang.resx
+++ b/HandyControlDemo/Properties/Langs/Lang.resx
@@ -262,4 +262,7 @@
组合框
+
+ 数值选择控件
+
\ No newline at end of file
diff --git a/HandyControlDemo/UserControl/Controls/NumericUpDownDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/NumericUpDownDemoCtl.xaml
new file mode 100644
index 00000000..1e48e96e
--- /dev/null
+++ b/HandyControlDemo/UserControl/Controls/NumericUpDownDemoCtl.xaml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
diff --git a/HandyControlDemo/UserControl/Controls/NumericUpDownDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Controls/NumericUpDownDemoCtl.xaml.cs
new file mode 100644
index 00000000..e09320bb
--- /dev/null
+++ b/HandyControlDemo/UserControl/Controls/NumericUpDownDemoCtl.xaml.cs
@@ -0,0 +1,11 @@
+// ReSharper disable once CheckNamespace
+namespace HandyControlDemo.UserControl
+{
+ public partial class NumericUpDownDemoCtl
+ {
+ public NumericUpDownDemoCtl()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/HandyControlDemo/UserControl/Main/LeftMainContent.xaml b/HandyControlDemo/UserControl/Main/LeftMainContent.xaml
index f2ef5904..cc126180 100644
--- a/HandyControlDemo/UserControl/Main/LeftMainContent.xaml
+++ b/HandyControlDemo/UserControl/Main/LeftMainContent.xaml
@@ -25,11 +25,12 @@
-
+
+
@@ -47,40 +48,4 @@
-
\ No newline at end of file