From 31622677956d8a98c77ea8f5d3e7f8c87a7f85d5 Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Sun, 28 Jun 2020 22:39:27 +0800 Subject: [PATCH] optimized performance --- .../Controls/Base/SelectableItem.cs | 6 +- .../Controls/Base/SimpleItemsControl.cs | 2 +- .../Controls/Block/RunningBlock.cs | 8 +- .../Controls/Button/SplitButton.cs | 2 +- .../Controls/Carousel/Carousel.cs | 4 +- .../Controls/Cover/CoverFlow/CoverFlow.cs | 2 +- .../Controls/Cover/CoverView/CoverView.cs | 2 +- .../Controls/Dialog/Dialog.cs | 2 +- .../Controls/Growl/Growl.cs | 2 +- .../Controls/Image/ImageBlock.cs | 2 +- .../Controls/Image/ImageViewer.cs | 10 +- .../Controls/Input/ComboBox.cs | 6 +- .../Controls/Input/DatePicker.cs | 4 +- .../Controls/Input/DateTimePicker.cs | 6 +- .../Controls/Input/ImageSelector.cs | 2 +- .../Controls/Input/NumericUpDown.cs | 8 +- .../Controls/Input/PasswordBox.cs | 94 +++++++++---------- .../Controls/Input/SearchBar.cs | 2 +- .../Controls/Input/TextBox.cs | 4 +- .../Controls/Input/TimePicker.cs | 6 +- .../Controls/Loading/LoadingBase.cs | 2 +- .../Controls/Loading/LoadingCircle.cs | 3 +- .../Controls/Other/AnimationPath.cs | 2 +- .../Controls/Other/Badge.cs | 2 +- .../Controls/Other/ChatBubble.cs | 2 +- .../Controls/Other/Drawer.cs | 6 +- .../Controls/Other/GotoTop.cs | 4 +- .../Controls/Other/NotifyIcon.cs | 2 +- .../Controls/Other/Pagination.cs | 2 +- .../Controls/Other/Poptip.cs | 2 +- .../Controls/Other/ScrollViewer.cs | 6 +- .../Controls/Other/Watermark.cs | 2 +- .../Controls/Panel/CirclePanel.cs | 2 +- .../Controls/Panel/Grid/Col.cs | 2 +- .../Controls/ProgressBar/CircleProgressBar.cs | 2 +- .../Controls/ProgressBar/WaveProgressBar.cs | 2 +- .../HorizontalAlignmentPropertyEditor.cs | 3 +- .../VerticalAlignmentPropertyEditor.cs | 3 +- .../Controls/PropertyGrid/PropertyItem.cs | 6 +- .../HandyControl_Shared/Controls/Rate/Rate.cs | 8 +- .../Controls/Rate/RateItem.cs | 8 +- .../Controls/Screenshot/ScreenshotWindow.cs | 4 +- .../Controls/SideMenu/SideMenu.cs | 2 +- .../Controls/SideMenu/SideMenuItem.cs | 2 +- .../Slider/RangeSlider/RangeSlider.cs | 6 +- .../Controls/Slider/RangeSlider/RangeTrack.cs | 2 +- .../Controls/TabControl/TabControl.cs | 12 +-- .../Controls/TabControl/TabItem.cs | 2 +- .../Controls/TabControl/TabPanel.cs | 2 +- .../HandyControl_Shared/Controls/Tag/Tag.cs | 6 +- .../Controls/Tag/TagPanel.cs | 2 +- .../Controls/Time/CalendarWithClock.cs | 2 +- .../Controls/Time/Clock/ClockBase.cs | 2 +- .../Controls/Time/TimeBar/TimeBar.cs | 2 +- .../Controls/Transfer/TransferItem.cs | 4 +- .../Controls/Window/MessageBox.cs | 2 +- .../Controls/Window/PopupWindow.cs | 6 +- .../Controls/Window/Window.cs | 6 +- .../Behavior/FluidMoveBehavior.cs | 4 +- .../Behavior/FluidMoveBehaviorBase.cs | 2 +- .../Behavior/MouseDragElementBehavior.cs | 5 +- .../Behavior/MouseDragElementBehaviorEx.cs | 2 +- .../Interactivity/EventToCommand.cs | 4 +- .../ExtendedVisualStateManager.cs | 4 +- .../Interactivity/TriggerAction.cs | 6 +- 65 files changed, 168 insertions(+), 168 deletions(-) diff --git a/src/Shared/HandyControl_Shared/Controls/Base/SelectableItem.cs b/src/Shared/HandyControl_Shared/Controls/Base/SelectableItem.cs index a458f0ab..accaf979 100644 --- a/src/Shared/HandyControl_Shared/Controls/Base/SelectableItem.cs +++ b/src/Shared/HandyControl_Shared/Controls/Base/SelectableItem.cs @@ -67,7 +67,7 @@ namespace HandyControl.Controls public bool IsSelected { get => (bool)GetValue(IsSelectedProperty); - set => SetValue(IsSelectedProperty, value); + set => SetValue(IsSelectedProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty SelfManageProperty = DependencyProperty.Register( @@ -76,7 +76,7 @@ namespace HandyControl.Controls public bool SelfManage { get => (bool) GetValue(SelfManageProperty); - set => SetValue(SelfManageProperty, value); + set => SetValue(SelfManageProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty CanDeselectProperty = DependencyProperty.Register( @@ -85,7 +85,7 @@ namespace HandyControl.Controls public bool CanDeselect { get => (bool) GetValue(CanDeselectProperty); - set => SetValue(CanDeselectProperty, value); + set => SetValue(CanDeselectProperty, ValueBoxes.BooleanBox(value)); } public static readonly RoutedEvent SelectedEvent = diff --git a/src/Shared/HandyControl_Shared/Controls/Base/SimpleItemsControl.cs b/src/Shared/HandyControl_Shared/Controls/Base/SimpleItemsControl.cs index b347b244..20e2df51 100644 --- a/src/Shared/HandyControl_Shared/Controls/Base/SimpleItemsControl.cs +++ b/src/Shared/HandyControl_Shared/Controls/Base/SimpleItemsControl.cs @@ -38,7 +38,7 @@ namespace HandyControl.Controls { if (e.NewItems != null && e.NewItems.Count > 0) { - SetValue(HasItemsPropertyKey, true); + SetValue(HasItemsPropertyKey, ValueBoxes.TrueBox); } OnItemsChanged(s, e); }; diff --git a/src/Shared/HandyControl_Shared/Controls/Block/RunningBlock.cs b/src/Shared/HandyControl_Shared/Controls/Block/RunningBlock.cs index dbdfe161..eb5e2902 100644 --- a/src/Shared/HandyControl_Shared/Controls/Block/RunningBlock.cs +++ b/src/Shared/HandyControl_Shared/Controls/Block/RunningBlock.cs @@ -36,7 +36,7 @@ namespace HandyControl.Controls public bool Runaway { get => (bool) GetValue(RunawayProperty); - set => SetValue(RunawayProperty, value); + set => SetValue(RunawayProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty AutoRunProperty = DependencyProperty.Register( @@ -45,7 +45,7 @@ namespace HandyControl.Controls public bool AutoRun { get => (bool) GetValue(AutoRunProperty); - set => SetValue(AutoRunProperty, value); + set => SetValue(AutoRunProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty OrientationProperty = DependencyProperty.Register( @@ -93,7 +93,7 @@ namespace HandyControl.Controls public bool IsRunning { get => (bool) GetValue(IsRunningProperty); - set => SetValue(IsRunningProperty, value); + set => SetValue(IsRunningProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty AutoReverseProperty = DependencyProperty.Register( @@ -102,7 +102,7 @@ namespace HandyControl.Controls public bool AutoReverse { get => (bool) GetValue(AutoReverseProperty); - set => SetValue(AutoReverseProperty, value); + set => SetValue(AutoReverseProperty, ValueBoxes.BooleanBox(value)); } private void UpdateContent() diff --git a/src/Shared/HandyControl_Shared/Controls/Button/SplitButton.cs b/src/Shared/HandyControl_Shared/Controls/Button/SplitButton.cs index f5e3767c..36330a30 100644 --- a/src/Shared/HandyControl_Shared/Controls/Button/SplitButton.cs +++ b/src/Shared/HandyControl_Shared/Controls/Button/SplitButton.cs @@ -33,7 +33,7 @@ namespace HandyControl.Controls public bool IsDropDownOpen { get => (bool) GetValue(IsDropDownOpenProperty); - set => SetValue(IsDropDownOpenProperty, value); + set => SetValue(IsDropDownOpenProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty DropDownContentProperty = DependencyProperty.Register( diff --git a/src/Shared/HandyControl_Shared/Controls/Carousel/Carousel.cs b/src/Shared/HandyControl_Shared/Controls/Carousel/Carousel.cs index 3528fe56..9d136228 100644 --- a/src/Shared/HandyControl_Shared/Controls/Carousel/Carousel.cs +++ b/src/Shared/HandyControl_Shared/Controls/Carousel/Carousel.cs @@ -104,7 +104,7 @@ namespace HandyControl.Controls public bool IsCenter { get => (bool)GetValue(IsCenterProperty); - set => SetValue(IsCenterProperty, value); + set => SetValue(IsCenterProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty PageButtonStyleProperty = DependencyProperty.Register( @@ -161,7 +161,7 @@ namespace HandyControl.Controls public bool AutoRun { get => (bool)GetValue(AutoRunProperty); - set => SetValue(AutoRunProperty, value); + set => SetValue(AutoRunProperty, ValueBoxes.BooleanBox(value)); } /// diff --git a/src/Shared/HandyControl_Shared/Controls/Cover/CoverFlow/CoverFlow.cs b/src/Shared/HandyControl_Shared/Controls/Cover/CoverFlow/CoverFlow.cs index 717f0731..eb9d98f6 100644 --- a/src/Shared/HandyControl_Shared/Controls/Cover/CoverFlow/CoverFlow.cs +++ b/src/Shared/HandyControl_Shared/Controls/Cover/CoverFlow/CoverFlow.cs @@ -123,7 +123,7 @@ namespace HandyControl.Controls public bool Loop { get => (bool)GetValue(LoopProperty); - set => SetValue(LoopProperty, value); + set => SetValue(LoopProperty, ValueBoxes.BooleanBox(value)); } public override void OnApplyTemplate() diff --git a/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverView.cs b/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverView.cs index 714fcc59..7ce10f51 100644 --- a/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverView.cs +++ b/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverView.cs @@ -146,7 +146,7 @@ namespace HandyControl.Controls public bool ItemContentHeightFixed { get => (bool)GetValue(ItemContentHeightFixedProperty); - set => SetValue(ItemContentHeightFixedProperty, value); + set => SetValue(ItemContentHeightFixedProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty ItemHeaderTemplateProperty = DependencyProperty.Register( diff --git a/src/Shared/HandyControl_Shared/Controls/Dialog/Dialog.cs b/src/Shared/HandyControl_Shared/Controls/Dialog/Dialog.cs index 0161ea09..dc3e9119 100644 --- a/src/Shared/HandyControl_Shared/Controls/Dialog/Dialog.cs +++ b/src/Shared/HandyControl_Shared/Controls/Dialog/Dialog.cs @@ -24,7 +24,7 @@ namespace HandyControl.Controls public bool IsClosed { get => (bool)GetValue(IsClosedProperty); - internal set => SetValue(IsClosedProperty, value); + internal set => SetValue(IsClosedProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty TokenProperty = DependencyProperty.RegisterAttached( diff --git a/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs b/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs index 3bbd8cc1..19f4ee51 100644 --- a/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs +++ b/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs @@ -234,7 +234,7 @@ namespace HandyControl.Controls public bool ShowDateTime { get => (bool)GetValue(ShowDateTimeProperty); - set => SetValue(ShowDateTimeProperty, value); + set => SetValue(ShowDateTimeProperty, ValueBoxes.BooleanBox(value)); } public string Message diff --git a/src/Shared/HandyControl_Shared/Controls/Image/ImageBlock.cs b/src/Shared/HandyControl_Shared/Controls/Image/ImageBlock.cs index 1093a4fe..30e9a974 100644 --- a/src/Shared/HandyControl_Shared/Controls/Image/ImageBlock.cs +++ b/src/Shared/HandyControl_Shared/Controls/Image/ImageBlock.cs @@ -143,7 +143,7 @@ namespace HandyControl.Controls public bool IsPlaying { get => (bool) GetValue(IsPlayingProperty); - set => SetValue(IsPlayingProperty, value); + set => SetValue(IsPlayingProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty ColumnsProperty = DependencyProperty.Register( diff --git a/src/Shared/HandyControl_Shared/Controls/Image/ImageViewer.cs b/src/Shared/HandyControl_Shared/Controls/Image/ImageViewer.cs index ba9678de..abee79dd 100644 --- a/src/Shared/HandyControl_Shared/Controls/Image/ImageViewer.cs +++ b/src/Shared/HandyControl_Shared/Controls/Image/ImageViewer.cs @@ -271,13 +271,13 @@ namespace HandyControl.Controls public bool IsFullScreen { get => (bool)GetValue(IsFullScreenProperty); - set => SetValue(IsFullScreenProperty, value); + set => SetValue(IsFullScreenProperty, ValueBoxes.BooleanBox(value)); } public bool ShowImgMap { get => (bool)GetValue(ShowImgMapProperty); - set => SetValue(ShowImgMapProperty, value); + set => SetValue(ShowImgMapProperty, ValueBoxes.BooleanBox(value)); } public BitmapFrame ImageSource @@ -310,7 +310,7 @@ namespace HandyControl.Controls internal bool ShowFullScreenButton { get => (bool)GetValue(ShowFullScreenButtonProperty); - set => SetValue(ShowFullScreenButtonProperty, value); + set => SetValue(ShowFullScreenButtonProperty, ValueBoxes.BooleanBox(value)); } internal Thickness ImageMargin @@ -352,7 +352,7 @@ namespace HandyControl.Controls internal bool ShowSmallImgInternal { get => (bool)GetValue(ShowSmallImgInternalProperty); - set => SetValue(ShowSmallImgInternalProperty, value); + set => SetValue(ShowSmallImgInternalProperty, ValueBoxes.BooleanBox(value)); } /// @@ -371,7 +371,7 @@ namespace HandyControl.Controls internal bool ShowCloseButton { get => (bool)GetValue(ShowCloseButtonProperty); - set => SetValue(ShowCloseButtonProperty, value); + set => SetValue(ShowCloseButtonProperty, ValueBoxes.BooleanBox(value)); } /// diff --git a/src/Shared/HandyControl_Shared/Controls/Input/ComboBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/ComboBox.cs index 75188dbd..33b8b023 100644 --- a/src/Shared/HandyControl_Shared/Controls/Input/ComboBox.cs +++ b/src/Shared/HandyControl_Shared/Controls/Input/ComboBox.cs @@ -169,7 +169,7 @@ namespace HandyControl.Controls public bool IsError { get => (bool)GetValue(IsErrorProperty); - set => SetValue(IsErrorProperty, value); + set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value)); } /// @@ -220,7 +220,7 @@ namespace HandyControl.Controls public bool ShowClearButton { get => (bool)GetValue(ShowClearButtonProperty); - set => SetValue(ShowClearButtonProperty, value); + set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value)); } /// @@ -339,7 +339,7 @@ namespace HandyControl.Controls public bool AutoComplete { get => (bool)GetValue(AutoCompleteProperty); - set => SetValue(AutoCompleteProperty, value); + set => SetValue(AutoCompleteProperty, ValueBoxes.BooleanBox(value)); } /// diff --git a/src/Shared/HandyControl_Shared/Controls/Input/DatePicker.cs b/src/Shared/HandyControl_Shared/Controls/Input/DatePicker.cs index 51642a31..a8a1e809 100644 --- a/src/Shared/HandyControl_Shared/Controls/Input/DatePicker.cs +++ b/src/Shared/HandyControl_Shared/Controls/Input/DatePicker.cs @@ -51,7 +51,7 @@ namespace HandyControl.Controls public bool IsError { get => (bool) GetValue(IsErrorProperty); - set => SetValue(IsErrorProperty, value); + set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register( @@ -78,7 +78,7 @@ namespace HandyControl.Controls public bool ShowClearButton { get => (bool) GetValue(ShowClearButtonProperty); - set => SetValue(ShowClearButtonProperty, value); + set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value)); } public virtual bool VerifyData() diff --git a/src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs b/src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs index 06bb6454..0f7156d4 100644 --- a/src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs +++ b/src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs @@ -153,7 +153,7 @@ namespace HandyControl.Controls public bool IsDropDownOpen { get => (bool) GetValue(IsDropDownOpenProperty); - set => SetValue(IsDropDownOpenProperty, value); + set => SetValue(IsDropDownOpenProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty SelectedDateTimeProperty = DependencyProperty.Register( @@ -238,7 +238,7 @@ namespace HandyControl.Controls public bool IsError { get => (bool) GetValue(IsErrorProperty); - set => SetValue(IsErrorProperty, value); + set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register( @@ -265,7 +265,7 @@ namespace HandyControl.Controls public bool ShowClearButton { get => (bool) GetValue(ShowClearButtonProperty); - set => SetValue(ShowClearButtonProperty, value); + set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value)); } #endregion diff --git a/src/Shared/HandyControl_Shared/Controls/Input/ImageSelector.cs b/src/Shared/HandyControl_Shared/Controls/Input/ImageSelector.cs index 8d53d501..fcc605b5 100644 --- a/src/Shared/HandyControl_Shared/Controls/Input/ImageSelector.cs +++ b/src/Shared/HandyControl_Shared/Controls/Input/ImageSelector.cs @@ -120,7 +120,7 @@ namespace HandyControl.Controls public bool HasValue { get => (bool) GetValue(HasValueProperty); - set => SetValue(HasValueProperty, value); + set => SetValue(HasValueProperty, ValueBoxes.BooleanBox(value)); } } } \ No newline at end of file diff --git a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs index 429ce518..119a4d9f 100644 --- a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs +++ b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs @@ -321,7 +321,7 @@ namespace HandyControl.Controls internal bool ShowUpDownButton { get => (bool)GetValue(ShowUpDownButtonProperty); - set => SetValue(ShowUpDownButtonProperty, value); + set => SetValue(ShowUpDownButtonProperty, ValueBoxes.BooleanBox(value)); } /// @@ -333,7 +333,7 @@ namespace HandyControl.Controls public bool IsError { get => (bool)GetValue(IsErrorProperty); - set => SetValue(IsErrorProperty, value); + set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value)); } /// @@ -372,7 +372,7 @@ namespace HandyControl.Controls public bool ShowClearButton { get => (bool)GetValue(ShowClearButtonProperty); - set => SetValue(ShowClearButtonProperty, value); + set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value)); } /// @@ -387,7 +387,7 @@ namespace HandyControl.Controls public bool IsReadOnly { get => (bool)GetValue(IsReadOnlyProperty); - set => SetValue(IsReadOnlyProperty, value); + set => SetValue(IsReadOnlyProperty, ValueBoxes.BooleanBox(value)); } public Func> VerifyFunc { get; set; } diff --git a/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs index 5fdd95be..338b4721 100644 --- a/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs +++ b/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs @@ -20,6 +20,11 @@ namespace HandyControl.Controls private const string ElementTextBox = "PART_TextBox"; + private SecureString _password; + + private System.Windows.Controls.TextBox _textBox; + + /// /// 掩码字符 /// @@ -27,46 +32,81 @@ namespace HandyControl.Controls System.Windows.Controls.PasswordBox.PasswordCharProperty.AddOwner(typeof(PasswordBox), new FrameworkPropertyMetadata('●')); + public char PasswordChar + { + get => (char)GetValue(PasswordCharProperty); + set => SetValue(PasswordCharProperty, value); + } + /// /// 数据是否错误 /// public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register( "IsError", typeof(bool), typeof(PasswordBox), new PropertyMetadata(ValueBoxes.FalseBox)); + public bool IsError + { + get => (bool)GetValue(IsErrorProperty); + set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value)); + } + /// /// 错误提示 /// public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register( "ErrorStr", typeof(string), typeof(PasswordBox), new PropertyMetadata(default(string))); + public string ErrorStr + { + get => (string)GetValue(ErrorStrProperty); + set => SetValue(ErrorStrProperty, value); + } + /// /// 文本类型 /// public static readonly DependencyProperty TextTypeProperty = DependencyProperty.Register( "TextType", typeof(TextType), typeof(PasswordBox), new PropertyMetadata(default(TextType))); + public TextType TextType + { + get => (TextType)GetValue(TextTypeProperty); + set => SetValue(TextTypeProperty, value); + } + /// /// 是否显示清除按钮 /// public static readonly DependencyProperty ShowClearButtonProperty = DependencyProperty.Register( "ShowClearButton", typeof(bool), typeof(PasswordBox), new PropertyMetadata(ValueBoxes.FalseBox)); + public bool ShowClearButton + { + get => (bool)GetValue(ShowClearButtonProperty); + set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value)); + } + public static readonly DependencyProperty ShowEyeButtonProperty = DependencyProperty.Register( "ShowEyeButton", typeof(bool), typeof(PasswordBox), new PropertyMetadata(ValueBoxes.FalseBox)); + public bool ShowEyeButton + { + get => (bool)GetValue(ShowEyeButtonProperty); + set => SetValue(ShowEyeButtonProperty, ValueBoxes.BooleanBox(value)); + } + public static readonly DependencyProperty ShowPasswordProperty = DependencyProperty.Register( "ShowPassword", typeof(bool), typeof(PasswordBox), new PropertyMetadata(ValueBoxes.FalseBox, OnShowPasswordChanged)); - private SecureString _password; - - private System.Windows.Controls.TextBox _textBox; - - public PasswordBox() + public bool ShowPassword { - CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) => Clear())); + get => (bool)GetValue(ShowPasswordProperty); + set => SetValue(ShowPasswordProperty, ValueBoxes.BooleanBox(value)); } + public PasswordBox() => CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) => Clear())); + public System.Windows.Controls.PasswordBox ActualPasswordBox { get; set; } [DefaultValue("")] @@ -101,50 +141,8 @@ namespace HandyControl.Controls [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public SecureString SecurePassword => ActualPasswordBox?.SecurePassword; - public char PasswordChar - { - get => (char) GetValue(PasswordCharProperty); - set => SetValue(PasswordCharProperty, value); - } - - public bool ShowEyeButton - { - get => (bool) GetValue(ShowEyeButtonProperty); - set => SetValue(ShowEyeButtonProperty, value); - } - - public bool ShowPassword - { - get => (bool) GetValue(ShowPasswordProperty); - set => SetValue(ShowPasswordProperty, value); - } - public Func> VerifyFunc { get; set; } - public bool IsError - { - get => (bool) GetValue(IsErrorProperty); - set => SetValue(IsErrorProperty, value); - } - - public string ErrorStr - { - get => (string) GetValue(ErrorStrProperty); - set => SetValue(ErrorStrProperty, value); - } - - public TextType TextType - { - get => (TextType) GetValue(TextTypeProperty); - set => SetValue(TextTypeProperty, value); - } - - public bool ShowClearButton - { - get => (bool) GetValue(ShowClearButtonProperty); - set => SetValue(ShowClearButtonProperty, value); - } - public virtual bool VerifyData() { OperationResult result; diff --git a/src/Shared/HandyControl_Shared/Controls/Input/SearchBar.cs b/src/Shared/HandyControl_Shared/Controls/Input/SearchBar.cs index 75341640..b2713f18 100644 --- a/src/Shared/HandyControl_Shared/Controls/Input/SearchBar.cs +++ b/src/Shared/HandyControl_Shared/Controls/Input/SearchBar.cs @@ -77,7 +77,7 @@ namespace HandyControl.Controls public bool IsRealTime { get => (bool)GetValue(IsRealTimeProperty); - set => SetValue(IsRealTimeProperty, value); + set => SetValue(IsRealTimeProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty CommandProperty = DependencyProperty.Register( diff --git a/src/Shared/HandyControl_Shared/Controls/Input/TextBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/TextBox.cs index 8cc0edf5..ee682c73 100644 --- a/src/Shared/HandyControl_Shared/Controls/Input/TextBox.cs +++ b/src/Shared/HandyControl_Shared/Controls/Input/TextBox.cs @@ -36,7 +36,7 @@ namespace HandyControl.Controls public bool IsError { get => (bool) GetValue(IsErrorProperty); - set => SetValue(IsErrorProperty, value); + set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value)); } /// @@ -72,7 +72,7 @@ namespace HandyControl.Controls public bool ShowClearButton { get => (bool) GetValue(ShowClearButtonProperty); - set => SetValue(ShowClearButtonProperty, value); + set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value)); } public virtual bool VerifyData() diff --git a/src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs b/src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs index 4a6b84e8..066228a4 100644 --- a/src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs +++ b/src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs @@ -130,7 +130,7 @@ namespace HandyControl.Controls public bool IsDropDownOpen { get => (bool)GetValue(IsDropDownOpenProperty); - set => SetValue(IsDropDownOpenProperty, value); + set => SetValue(IsDropDownOpenProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty IsDropDownOpenProperty = @@ -262,7 +262,7 @@ namespace HandyControl.Controls public bool IsError { get => (bool)GetValue(IsErrorProperty); - set => SetValue(IsErrorProperty, value); + set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register( @@ -289,7 +289,7 @@ namespace HandyControl.Controls public bool ShowClearButton { get => (bool)GetValue(ShowClearButtonProperty); - set => SetValue(ShowClearButtonProperty, value); + set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty ClockProperty = DependencyProperty.Register( diff --git a/src/Shared/HandyControl_Shared/Controls/Loading/LoadingBase.cs b/src/Shared/HandyControl_Shared/Controls/Loading/LoadingBase.cs index f0c8c906..4d3eff8a 100644 --- a/src/Shared/HandyControl_Shared/Controls/Loading/LoadingBase.cs +++ b/src/Shared/HandyControl_Shared/Controls/Loading/LoadingBase.cs @@ -31,7 +31,7 @@ namespace HandyControl.Controls public bool IsRunning { get => (bool) GetValue(IsRunningProperty); - set => SetValue(IsRunningProperty, value); + set => SetValue(IsRunningProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty DotCountProperty = DependencyProperty.Register( diff --git a/src/Shared/HandyControl_Shared/Controls/Loading/LoadingCircle.cs b/src/Shared/HandyControl_Shared/Controls/Loading/LoadingCircle.cs index b4ef744d..21b6eb1d 100644 --- a/src/Shared/HandyControl_Shared/Controls/Loading/LoadingCircle.cs +++ b/src/Shared/HandyControl_Shared/Controls/Loading/LoadingCircle.cs @@ -4,6 +4,7 @@ using System.Windows.Controls; using System.Windows.Data; using System.Windows.Media; using System.Windows.Media.Animation; +using HandyControl.Data; namespace HandyControl.Controls @@ -27,7 +28,7 @@ namespace HandyControl.Controls public bool NeedHidden { get => (bool) GetValue(NeedHiddenProperty); - set => SetValue(NeedHiddenProperty, value); + set => SetValue(NeedHiddenProperty, ValueBoxes.BooleanBox(value)); } static LoadingCircle() diff --git a/src/Shared/HandyControl_Shared/Controls/Other/AnimationPath.cs b/src/Shared/HandyControl_Shared/Controls/Other/AnimationPath.cs index de1abef5..c6874b34 100644 --- a/src/Shared/HandyControl_Shared/Controls/Other/AnimationPath.cs +++ b/src/Shared/HandyControl_Shared/Controls/Other/AnimationPath.cs @@ -100,7 +100,7 @@ namespace HandyControl.Controls public bool IsPlaying { get => (bool)GetValue(IsPlayingProperty); - set => SetValue(IsPlayingProperty, value); + set => SetValue(IsPlayingProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty RepeatBehaviorProperty = DependencyProperty.Register( diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Badge.cs b/src/Shared/HandyControl_Shared/Controls/Other/Badge.cs index d9ae22d0..15ffe2f2 100644 --- a/src/Shared/HandyControl_Shared/Controls/Other/Badge.cs +++ b/src/Shared/HandyControl_Shared/Controls/Other/Badge.cs @@ -86,7 +86,7 @@ namespace HandyControl.Controls public bool ShowBadge { get => (bool) GetValue(ShowBadgeProperty); - set => SetValue(ShowBadgeProperty, value); + set => SetValue(ShowBadgeProperty, ValueBoxes.BooleanBox(value)); } protected override Geometry GetLayoutClip(Size layoutSlotSize) => null; diff --git a/src/Shared/HandyControl_Shared/Controls/Other/ChatBubble.cs b/src/Shared/HandyControl_Shared/Controls/Other/ChatBubble.cs index 353ae9b1..a717ad30 100644 --- a/src/Shared/HandyControl_Shared/Controls/Other/ChatBubble.cs +++ b/src/Shared/HandyControl_Shared/Controls/Other/ChatBubble.cs @@ -30,7 +30,7 @@ namespace HandyControl.Controls public bool IsRead { get => (bool) GetValue(IsReadProperty); - set => SetValue(IsReadProperty, value); + set => SetValue(IsReadProperty, ValueBoxes.BooleanBox(value)); } public static void SetMaxWidth(DependencyObject element, double value) diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Drawer.cs b/src/Shared/HandyControl_Shared/Controls/Other/Drawer.cs index db9fb3c0..a4b6a072 100644 --- a/src/Shared/HandyControl_Shared/Controls/Other/Drawer.cs +++ b/src/Shared/HandyControl_Shared/Controls/Other/Drawer.cs @@ -109,7 +109,7 @@ namespace HandyControl.Controls public bool IsOpen { get => (bool) GetValue(IsOpenProperty); - set => SetValue(IsOpenProperty, value); + set => SetValue(IsOpenProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty MaskCanCloseProperty = DependencyProperty.Register( @@ -118,7 +118,7 @@ namespace HandyControl.Controls public bool MaskCanClose { get => (bool) GetValue(MaskCanCloseProperty); - set => SetValue(MaskCanCloseProperty, value); + set => SetValue(MaskCanCloseProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty ShowMaskProperty = DependencyProperty.Register( @@ -127,7 +127,7 @@ namespace HandyControl.Controls public bool ShowMask { get => (bool) GetValue(ShowMaskProperty); - set => SetValue(ShowMaskProperty, value); + set => SetValue(ShowMaskProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty DockProperty = DependencyProperty.Register( diff --git a/src/Shared/HandyControl_Shared/Controls/Other/GotoTop.cs b/src/Shared/HandyControl_Shared/Controls/Other/GotoTop.cs index d7acb02e..bc70ea28 100644 --- a/src/Shared/HandyControl_Shared/Controls/Other/GotoTop.cs +++ b/src/Shared/HandyControl_Shared/Controls/Other/GotoTop.cs @@ -60,7 +60,7 @@ namespace HandyControl.Controls public bool Animated { get => (bool) GetValue(AnimatedProperty); - set => SetValue(AnimatedProperty, value); + set => SetValue(AnimatedProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty AnimationTimeProperty = DependencyProperty.Register( @@ -87,7 +87,7 @@ namespace HandyControl.Controls public bool AutoHiding { get => (bool) GetValue(AutoHidingProperty); - set => SetValue(AutoHidingProperty, value); + set => SetValue(AutoHidingProperty, ValueBoxes.BooleanBox(value)); } protected override void OnClick() diff --git a/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs b/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs index 02ca4633..c70f68dc 100644 --- a/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs +++ b/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs @@ -335,7 +335,7 @@ namespace HandyControl.Controls public bool IsBlink { get => (bool)GetValue(IsBlinkProperty); - set => SetValue(IsBlinkProperty, value); + set => SetValue(IsBlinkProperty, ValueBoxes.BooleanBox(value)); } private void DispatcherTimerBlinkTick(object sender, EventArgs e) diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs b/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs index 6241bb0a..e02f0133 100644 --- a/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs +++ b/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs @@ -231,7 +231,7 @@ namespace HandyControl.Controls public bool IsJumpEnabled { get => (bool) GetValue(IsJumpEnabledProperty); - set => SetValue(IsJumpEnabledProperty, value); + set => SetValue(IsJumpEnabledProperty, ValueBoxes.BooleanBox(value)); } #endregion diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Poptip.cs b/src/Shared/HandyControl_Shared/Controls/Other/Poptip.cs index 40faef20..86152cc0 100644 --- a/src/Shared/HandyControl_Shared/Controls/Other/Poptip.cs +++ b/src/Shared/HandyControl_Shared/Controls/Other/Poptip.cs @@ -145,7 +145,7 @@ namespace HandyControl.Controls public bool IsOpen { get => (bool) GetValue(IsOpenProperty); - set => SetValue(IsOpenProperty, value); + set => SetValue(IsOpenProperty, ValueBoxes.BooleanBox(value)); } public static Poptip Default => new Poptip(); diff --git a/src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs b/src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs index e39d662b..ab835a59 100644 --- a/src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs +++ b/src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs @@ -44,7 +44,7 @@ namespace HandyControl.Controls public bool CanMouseWheel { get => (bool) GetValue(CanMouseWheelProperty); - set => SetValue(CanMouseWheelProperty, value); + set => SetValue(CanMouseWheelProperty, ValueBoxes.BooleanBox(value)); } protected override void OnMouseWheel(MouseWheelEventArgs e) @@ -155,7 +155,7 @@ namespace HandyControl.Controls public bool IsInertiaEnabled { get => (bool) GetValue(IsInertiaEnabledProperty); - set => SetValue(IsInertiaEnabledProperty, value); + set => SetValue(IsInertiaEnabledProperty, ValueBoxes.BooleanBox(value)); } /// @@ -170,7 +170,7 @@ namespace HandyControl.Controls public bool IsPenetrating { get => (bool) GetValue(IsPenetratingProperty); - set => SetValue(IsPenetratingProperty, value); + set => SetValue(IsPenetratingProperty, ValueBoxes.BooleanBox(value)); } public static void SetIsPenetrating(DependencyObject element, bool value) => element.SetValue(IsPenetratingProperty, ValueBoxes.BooleanBox(value)); diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Watermark.cs b/src/Shared/HandyControl_Shared/Controls/Other/Watermark.cs index 2fe66be9..6d3c3e3b 100644 --- a/src/Shared/HandyControl_Shared/Controls/Other/Watermark.cs +++ b/src/Shared/HandyControl_Shared/Controls/Other/Watermark.cs @@ -77,7 +77,7 @@ namespace HandyControl.Controls public bool AutoSizeEnabled { get => (bool) GetValue(AutoSizeEnabledProperty); - set => SetValue(AutoSizeEnabledProperty, value); + set => SetValue(AutoSizeEnabledProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty MarkMarginProperty = DependencyProperty.Register( diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/CirclePanel.cs b/src/Shared/HandyControl_Shared/Controls/Panel/CirclePanel.cs index 1ad31640..0fe9e68a 100644 --- a/src/Shared/HandyControl_Shared/Controls/Panel/CirclePanel.cs +++ b/src/Shared/HandyControl_Shared/Controls/Panel/CirclePanel.cs @@ -23,7 +23,7 @@ namespace HandyControl.Controls public bool KeepVertical { get => (bool) GetValue(KeepVerticalProperty); - set => SetValue(KeepVerticalProperty, value); + set => SetValue(KeepVerticalProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty OffsetAngleProperty = DependencyProperty.Register( diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/Grid/Col.cs b/src/Shared/HandyControl_Shared/Controls/Panel/Grid/Col.cs index c94cbc43..b633c1fa 100644 --- a/src/Shared/HandyControl_Shared/Controls/Panel/Grid/Col.cs +++ b/src/Shared/HandyControl_Shared/Controls/Panel/Grid/Col.cs @@ -47,7 +47,7 @@ namespace HandyControl.Controls public bool IsFixed { get => (bool) GetValue(IsFixedProperty); - set => SetValue(IsFixedProperty, value); + set => SetValue(IsFixedProperty, ValueBoxes.BooleanBox(value)); } internal int GetLayoutCellCount(ColLayoutStatus status) diff --git a/src/Shared/HandyControl_Shared/Controls/ProgressBar/CircleProgressBar.cs b/src/Shared/HandyControl_Shared/Controls/ProgressBar/CircleProgressBar.cs index 474ced46..e1ed5dfa 100644 --- a/src/Shared/HandyControl_Shared/Controls/ProgressBar/CircleProgressBar.cs +++ b/src/Shared/HandyControl_Shared/Controls/ProgressBar/CircleProgressBar.cs @@ -38,7 +38,7 @@ namespace HandyControl.Controls public bool ShowText { get => (bool) GetValue(ShowTextProperty); - set => SetValue(ShowTextProperty, value); + set => SetValue(ShowTextProperty, ValueBoxes.BooleanBox(value)); } public double ArcThickness diff --git a/src/Shared/HandyControl_Shared/Controls/ProgressBar/WaveProgressBar.cs b/src/Shared/HandyControl_Shared/Controls/ProgressBar/WaveProgressBar.cs index 196665ca..3d6ac4c1 100644 --- a/src/Shared/HandyControl_Shared/Controls/ProgressBar/WaveProgressBar.cs +++ b/src/Shared/HandyControl_Shared/Controls/ProgressBar/WaveProgressBar.cs @@ -86,7 +86,7 @@ namespace HandyControl.Controls public bool ShowText { get => (bool)GetValue(ShowTextProperty); - set => SetValue(ShowTextProperty, value); + set => SetValue(ShowTextProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty WaveFillProperty = DependencyProperty.Register( diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/HorizontalAlignmentPropertyEditor.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/HorizontalAlignmentPropertyEditor.cs index 1c5bef22..89d7750f 100644 --- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/HorizontalAlignmentPropertyEditor.cs +++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/HorizontalAlignmentPropertyEditor.cs @@ -5,6 +5,7 @@ using System.Windows.Controls.Primitives; using System.Windows.Data; using System.Windows.Media; using System.Windows.Shapes; +using HandyControl.Data; using HandyControl.Tools; namespace HandyControl.Controls @@ -35,7 +36,7 @@ namespace HandyControl.Controls var factory = new FrameworkElementFactory(typeof(Path)); factory.SetValue(FrameworkElement.WidthProperty, 12.0); - factory.SetValue(FrameworkElement.HeightProperty, 10.0); + factory.SetValue(FrameworkElement.HeightProperty, ValueBoxes.Double10Box); factory.SetBinding(Shape.FillProperty, new Binding(Control.ForegroundProperty.Name) { RelativeSource = new RelativeSource diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/VerticalAlignmentPropertyEditor.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/VerticalAlignmentPropertyEditor.cs index fb4f445b..6311c926 100644 --- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/VerticalAlignmentPropertyEditor.cs +++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/VerticalAlignmentPropertyEditor.cs @@ -5,6 +5,7 @@ using System.Windows.Controls.Primitives; using System.Windows.Data; using System.Windows.Media; using System.Windows.Shapes; +using HandyControl.Data; using HandyControl.Tools; namespace HandyControl.Controls @@ -34,7 +35,7 @@ namespace HandyControl.Controls }; var factory = new FrameworkElementFactory(typeof(Path)); - factory.SetValue(FrameworkElement.WidthProperty, 10.0); + factory.SetValue(FrameworkElement.WidthProperty, ValueBoxes.Double10Box); factory.SetValue(FrameworkElement.HeightProperty, 12.0); factory.SetBinding(Shape.FillProperty, new Binding(Control.ForegroundProperty.Name) { diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyItem.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyItem.cs index 3ef9888a..942078d8 100644 --- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyItem.cs +++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyItem.cs @@ -68,7 +68,7 @@ namespace HandyControl.Controls public bool IsReadOnly { get => (bool)GetValue(IsReadOnlyProperty); - set => SetValue(IsReadOnlyProperty, value); + set => SetValue(IsReadOnlyProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty DefaultValueProperty = DependencyProperty.Register( @@ -113,7 +113,7 @@ namespace HandyControl.Controls public bool IsSelected { get => (bool)GetValue(IsSelectedProperty); - set => SetValue(IsSelectedProperty, value); + set => SetValue(IsSelectedProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty IsExpandedEnabledProperty = DependencyProperty.Register( @@ -122,7 +122,7 @@ namespace HandyControl.Controls public bool IsExpandedEnabled { get => (bool)GetValue(IsExpandedEnabledProperty); - set => SetValue(IsExpandedEnabledProperty, value); + set => SetValue(IsExpandedEnabledProperty, ValueBoxes.BooleanBox(value)); } public PropertyDescriptor PropertyDescriptor { get; set; } diff --git a/src/Shared/HandyControl_Shared/Controls/Rate/Rate.cs b/src/Shared/HandyControl_Shared/Controls/Rate/Rate.cs index a8acf741..3c932a85 100644 --- a/src/Shared/HandyControl_Shared/Controls/Rate/Rate.cs +++ b/src/Shared/HandyControl_Shared/Controls/Rate/Rate.cs @@ -108,13 +108,13 @@ namespace HandyControl.Controls public bool AllowHalf { get => (bool) GetValue(AllowHalfProperty); - set => SetValue(AllowHalfProperty, value); + set => SetValue(AllowHalfProperty, ValueBoxes.BooleanBox(value)); } public bool AllowClear { get => (bool) GetValue(AllowClearProperty); - set => SetValue(AllowClearProperty, value); + set => SetValue(AllowClearProperty, ValueBoxes.BooleanBox(value)); } public Geometry Icon @@ -150,13 +150,13 @@ namespace HandyControl.Controls public bool ShowText { get => (bool) GetValue(ShowTextProperty); - set => SetValue(ShowTextProperty, value); + set => SetValue(ShowTextProperty, ValueBoxes.BooleanBox(value)); } public bool IsReadOnly { get => (bool)GetValue(IsReadOnlyProperty); - set => SetValue(IsReadOnlyProperty, value); + set => SetValue(IsReadOnlyProperty, ValueBoxes.BooleanBox(value)); } private void RateItemValueChanged(object sender, RoutedEventArgs e) => diff --git a/src/Shared/HandyControl_Shared/Controls/Rate/RateItem.cs b/src/Shared/HandyControl_Shared/Controls/Rate/RateItem.cs index 9a0ae623..23e88377 100644 --- a/src/Shared/HandyControl_Shared/Controls/Rate/RateItem.cs +++ b/src/Shared/HandyControl_Shared/Controls/Rate/RateItem.cs @@ -58,13 +58,13 @@ namespace HandyControl.Controls public bool AllowClear { get => (bool) GetValue(AllowClearProperty); - set => SetValue(AllowClearProperty, value); + set => SetValue(AllowClearProperty, ValueBoxes.BooleanBox(value)); } public bool AllowHalf { get => (bool) GetValue(AllowHalfProperty); - set => SetValue(AllowHalfProperty, value); + set => SetValue(AllowHalfProperty, ValueBoxes.BooleanBox(value)); } public Geometry Icon @@ -76,13 +76,13 @@ namespace HandyControl.Controls internal bool IsSelected { get => (bool) GetValue(IsSelectedProperty); - set => SetValue(IsSelectedProperty, value); + set => SetValue(IsSelectedProperty, ValueBoxes.BooleanBox(value)); } public bool IsReadOnly { get => (bool)GetValue(IsReadOnlyProperty); - set => SetValue(IsReadOnlyProperty, value); + set => SetValue(IsReadOnlyProperty, ValueBoxes.BooleanBox(value)); } internal bool IsHalf diff --git a/src/Shared/HandyControl_Shared/Controls/Screenshot/ScreenshotWindow.cs b/src/Shared/HandyControl_Shared/Controls/Screenshot/ScreenshotWindow.cs index 34e800d8..6f8e85d4 100644 --- a/src/Shared/HandyControl_Shared/Controls/Screenshot/ScreenshotWindow.cs +++ b/src/Shared/HandyControl_Shared/Controls/Screenshot/ScreenshotWindow.cs @@ -125,7 +125,7 @@ namespace HandyControl.Controls public bool IsDrawing { get => (bool)GetValue(IsDrawingProperty); - internal set => SetValue(IsDrawingProperty, value); + internal set => SetValue(IsDrawingProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty IsSelectingProperty = DependencyProperty.Register( @@ -134,7 +134,7 @@ namespace HandyControl.Controls public bool IsSelecting { get => (bool)GetValue(IsSelectingProperty); - internal set => SetValue(IsSelectingProperty, value); + internal set => SetValue(IsSelectingProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty SizeProperty = DependencyProperty.Register( diff --git a/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenu.cs b/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenu.cs index 5d31e279..b808c481 100644 --- a/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenu.cs +++ b/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenu.cs @@ -127,7 +127,7 @@ namespace HandyControl.Controls public bool AutoSelect { get => (bool) GetValue(AutoSelectProperty); - set => SetValue(AutoSelectProperty, value); + set => SetValue(AutoSelectProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty ExpandModeProperty = DependencyProperty.Register( diff --git a/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenuItem.cs b/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenuItem.cs index 1fee5b8c..2b6a8002 100644 --- a/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenuItem.cs +++ b/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenuItem.cs @@ -102,7 +102,7 @@ namespace HandyControl.Controls public bool IsSelected { get => (bool) GetValue(IsSelectedProperty); - set => SetValue(IsSelectedProperty, value); + set => SetValue(IsSelectedProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty RoleProperty = DependencyProperty.Register( diff --git a/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeSlider.cs b/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeSlider.cs index 72902db7..8220142a 100644 --- a/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeSlider.cs +++ b/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeSlider.cs @@ -146,7 +146,7 @@ namespace HandyControl.Controls public bool IsDirectionReversed { get => (bool)GetValue(IsDirectionReversedProperty); - set => SetValue(IsDirectionReversedProperty, value); + set => SetValue(IsDirectionReversedProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty DelayProperty = RepeatButton.DelayProperty.AddOwner(typeof(RangeSlider), new FrameworkPropertyMetadata(GetKeyboardDelay())); @@ -206,7 +206,7 @@ namespace HandyControl.Controls public bool IsSnapToTickEnabled { get => (bool)GetValue(IsSnapToTickEnabledProperty); - set => SetValue(IsSnapToTickEnabledProperty, value); + set => SetValue(IsSnapToTickEnabledProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty TickPlacementProperty = DependencyProperty.Register( @@ -243,7 +243,7 @@ namespace HandyControl.Controls public bool IsMoveToPointEnabled { get => (bool)GetValue(IsMoveToPointEnabledProperty); - set => SetValue(IsMoveToPointEnabledProperty, value); + set => SetValue(IsMoveToPointEnabledProperty, ValueBoxes.BooleanBox(value)); } protected override void OnPreviewMouseLeftButtonDown(MouseButtonEventArgs e) diff --git a/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeTrack.cs b/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeTrack.cs index 678ba24f..ca89d612 100644 --- a/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeTrack.cs +++ b/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeTrack.cs @@ -170,7 +170,7 @@ namespace HandyControl.Controls public bool IsDirectionReversed { get => (bool) GetValue(IsDirectionReversedProperty); - set => SetValue(IsDirectionReversedProperty, value); + set => SetValue(IsDirectionReversedProperty, ValueBoxes.BooleanBox(value)); } protected override Visual GetVisualChild(int index) diff --git a/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs b/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs index 0ab1ca18..5c14721c 100644 --- a/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs +++ b/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs @@ -59,7 +59,7 @@ namespace HandyControl.Controls public bool IsAnimationEnabled { get => (bool)GetValue(IsAnimationEnabledProperty); - set => SetValue(IsAnimationEnabledProperty, value); + set => SetValue(IsAnimationEnabledProperty, ValueBoxes.BooleanBox(value)); } /// @@ -74,7 +74,7 @@ namespace HandyControl.Controls public bool IsDraggable { get => (bool)GetValue(IsDraggableProperty); - set => SetValue(IsDraggableProperty, value); + set => SetValue(IsDraggableProperty, ValueBoxes.BooleanBox(value)); } /// @@ -131,7 +131,7 @@ namespace HandyControl.Controls public bool IsTabFillEnabled { get => (bool)GetValue(IsTabFillEnabledProperty); - set => SetValue(IsTabFillEnabledProperty, value); + set => SetValue(IsTabFillEnabledProperty, ValueBoxes.BooleanBox(value)); } /// @@ -176,7 +176,7 @@ namespace HandyControl.Controls public bool IsScrollable { get => (bool) GetValue(IsScrollableProperty); - set => SetValue(IsScrollableProperty, value); + set => SetValue(IsScrollableProperty, ValueBoxes.BooleanBox(value)); } /// @@ -191,7 +191,7 @@ namespace HandyControl.Controls public bool ShowOverflowButton { get => (bool) GetValue(ShowOverflowButtonProperty); - set => SetValue(ShowOverflowButtonProperty, value); + set => SetValue(ShowOverflowButtonProperty, ValueBoxes.BooleanBox(value)); } /// @@ -206,7 +206,7 @@ namespace HandyControl.Controls public bool ShowScrollButton { get => (bool) GetValue(ShowScrollButtonProperty); - set => SetValue(ShowScrollButtonProperty, value); + set => SetValue(ShowScrollButtonProperty, ValueBoxes.BooleanBox(value)); } /// diff --git a/src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs b/src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs index 3fb337b5..8ef16a65 100644 --- a/src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs +++ b/src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs @@ -173,7 +173,7 @@ namespace HandyControl.Controls public bool ShowContextMenu { get => (bool) GetValue(ShowContextMenuProperty); - set => SetValue(ShowContextMenuProperty, value); + set => SetValue(ShowContextMenuProperty, ValueBoxes.BooleanBox(value)); } public static void SetShowContextMenu(DependencyObject element, bool value) diff --git a/src/Shared/HandyControl_Shared/Controls/TabControl/TabPanel.cs b/src/Shared/HandyControl_Shared/Controls/TabControl/TabPanel.cs index f1c26ace..a695649e 100644 --- a/src/Shared/HandyControl_Shared/Controls/TabControl/TabPanel.cs +++ b/src/Shared/HandyControl_Shared/Controls/TabControl/TabPanel.cs @@ -53,7 +53,7 @@ namespace HandyControl.Controls public bool IsTabFillEnabled { get => (bool)GetValue(IsTabFillEnabledProperty); - set => SetValue(IsTabFillEnabledProperty, value); + set => SetValue(IsTabFillEnabledProperty, ValueBoxes.BooleanBox(value)); } /// diff --git a/src/Shared/HandyControl_Shared/Controls/Tag/Tag.cs b/src/Shared/HandyControl_Shared/Controls/Tag/Tag.cs index 737794f5..f8dec4e3 100644 --- a/src/Shared/HandyControl_Shared/Controls/Tag/Tag.cs +++ b/src/Shared/HandyControl_Shared/Controls/Tag/Tag.cs @@ -27,7 +27,7 @@ namespace HandyControl.Controls public bool ShowCloseButton { get => (bool) GetValue(ShowCloseButtonProperty); - set => SetValue(ShowCloseButtonProperty, value); + set => SetValue(ShowCloseButtonProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty SelectableProperty = DependencyProperty.Register( @@ -36,7 +36,7 @@ namespace HandyControl.Controls public bool Selectable { get => (bool) GetValue(SelectableProperty); - set => SetValue(SelectableProperty, value); + set => SetValue(SelectableProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty IsSelectedProperty = DependencyProperty.Register( @@ -49,7 +49,7 @@ namespace HandyControl.Controls public bool IsSelected { get => (bool) GetValue(IsSelectedProperty); - set => SetValue(IsSelectedProperty, value); + set => SetValue(IsSelectedProperty, ValueBoxes.BooleanBox(value)); } public static readonly RoutedEvent SelectedEvent = EventManager.RegisterRoutedEvent("Selected", RoutingStrategy.Bubble, typeof(EventHandler), typeof(Tag)); diff --git a/src/Shared/HandyControl_Shared/Controls/Tag/TagPanel.cs b/src/Shared/HandyControl_Shared/Controls/Tag/TagPanel.cs index 560af60b..dd0ac447 100644 --- a/src/Shared/HandyControl_Shared/Controls/Tag/TagPanel.cs +++ b/src/Shared/HandyControl_Shared/Controls/Tag/TagPanel.cs @@ -45,7 +45,7 @@ namespace HandyControl.Controls public bool ShowAddButton { get => (bool) GetValue(ShowAddButtonProperty); - set => SetValue(ShowAddButtonProperty, value); + set => SetValue(ShowAddButtonProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty TagMarginProperty = DependencyProperty.Register( diff --git a/src/Shared/HandyControl_Shared/Controls/Time/CalendarWithClock.cs b/src/Shared/HandyControl_Shared/Controls/Time/CalendarWithClock.cs index e8e2c353..27b79b58 100644 --- a/src/Shared/HandyControl_Shared/Controls/Time/CalendarWithClock.cs +++ b/src/Shared/HandyControl_Shared/Controls/Time/CalendarWithClock.cs @@ -87,7 +87,7 @@ namespace HandyControl.Controls public bool ShowConfirmButton { get => (bool)GetValue(ShowConfirmButtonProperty); - set => SetValue(ShowConfirmButtonProperty, value); + set => SetValue(ShowConfirmButtonProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty SelectedDateTimeProperty = DependencyProperty.Register( diff --git a/src/Shared/HandyControl_Shared/Controls/Time/Clock/ClockBase.cs b/src/Shared/HandyControl_Shared/Controls/Time/Clock/ClockBase.cs index c2ef4420..d524d12c 100644 --- a/src/Shared/HandyControl_Shared/Controls/Time/Clock/ClockBase.cs +++ b/src/Shared/HandyControl_Shared/Controls/Time/Clock/ClockBase.cs @@ -82,7 +82,7 @@ namespace HandyControl.Controls internal bool ShowConfirmButton { get => (bool) GetValue(ShowConfirmButtonProperty); - set => SetValue(ShowConfirmButtonProperty, value); + set => SetValue(ShowConfirmButtonProperty, ValueBoxes.BooleanBox(value)); } protected virtual void OnSelectedTimeChanged(FunctionEventArgs e) => RaiseEvent(e); diff --git a/src/Shared/HandyControl_Shared/Controls/Time/TimeBar/TimeBar.cs b/src/Shared/HandyControl_Shared/Controls/Time/TimeBar/TimeBar.cs index fdff8de5..fd1ef960 100644 --- a/src/Shared/HandyControl_Shared/Controls/Time/TimeBar/TimeBar.cs +++ b/src/Shared/HandyControl_Shared/Controls/Time/TimeBar/TimeBar.cs @@ -216,7 +216,7 @@ namespace HandyControl.Controls public bool ShowSpeStr { get => (bool)GetValue(ShowSpeStrProperty); - set => SetValue(ShowSpeStrProperty, value); + set => SetValue(ShowSpeStrProperty, ValueBoxes.BooleanBox(value)); } /// diff --git a/src/Shared/HandyControl_Shared/Controls/Transfer/TransferItem.cs b/src/Shared/HandyControl_Shared/Controls/Transfer/TransferItem.cs index 8e798e80..b7e623fc 100644 --- a/src/Shared/HandyControl_Shared/Controls/Transfer/TransferItem.cs +++ b/src/Shared/HandyControl_Shared/Controls/Transfer/TransferItem.cs @@ -11,7 +11,7 @@ namespace HandyControl.Controls public bool IsTransferred { get => (bool) GetValue(IsTransferredProperty); - set => SetValue(IsTransferredProperty, value); + set => SetValue(IsTransferredProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty IsOriginProperty = DependencyProperty.Register( @@ -20,7 +20,7 @@ namespace HandyControl.Controls public bool IsOrigin { get => (bool) GetValue(IsOriginProperty); - internal set => SetValue(IsOriginProperty, value); + internal set => SetValue(IsOriginProperty, ValueBoxes.BooleanBox(value)); } } } \ No newline at end of file diff --git a/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs b/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs index 1463b2f5..d8270622 100644 --- a/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs +++ b/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs @@ -61,7 +61,7 @@ namespace HandyControl.Controls public bool ShowImage { get => (bool)GetValue(ShowImageProperty); - set => SetValue(ShowImageProperty, value); + set => SetValue(ShowImageProperty, ValueBoxes.BooleanBox(value)); } private MessageBox() diff --git a/src/Shared/HandyControl_Shared/Controls/Window/PopupWindow.cs b/src/Shared/HandyControl_Shared/Controls/Window/PopupWindow.cs index c37ab0f5..dcb20371 100644 --- a/src/Shared/HandyControl_Shared/Controls/Window/PopupWindow.cs +++ b/src/Shared/HandyControl_Shared/Controls/Window/PopupWindow.cs @@ -109,7 +109,7 @@ namespace HandyControl.Controls public bool ShowTitle { get => (bool) GetValue(ShowTitleProperty); - set => SetValue(ShowTitleProperty, value); + set => SetValue(ShowTitleProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty ShowCancelProperty = DependencyProperty.Register( @@ -118,7 +118,7 @@ namespace HandyControl.Controls public bool ShowCancel { get => (bool)GetValue(ShowCancelProperty); - set => SetValue(ShowCancelProperty, value); + set => SetValue(ShowCancelProperty, ValueBoxes.BooleanBox(value)); } public static readonly DependencyProperty ShowBorderProperty = DependencyProperty.Register( @@ -127,7 +127,7 @@ namespace HandyControl.Controls public bool ShowBorder { get => (bool) GetValue(ShowBorderProperty); - set => SetValue(ShowBorderProperty, value); + set => SetValue(ShowBorderProperty, ValueBoxes.BooleanBox(value)); } private void TitleBlock_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e) diff --git a/src/Shared/HandyControl_Shared/Controls/Window/Window.cs b/src/Shared/HandyControl_Shared/Controls/Window/Window.cs index 1d06b075..4447445c 100644 --- a/src/Shared/HandyControl_Shared/Controls/Window/Window.cs +++ b/src/Shared/HandyControl_Shared/Controls/Window/Window.cs @@ -208,7 +208,7 @@ namespace HandyControl.Controls public bool IsFullScreen { get => (bool)GetValue(IsFullScreenProperty); - set => SetValue(IsFullScreenProperty, value); + set => SetValue(IsFullScreenProperty, ValueBoxes.BooleanBox(value)); } public object NonClientAreaContent @@ -256,13 +256,13 @@ namespace HandyControl.Controls public bool ShowNonClientArea { get => (bool)GetValue(ShowNonClientAreaProperty); - set => SetValue(ShowNonClientAreaProperty, value); + set => SetValue(ShowNonClientAreaProperty, ValueBoxes.BooleanBox(value)); } public bool ShowTitle { get => (bool)GetValue(ShowTitleProperty); - set => SetValue(ShowTitleProperty, value); + set => SetValue(ShowTitleProperty, ValueBoxes.BooleanBox(value)); } private static void OnShowNonClientAreaChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) diff --git a/src/Shared/HandyControl_Shared/Interactivity/Behavior/FluidMoveBehavior.cs b/src/Shared/HandyControl_Shared/Interactivity/Behavior/FluidMoveBehavior.cs index 40da23b0..ebf168d9 100644 --- a/src/Shared/HandyControl_Shared/Interactivity/Behavior/FluidMoveBehavior.cs +++ b/src/Shared/HandyControl_Shared/Interactivity/Behavior/FluidMoveBehavior.cs @@ -79,7 +79,7 @@ namespace HandyControl.Interactivity { get => (bool) GetValue(FloatAboveProperty); - set => SetValue(FloatAboveProperty, value); + set => SetValue(FloatAboveProperty, ValueBoxes.BooleanBox(value)); } public TagType InitialTag @@ -283,7 +283,7 @@ namespace HandyControl.Interactivity private static void SetHasTransformWrapper(DependencyObject obj, bool value) { - obj.SetValue(HasTransformWrapperProperty, value); + obj.SetValue(HasTransformWrapperProperty, ValueBoxes.BooleanBox(value)); } private static void SetOverlay(DependencyObject obj, object value) diff --git a/src/Shared/HandyControl_Shared/Interactivity/Behavior/FluidMoveBehaviorBase.cs b/src/Shared/HandyControl_Shared/Interactivity/Behavior/FluidMoveBehaviorBase.cs index cf21a814..de2548a9 100644 --- a/src/Shared/HandyControl_Shared/Interactivity/Behavior/FluidMoveBehaviorBase.cs +++ b/src/Shared/HandyControl_Shared/Interactivity/Behavior/FluidMoveBehaviorBase.cs @@ -46,7 +46,7 @@ namespace HandyControl.Interactivity { get => (bool) GetValue(IsActiveProperty); - set => SetValue(IsActiveProperty, value); + set => SetValue(IsActiveProperty, ValueBoxes.BooleanBox(value)); } protected virtual bool ShouldSkipInitialLayout => diff --git a/src/Shared/HandyControl_Shared/Interactivity/Behavior/MouseDragElementBehavior.cs b/src/Shared/HandyControl_Shared/Interactivity/Behavior/MouseDragElementBehavior.cs index 9245eaf6..17eeba89 100644 --- a/src/Shared/HandyControl_Shared/Interactivity/Behavior/MouseDragElementBehavior.cs +++ b/src/Shared/HandyControl_Shared/Interactivity/Behavior/MouseDragElementBehavior.cs @@ -27,9 +27,8 @@ namespace HandyControl.Interactivity public bool ConstrainToParentBounds { - get => - (bool) GetValue(ConstrainToParentBoundsProperty); - set => SetValue(ConstrainToParentBoundsProperty, value); + get => (bool) GetValue(ConstrainToParentBoundsProperty); + set => SetValue(ConstrainToParentBoundsProperty, ValueBoxes.BooleanBox(value)); } private Rect ElementBounds diff --git a/src/Shared/HandyControl_Shared/Interactivity/Behavior/MouseDragElementBehaviorEx.cs b/src/Shared/HandyControl_Shared/Interactivity/Behavior/MouseDragElementBehaviorEx.cs index 9232676f..27793971 100644 --- a/src/Shared/HandyControl_Shared/Interactivity/Behavior/MouseDragElementBehaviorEx.cs +++ b/src/Shared/HandyControl_Shared/Interactivity/Behavior/MouseDragElementBehaviorEx.cs @@ -50,7 +50,7 @@ namespace HandyControl.Interactivity public bool ConstrainToParentBounds { get => (bool)GetValue(MouseDragElementBehavior.ConstrainToParentBoundsProperty); - set => SetValue(MouseDragElementBehavior.ConstrainToParentBoundsProperty, value); + set => SetValue(MouseDragElementBehavior.ConstrainToParentBoundsProperty, ValueBoxes.BooleanBox(value)); } private Rect ElementBounds diff --git a/src/Shared/HandyControl_Shared/Interactivity/EventToCommand.cs b/src/Shared/HandyControl_Shared/Interactivity/EventToCommand.cs index dca2bfae..7aa3bbe8 100644 --- a/src/Shared/HandyControl_Shared/Interactivity/EventToCommand.cs +++ b/src/Shared/HandyControl_Shared/Interactivity/EventToCommand.cs @@ -96,7 +96,7 @@ namespace HandyControl.Interactivity public bool MustToggleIsEnabled { get => (bool) GetValue(MustToggleIsEnabledProperty); - set => SetValue(MustToggleIsEnabledProperty, value); + set => SetValue(MustToggleIsEnabledProperty, ValueBoxes.BooleanBox(value)); } public bool MustToggleIsEnabledValue @@ -127,7 +127,7 @@ namespace HandyControl.Interactivity public bool AlwaysInvokeCommand { get => (bool) GetValue(AlwaysInvokeCommandProperty); - set => SetValue(AlwaysInvokeCommandProperty, value); + set => SetValue(AlwaysInvokeCommandProperty, ValueBoxes.BooleanBox(value)); } protected override void OnAttached() diff --git a/src/Shared/HandyControl_Shared/Interactivity/ExtendedVisualStateManager.cs b/src/Shared/HandyControl_Shared/Interactivity/ExtendedVisualStateManager.cs index da7abd08..f7e1d436 100644 --- a/src/Shared/HandyControl_Shared/Interactivity/ExtendedVisualStateManager.cs +++ b/src/Shared/HandyControl_Shared/Interactivity/ExtendedVisualStateManager.cs @@ -879,7 +879,7 @@ namespace HandyControl.Interactivity internal static void SetDidCacheBackground(DependencyObject obj, bool value) { - obj.SetValue(DidCacheBackgroundProperty, value); + obj.SetValue(DidCacheBackgroundProperty, ValueBoxes.BooleanBox(value)); } internal static void SetLayoutStoryboard(DependencyObject obj, Storyboard value) @@ -937,7 +937,7 @@ namespace HandyControl.Interactivity public static void SetUseFluidLayout(DependencyObject obj, bool value) { - obj.SetValue(UseFluidLayoutProperty, value); + obj.SetValue(UseFluidLayoutProperty, ValueBoxes.BooleanBox(value)); } private static void StopAnimations() diff --git a/src/Shared/HandyControl_Shared/Interactivity/TriggerAction.cs b/src/Shared/HandyControl_Shared/Interactivity/TriggerAction.cs index c859d6a1..ed18ba45 100644 --- a/src/Shared/HandyControl_Shared/Interactivity/TriggerAction.cs +++ b/src/Shared/HandyControl_Shared/Interactivity/TriggerAction.cs @@ -3,6 +3,7 @@ using System.Globalization; using System.Windows; using System.Windows.Controls.Primitives; using System.Windows.Media.Animation; +using HandyControl.Data; namespace HandyControl.Interactivity { @@ -43,9 +44,8 @@ namespace HandyControl.Interactivity public bool IsEnabled { - get => - (bool) GetValue(IsEnabledProperty); - set => SetValue(IsEnabledProperty, value); + get => (bool) GetValue(IsEnabledProperty); + set => SetValue(IsEnabledProperty, ValueBoxes.BooleanBox(value)); } internal bool IsHosted