diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/BorderElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/BorderElement.cs index 34eca2f6..6ccad89c 100644 --- a/src/Shared/HandyControl_Shared/Controls/Attach/BorderElement.cs +++ b/src/Shared/HandyControl_Shared/Controls/Attach/BorderElement.cs @@ -42,7 +42,7 @@ namespace HandyControl.Controls } public static void SetCircular(DependencyObject element, bool value) - => element.SetValue(CircularProperty, value); + => element.SetValue(CircularProperty, ValueBoxes.BooleanBox(value)); public static bool GetCircular(DependencyObject element) => (bool) element.GetValue(CircularProperty); diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/DataGridAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/DataGridAttach.cs index ec004f40..6b1739e6 100644 --- a/src/Shared/HandyControl_Shared/Controls/Attach/DataGridAttach.cs +++ b/src/Shared/HandyControl_Shared/Controls/Attach/DataGridAttach.cs @@ -41,7 +41,7 @@ namespace HandyControl.Controls } public static void SetApplyDefaultStyle(DependencyObject element, bool value) - => element.SetValue(ApplyDefaultStyleProperty, value); + => element.SetValue(ApplyDefaultStyleProperty, ValueBoxes.BooleanBox(value)); public static bool GetApplyDefaultStyle(DependencyObject element) => (bool) element.GetValue(ApplyDefaultStyleProperty); @@ -253,7 +253,7 @@ namespace HandyControl.Controls public static bool GetShowRowNumber(DependencyObject target) => (bool)target.GetValue(ShowRowNumberProperty); - public static void SetShowRowNumber(DependencyObject target, bool value) => target.SetValue(ShowRowNumberProperty, value); + public static void SetShowRowNumber(DependencyObject target, bool value) => target.SetValue(ShowRowNumberProperty, ValueBoxes.BooleanBox(value)); private static void OnShowRowNumberChanged(DependencyObject target, DependencyPropertyChangedEventArgs e) { diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/DropDownElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/DropDownElement.cs index cb88e93e..8c70594a 100644 --- a/src/Shared/HandyControl_Shared/Controls/Attach/DropDownElement.cs +++ b/src/Shared/HandyControl_Shared/Controls/Attach/DropDownElement.cs @@ -10,7 +10,7 @@ namespace HandyControl.Controls new FrameworkPropertyMetadata(ValueBoxes.TrueBox, FrameworkPropertyMetadataOptions.Inherits)); public static void SetConsistentWidth(DependencyObject element, bool value) - => element.SetValue(ConsistentWidthProperty, value); + => element.SetValue(ConsistentWidthProperty, ValueBoxes.BooleanBox(value)); public static bool GetConsistentWidth(DependencyObject element) => (bool) element.GetValue(ConsistentWidthProperty); diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/EdgeElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/EdgeElement.cs index 7103947c..4c6d33d1 100644 --- a/src/Shared/HandyControl_Shared/Controls/Attach/EdgeElement.cs +++ b/src/Shared/HandyControl_Shared/Controls/Attach/EdgeElement.cs @@ -36,7 +36,7 @@ namespace HandyControl.Controls public static readonly DependencyProperty ShowEdgeContentProperty = DependencyProperty.RegisterAttached( "ShowEdgeContent", typeof(bool), typeof(EdgeElement), new PropertyMetadata(ValueBoxes.FalseBox)); - public static void SetShowEdgeContent(DependencyObject element, bool value) => element.SetValue(ShowEdgeContentProperty, value); + public static void SetShowEdgeContent(DependencyObject element, bool value) => element.SetValue(ShowEdgeContentProperty, ValueBoxes.BooleanBox(value)); public static bool GetShowEdgeContent(DependencyObject element) => (bool) element.GetValue(ShowEdgeContentProperty); diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/InfoElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/InfoElement.cs index 43b0ad00..0b986ed4 100644 --- a/src/Shared/HandyControl_Shared/Controls/Attach/InfoElement.cs +++ b/src/Shared/HandyControl_Shared/Controls/Attach/InfoElement.cs @@ -21,7 +21,7 @@ namespace HandyControl.Controls public static readonly DependencyProperty NecessaryProperty = DependencyProperty.RegisterAttached( "Necessary", typeof(bool), typeof(InfoElement), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.Inherits)); - public static void SetNecessary(DependencyObject element, bool value) => element.SetValue(NecessaryProperty, value); + public static void SetNecessary(DependencyObject element, bool value) => element.SetValue(NecessaryProperty, ValueBoxes.BooleanBox(value)); public static bool GetNecessary(DependencyObject element) => (bool)element.GetValue(NecessaryProperty); diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/PasswordBoxAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/PasswordBoxAttach.cs index 754533ce..203cd162 100644 --- a/src/Shared/HandyControl_Shared/Controls/Attach/PasswordBoxAttach.cs +++ b/src/Shared/HandyControl_Shared/Controls/Attach/PasswordBoxAttach.cs @@ -39,7 +39,7 @@ namespace HandyControl.Controls } } - public static void SetIsMonitoring(DependencyObject element, bool value) => element.SetValue(IsMonitoringProperty, value); + public static void SetIsMonitoring(DependencyObject element, bool value) => element.SetValue(IsMonitoringProperty, ValueBoxes.BooleanBox(value)); public static bool GetIsMonitoring(DependencyObject element) => (bool)element.GetValue(IsMonitoringProperty); diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/RectangleAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/RectangleAttach.cs index dcf8c9ef..4e8e1620 100644 --- a/src/Shared/HandyControl_Shared/Controls/Attach/RectangleAttach.cs +++ b/src/Shared/HandyControl_Shared/Controls/Attach/RectangleAttach.cs @@ -37,7 +37,7 @@ namespace HandyControl.Controls } public static void SetCircular(DependencyObject element, bool value) - => element.SetValue(CircularProperty, value); + => element.SetValue(CircularProperty, ValueBoxes.BooleanBox(value)); public static bool GetCircular(DependencyObject element) => (bool) element.GetValue(CircularProperty); diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/StatusSwitchElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/StatusSwitchElement.cs index 998c88d5..1b82a46a 100644 --- a/src/Shared/HandyControl_Shared/Controls/Attach/StatusSwitchElement.cs +++ b/src/Shared/HandyControl_Shared/Controls/Attach/StatusSwitchElement.cs @@ -21,7 +21,7 @@ namespace HandyControl.Controls public static readonly DependencyProperty HideUncheckedElementProperty = DependencyProperty.RegisterAttached( "HideUncheckedElement", typeof(bool), typeof(StatusSwitchElement), new PropertyMetadata(ValueBoxes.FalseBox)); - public static void SetHideUncheckedElement(DependencyObject element, bool value) => element.SetValue(HideUncheckedElementProperty, value); + public static void SetHideUncheckedElement(DependencyObject element, bool value) => element.SetValue(HideUncheckedElementProperty, ValueBoxes.BooleanBox(value)); public static bool GetHideUncheckedElement(DependencyObject element) => (bool) element.GetValue(HideUncheckedElementProperty); } diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/TextBlockAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/TextBlockAttach.cs index 9311da19..ca5caf7d 100644 --- a/src/Shared/HandyControl_Shared/Controls/Attach/TextBlockAttach.cs +++ b/src/Shared/HandyControl_Shared/Controls/Attach/TextBlockAttach.cs @@ -28,7 +28,7 @@ namespace HandyControl.Controls } public static void SetAutoTooltip(DependencyObject element, bool value) - => element.SetValue(AutoTooltipProperty, value); + => element.SetValue(AutoTooltipProperty, ValueBoxes.BooleanBox(value)); public static bool GetAutoTooltip(DependencyObject element) => (bool) element.GetValue(AutoTooltipProperty); diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/WindowAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/WindowAttach.cs index 848b2327..6b8a5333 100644 --- a/src/Shared/HandyControl_Shared/Controls/Attach/WindowAttach.cs +++ b/src/Shared/HandyControl_Shared/Controls/Attach/WindowAttach.cs @@ -13,7 +13,7 @@ namespace HandyControl.Controls "IsDragElement", typeof(bool), typeof(WindowAttach), new PropertyMetadata(ValueBoxes.FalseBox, OnIsDragElementChanged)); public static void SetIsDragElement(DependencyObject element, bool value) - => element.SetValue(IsDragElementProperty, value); + => element.SetValue(IsDragElementProperty, ValueBoxes.BooleanBox(value)); public static bool GetIsDragElement(DependencyObject element) => (bool) element.GetValue(IsDragElementProperty); @@ -68,7 +68,7 @@ namespace HandyControl.Controls } public static void SetIgnoreAltF4(DependencyObject element, bool value) - => element.SetValue(IgnoreAltF4Property, value); + => element.SetValue(IgnoreAltF4Property, ValueBoxes.BooleanBox(value)); public static bool GetIgnoreAltF4(DependencyObject element) => (bool) element.GetValue(IgnoreAltF4Property); @@ -106,7 +106,7 @@ namespace HandyControl.Controls } public static void SetShowInTaskManager(DependencyObject element, bool value) - => element.SetValue(ShowInTaskManagerProperty, value); + => element.SetValue(ShowInTaskManagerProperty, ValueBoxes.BooleanBox(value)); public static bool GetShowInTaskManager(DependencyObject element) => (bool) element.GetValue(ShowInTaskManagerProperty); diff --git a/src/Shared/HandyControl_Shared/Controls/Base/AdornerElement.cs b/src/Shared/HandyControl_Shared/Controls/Base/AdornerElement.cs index c3fa3241..ffadcf9d 100644 --- a/src/Shared/HandyControl_Shared/Controls/Base/AdornerElement.cs +++ b/src/Shared/HandyControl_Shared/Controls/Base/AdornerElement.cs @@ -50,7 +50,7 @@ namespace HandyControl.Controls "IsInstance", typeof(bool), typeof(AdornerElement), new PropertyMetadata(ValueBoxes.TrueBox)); public static void SetIsInstance(DependencyObject element, bool value) - => element.SetValue(IsInstanceProperty, value); + => element.SetValue(IsInstanceProperty, ValueBoxes.BooleanBox(value)); public static bool GetIsInstance(DependencyObject element) => (bool) element.GetValue(IsInstanceProperty); diff --git a/src/Shared/HandyControl_Shared/Controls/Block/FloatingBlock.cs b/src/Shared/HandyControl_Shared/Controls/Block/FloatingBlock.cs index 3a7287bb..1b3cfd94 100644 --- a/src/Shared/HandyControl_Shared/Controls/Block/FloatingBlock.cs +++ b/src/Shared/HandyControl_Shared/Controls/Block/FloatingBlock.cs @@ -77,7 +77,7 @@ namespace HandyControl.Controls "ReadyToFloat", typeof(bool), typeof(FloatingBlock), new PropertyMetadata(ValueBoxes.FalseBox)); private static void SetReadyToFloat(DependencyObject element, bool value) - => element.SetValue(ReadyToFloatProperty, value); + => element.SetValue(ReadyToFloatProperty, ValueBoxes.BooleanBox(value)); private static bool GetReadyToFloat(DependencyObject element) => (bool)element.GetValue(ReadyToFloatProperty); diff --git a/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs b/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs index 9c830ccb..3bbd8cc1 100644 --- a/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs +++ b/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs @@ -209,7 +209,7 @@ namespace HandyControl.Controls public static string GetToken(DependencyObject element) => (string)element.GetValue(TokenProperty); - public static void SetGrowlParent(DependencyObject element, bool value) => element.SetValue(GrowlParentProperty, value); + public static void SetGrowlParent(DependencyObject element, bool value) => element.SetValue(GrowlParentProperty, ValueBoxes.BooleanBox(value)); public static bool GetGrowlParent(DependencyObject element) => (bool)element.GetValue(GrowlParentProperty); diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Poptip.cs b/src/Shared/HandyControl_Shared/Controls/Other/Poptip.cs index fa4fb387..40faef20 100644 --- a/src/Shared/HandyControl_Shared/Controls/Other/Poptip.cs +++ b/src/Shared/HandyControl_Shared/Controls/Other/Poptip.cs @@ -137,7 +137,7 @@ namespace HandyControl.Controls } public static void SetIsOpen(DependencyObject element, bool value) - => element.SetValue(IsOpenProperty, value); + => element.SetValue(IsOpenProperty, ValueBoxes.BooleanBox(value)); public static bool GetIsOpen(DependencyObject element) => (bool) element.GetValue(IsOpenProperty); diff --git a/src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs b/src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs index bf504810..e39d662b 100644 --- a/src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs +++ b/src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs @@ -145,15 +145,9 @@ namespace HandyControl.Controls public static readonly DependencyProperty IsInertiaEnabledProperty = DependencyProperty.RegisterAttached( "IsInertiaEnabled", typeof(bool), typeof(ScrollViewer), new PropertyMetadata(ValueBoxes.FalseBox)); - public static void SetIsInertiaEnabled(DependencyObject element, bool value) - { - element.SetValue(IsInertiaEnabledProperty, value); - } + public static void SetIsInertiaEnabled(DependencyObject element, bool value) => element.SetValue(IsInertiaEnabledProperty, ValueBoxes.BooleanBox(value)); - public static bool GetIsInertiaEnabled(DependencyObject element) - { - return (bool)element.GetValue(IsInertiaEnabledProperty); - } + public static bool GetIsInertiaEnabled(DependencyObject element) => (bool)element.GetValue(IsInertiaEnabledProperty); /// /// 是否支持惯性 @@ -179,15 +173,9 @@ namespace HandyControl.Controls set => SetValue(IsPenetratingProperty, value); } - public static void SetIsPenetrating(DependencyObject element, bool value) - { - element.SetValue(IsPenetratingProperty, value); - } + public static void SetIsPenetrating(DependencyObject element, bool value) => element.SetValue(IsPenetratingProperty, ValueBoxes.BooleanBox(value)); - public static bool GetIsPenetrating(DependencyObject element) - { - return (bool) element.GetValue(IsPenetratingProperty); - } + public static bool GetIsPenetrating(DependencyObject element) => (bool) element.GetValue(IsPenetratingProperty); /// /// 当前垂直滚动偏移 diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs b/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs index 7d4dffad..247b7d46 100644 --- a/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs +++ b/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs @@ -23,7 +23,7 @@ namespace HandyControl.Controls "AlignLeftWithPanel", typeof(bool), typeof(RelativePanel), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsRender)); public static void SetAlignLeftWithPanel(DependencyObject element, bool value) - => element.SetValue(AlignLeftWithPanelProperty, value); + => element.SetValue(AlignLeftWithPanelProperty, ValueBoxes.BooleanBox(value)); public static bool GetAlignLeftWithPanel(DependencyObject element) => (bool) element.GetValue(AlignLeftWithPanelProperty); @@ -32,7 +32,7 @@ namespace HandyControl.Controls "AlignTopWithPanel", typeof(bool), typeof(RelativePanel), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsRender)); public static void SetAlignTopWithPanel(DependencyObject element, bool value) - => element.SetValue(AlignTopWithPanelProperty, value); + => element.SetValue(AlignTopWithPanelProperty, ValueBoxes.BooleanBox(value)); public static bool GetAlignTopWithPanel(DependencyObject element) => (bool) element.GetValue(AlignTopWithPanelProperty); @@ -41,7 +41,7 @@ namespace HandyControl.Controls "AlignRightWithPanel", typeof(bool), typeof(RelativePanel), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsRender)); public static void SetAlignRightWithPanel(DependencyObject element, bool value) - => element.SetValue(AlignRightWithPanelProperty, value); + => element.SetValue(AlignRightWithPanelProperty, ValueBoxes.BooleanBox(value)); public static bool GetAlignRightWithPanel(DependencyObject element) => (bool) element.GetValue(AlignRightWithPanelProperty); @@ -50,7 +50,7 @@ namespace HandyControl.Controls "AlignBottomWithPanel", typeof(bool), typeof(RelativePanel), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsRender)); public static void SetAlignBottomWithPanel(DependencyObject element, bool value) - => element.SetValue(AlignBottomWithPanelProperty, value); + => element.SetValue(AlignBottomWithPanelProperty, ValueBoxes.BooleanBox(value)); public static bool GetAlignBottomWithPanel(DependencyObject element) => (bool) element.GetValue(AlignBottomWithPanelProperty); @@ -151,7 +151,7 @@ namespace HandyControl.Controls "AlignHorizontalCenterWithPanel", typeof(bool), typeof(RelativePanel), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsRender)); public static void SetAlignHorizontalCenterWithPanel(DependencyObject element, bool value) - => element.SetValue(AlignHorizontalCenterWithPanelProperty, value); + => element.SetValue(AlignHorizontalCenterWithPanelProperty, ValueBoxes.BooleanBox(value)); public static bool GetAlignHorizontalCenterWithPanel(DependencyObject element) => (bool)element.GetValue(AlignHorizontalCenterWithPanelProperty); @@ -160,7 +160,7 @@ namespace HandyControl.Controls "AlignVerticalCenterWithPanel", typeof(bool), typeof(RelativePanel), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsRender)); public static void SetAlignVerticalCenterWithPanel(DependencyObject element, bool value) - => element.SetValue(AlignVerticalCenterWithPanelProperty, value); + => element.SetValue(AlignVerticalCenterWithPanelProperty, ValueBoxes.BooleanBox(value)); public static bool GetAlignVerticalCenterWithPanel(DependencyObject element) => (bool)element.GetValue(AlignVerticalCenterWithPanelProperty); diff --git a/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs b/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs index e5d1fb8c..0ab1ca18 100644 --- a/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs +++ b/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs @@ -84,7 +84,7 @@ namespace HandyControl.Controls "ShowCloseButton", typeof(bool), typeof(TabControl), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.Inherits)); public static void SetShowCloseButton(DependencyObject element, bool value) - => element.SetValue(ShowCloseButtonProperty, value); + => element.SetValue(ShowCloseButtonProperty, ValueBoxes.BooleanBox(value)); public static bool GetShowCloseButton(DependencyObject element) => (bool) element.GetValue(ShowCloseButtonProperty); @@ -105,7 +105,7 @@ namespace HandyControl.Controls "ShowContextMenu", typeof(bool), typeof(TabControl), new FrameworkPropertyMetadata(ValueBoxes.TrueBox, FrameworkPropertyMetadataOptions.Inherits)); public static void SetShowContextMenu(DependencyObject element, bool value) - => element.SetValue(ShowContextMenuProperty, value); + => element.SetValue(ShowContextMenuProperty, ValueBoxes.BooleanBox(value)); public static bool GetShowContextMenu(DependencyObject element) => (bool) element.GetValue(ShowContextMenuProperty); diff --git a/src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs b/src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs index ca35a03c..3fb337b5 100644 --- a/src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs +++ b/src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs @@ -145,7 +145,7 @@ namespace HandyControl.Controls } public static void SetShowCloseButton(DependencyObject element, bool value) - => element.SetValue(ShowCloseButtonProperty, value); + => element.SetValue(ShowCloseButtonProperty, ValueBoxes.BooleanBox(value)); public static bool GetShowCloseButton(DependencyObject element) => (bool)element.GetValue(ShowCloseButtonProperty); @@ -177,7 +177,7 @@ namespace HandyControl.Controls } public static void SetShowContextMenu(DependencyObject element, bool value) - => element.SetValue(ShowContextMenuProperty, value); + => element.SetValue(ShowContextMenuProperty, ValueBoxes.BooleanBox(value)); public static bool GetShowContextMenu(DependencyObject element) => (bool)element.GetValue(ShowContextMenuProperty); diff --git a/src/Shared/HandyControl_Shared/Tools/GlobalShortcut.cs b/src/Shared/HandyControl_Shared/Tools/GlobalShortcut.cs index cceb1a58..b586e51f 100644 --- a/src/Shared/HandyControl_Shared/Tools/GlobalShortcut.cs +++ b/src/Shared/HandyControl_Shared/Tools/GlobalShortcut.cs @@ -104,7 +104,7 @@ namespace HandyControl.Tools } public static void SetHost(DependencyObject element, bool value) - => element.SetValue(HostProperty, value); + => element.SetValue(HostProperty, ValueBoxes.BooleanBox(value)); public static bool GetHost(DependencyObject element) => (bool) element.GetValue(HostProperty);