diff --git a/src/Core_30/HandyControl_Core_30/Themes/Styles/Base/TreeViewBaseStyle.xaml b/src/Core_30/HandyControl_Core_30/Themes/Styles/Base/TreeViewBaseStyle.xaml
index 8050e2b6..b556d943 100644
--- a/src/Core_30/HandyControl_Core_30/Themes/Styles/Base/TreeViewBaseStyle.xaml
+++ b/src/Core_30/HandyControl_Core_30/Themes/Styles/Base/TreeViewBaseStyle.xaml
@@ -103,7 +103,7 @@
-
+
@@ -111,7 +111,7 @@
-
+
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml
index af4a3db6..6c9f43c3 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml
@@ -103,14 +103,14 @@
-
+
-
+
diff --git a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Base/TreeViewBaseStyle.xaml b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Base/TreeViewBaseStyle.xaml
index 8050e2b6..b556d943 100644
--- a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Base/TreeViewBaseStyle.xaml
+++ b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Base/TreeViewBaseStyle.xaml
@@ -103,7 +103,7 @@
-
+
@@ -111,7 +111,7 @@
-
+
diff --git a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml
index 867219d7..36c4906d 100644
--- a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml
+++ b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml
@@ -35,7 +35,7 @@
-
+
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GotoTopDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GotoTopDemoCtl.xaml
index 6ccca191..6ab499a8 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GotoTopDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GotoTopDemoCtl.xaml
@@ -5,7 +5,7 @@
Background="{DynamicResource RegionBrush}">
-
+
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScrollViewerDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScrollViewerDemoCtl.xaml
index f3838904..b65a090a 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScrollViewerDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScrollViewerDemoCtl.xaml
@@ -13,7 +13,7 @@
-
+
@@ -44,7 +44,7 @@
-
+
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml
index 6492bb1e..98f7378d 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml
@@ -40,12 +40,12 @@
-
+
-
+
-
+
@@ -68,7 +68,7 @@
-
+
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml
index 36596d31..efed5131 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml
@@ -1,4 +1,4 @@
-
-
+
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RepeatButtonDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RepeatButtonDemoCtl.xaml
index 9ee471ed..f15c75d2 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RepeatButtonDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RepeatButtonDemoCtl.xaml
@@ -5,7 +5,7 @@
xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
Background="{DynamicResource RegionBrush}">
-
+
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml
index 34ec4516..a184c7ae 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml
@@ -5,7 +5,7 @@
xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
xmlns:hc="https://handyorg.github.io/handycontrol">
-
+
diff --git a/src/Shared/HandyControlDemo_Shared/Window/GrowlDemoWindow.xaml b/src/Shared/HandyControlDemo_Shared/Window/GrowlDemoWindow.xaml
index 99f46bf7..498734aa 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/GrowlDemoWindow.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Window/GrowlDemoWindow.xaml
@@ -19,7 +19,7 @@
-
+
diff --git a/src/Shared/HandyControl_Shared/Controls/Growl/GrowlWindow.cs b/src/Shared/HandyControl_Shared/Controls/Growl/GrowlWindow.cs
index ff968638..59e1214d 100644
--- a/src/Shared/HandyControl_Shared/Controls/Growl/GrowlWindow.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Growl/GrowlWindow.cs
@@ -21,7 +21,7 @@ namespace HandyControl.Controls
Content = new ScrollViewer
{
VerticalScrollBarVisibility = ScrollBarVisibility.Hidden,
- IsEnableInertia = true,
+ IsInertiaEnabled = true,
Content = GrowlPanel
};
}
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/GotoTop.cs b/src/Shared/HandyControl_Shared/Controls/Other/GotoTop.cs
index 63df976c..0d5ea363 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/GotoTop.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/GotoTop.cs
@@ -35,7 +35,7 @@ namespace HandyControl.Controls
{
_scrollViewer.ScrollChanged += ScrollViewer_ScrollChanged;
- if (_scrollViewer is ScrollViewer scrollViewerHandy && Animated && scrollViewerHandy.IsEnableInertia)
+ if (_scrollViewer is ScrollViewer scrollViewerHandy && Animated && scrollViewerHandy.IsInertiaEnabled)
{
_gotoTopAction = () => scrollViewerHandy.ScrollToTopInternal(AnimationTime);
}
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs b/src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs
index 764f4c3e..bf504810 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs
@@ -51,7 +51,7 @@ namespace HandyControl.Controls
{
if (!CanMouseWheel) return;
- if (!IsEnableInertia)
+ if (!IsInertiaEnabled)
{
if (Orientation == Orientation.Vertical)
{
@@ -142,26 +142,26 @@ namespace HandyControl.Controls
///
/// 是否支持惯性
///
- public static readonly DependencyProperty IsEnableInertiaProperty = DependencyProperty.RegisterAttached(
- "IsEnableInertia", typeof(bool), typeof(ScrollViewer), new PropertyMetadata(ValueBoxes.FalseBox));
+ public static readonly DependencyProperty IsInertiaEnabledProperty = DependencyProperty.RegisterAttached(
+ "IsInertiaEnabled", typeof(bool), typeof(ScrollViewer), new PropertyMetadata(ValueBoxes.FalseBox));
- public static void SetIsEnableInertia(DependencyObject element, bool value)
+ public static void SetIsInertiaEnabled(DependencyObject element, bool value)
{
- element.SetValue(IsEnableInertiaProperty, value);
+ element.SetValue(IsInertiaEnabledProperty, value);
}
- public static bool GetIsEnableInertia(DependencyObject element)
+ public static bool GetIsInertiaEnabled(DependencyObject element)
{
- return (bool)element.GetValue(IsEnableInertiaProperty);
+ return (bool)element.GetValue(IsInertiaEnabledProperty);
}
///
/// 是否支持惯性
///
- public bool IsEnableInertia
+ public bool IsInertiaEnabled
{
- get => (bool) GetValue(IsEnableInertiaProperty);
- set => SetValue(IsEnableInertiaProperty, value);
+ get => (bool) GetValue(IsInertiaEnabledProperty);
+ set => SetValue(IsInertiaEnabledProperty, value);
}
///
diff --git a/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs b/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs
index fb717a52..bcef77e1 100644
--- a/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs
+++ b/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs
@@ -50,16 +50,16 @@ namespace HandyControl.Controls
///
/// 是否启用动画
///
- public static readonly DependencyProperty IsEnableAnimationProperty = DependencyProperty.Register(
- "IsEnableAnimation", typeof(bool), typeof(TabControl), new PropertyMetadata(ValueBoxes.FalseBox));
+ public static readonly DependencyProperty IsAnimationEnabledProperty = DependencyProperty.Register(
+ "IsAnimationEnabled", typeof(bool), typeof(TabControl), new PropertyMetadata(ValueBoxes.FalseBox));
///
/// 是否启用动画
///
- public bool IsEnableAnimation
+ public bool IsAnimationEnabled
{
- get => (bool)GetValue(IsEnableAnimationProperty);
- set => SetValue(IsEnableAnimationProperty, value);
+ get => (bool)GetValue(IsAnimationEnabledProperty);
+ set => SetValue(IsAnimationEnabledProperty, value);
}
///
@@ -122,16 +122,16 @@ namespace HandyControl.Controls
///
/// 是否将标签填充
///
- public static readonly DependencyProperty IsEnableTabFillProperty = DependencyProperty.Register(
- "IsEnableTabFill", typeof(bool), typeof(TabControl), new PropertyMetadata(ValueBoxes.FalseBox));
+ public static readonly DependencyProperty IsTabFillEnabledProperty = DependencyProperty.Register(
+ "IsTabFillEnabled", typeof(bool), typeof(TabControl), new PropertyMetadata(ValueBoxes.FalseBox));
///
/// 是否将标签填充
///
- public bool IsEnableTabFill
+ public bool IsTabFillEnabled
{
- get => (bool)GetValue(IsEnableTabFillProperty);
- set => SetValue(IsEnableTabFillProperty, value);
+ get => (bool)GetValue(IsTabFillEnabledProperty);
+ set => SetValue(IsTabFillEnabledProperty, value);
}
///
@@ -224,7 +224,7 @@ namespace HandyControl.Controls
return;
}
- if (!IsEnableTabFill)
+ if (!IsTabFillEnabled)
{
_itemShowCount = (int)(ActualWidth / TabItemWidth);
_buttonOverflow?.Show(ShowOverflowButton && Items.Count > 0 && Items.Count >= _itemShowCount);
@@ -236,7 +236,7 @@ namespace HandyControl.Controls
return;
}
- if (IsEnableAnimation)
+ if (IsAnimationEnabled)
{
HeaderPanel.SetCurrentValue(TabPanel.FluidMoveDurationProperty, new Duration(TimeSpan.FromMilliseconds(200)));
}
@@ -279,7 +279,7 @@ namespace HandyControl.Controls
base.OnApplyTemplate();
HeaderPanel = GetTemplateChild(HeaderPanelKey) as TabPanel;
- if (IsEnableTabFill) return;
+ if (IsTabFillEnabled) return;
_buttonOverflow = GetTemplateChild(OverflowButtonKey) as ContextMenuToggleButton;
_scrollViewerOverflow = GetTemplateChild(OverflowScrollviewer) as ScrollViewer;
@@ -357,7 +357,7 @@ namespace HandyControl.Controls
{
list.Remove(actualItem);
list.Insert(0, actualItem);
- if (IsEnableAnimation)
+ if (IsAnimationEnabled)
{
HeaderPanel.SetCurrentValue(TabPanel.FluidMoveDurationProperty, new Duration(TimeSpan.FromMilliseconds(200)));
}
diff --git a/src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs b/src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs
index 2df33a1b..ceddf142 100644
--- a/src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs
+++ b/src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs
@@ -278,7 +278,7 @@ namespace HandyControl.Controls
RaiseEvent(argsClosing);
if (argsClosing.Cancel) return;
- TabPanel.SetCurrentValue(TabPanel.FluidMoveDurationProperty, parent.IsEnableAnimation
+ TabPanel.SetCurrentValue(TabPanel.FluidMoveDurationProperty, parent.IsAnimationEnabled
? new Duration(TimeSpan.FromMilliseconds(200))
: new Duration(TimeSpan.FromMilliseconds(1)));
@@ -419,7 +419,7 @@ namespace HandyControl.Controls
}
TargetOffsetX = resultX;
- if (!parent.IsEnableAnimation)
+ if (!parent.IsAnimationEnabled)
{
AnimationCompleted();
return;
diff --git a/src/Shared/HandyControl_Shared/Controls/TabControl/TabPanel.cs b/src/Shared/HandyControl_Shared/Controls/TabControl/TabPanel.cs
index 24583074..ec7c5bd5 100644
--- a/src/Shared/HandyControl_Shared/Controls/TabControl/TabPanel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/TabControl/TabPanel.cs
@@ -40,16 +40,16 @@ namespace HandyControl.Controls
///
/// 是否将标签填充
///
- public static readonly DependencyProperty IsEnableTabFillProperty = DependencyProperty.Register(
- "IsEnableTabFill", typeof(bool), typeof(TabPanel), new PropertyMetadata(ValueBoxes.FalseBox));
+ public static readonly DependencyProperty IsTabFillEnabledProperty = DependencyProperty.Register(
+ "IsTabFillEnabled", typeof(bool), typeof(TabPanel), new PropertyMetadata(ValueBoxes.FalseBox));
///
/// 是否将标签填充
///
- public bool IsEnableTabFill
+ public bool IsTabFillEnabled
{
- get => (bool)GetValue(IsEnableTabFillProperty);
- set => SetValue(IsEnableTabFillProperty, value);
+ get => (bool)GetValue(IsTabFillEnabledProperty);
+ set => SetValue(IsTabFillEnabledProperty, value);
}
///
@@ -115,7 +115,7 @@ namespace HandyControl.Controls
var itemWidth = .0;
var arr = new int[count];
- if (!IsEnableTabFill)
+ if (!IsTabFillEnabled)
{
itemWidth = TabItemWidth;
}
@@ -129,7 +129,7 @@ namespace HandyControl.Controls
for (var index = 0; index < count; index++)
{
- if (IsEnableTabFill)
+ if (IsTabFillEnabled)
{
itemWidth = arr[index];
}
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml
index e79e7cb3..73da8568 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml
@@ -91,7 +91,7 @@
-
+
@@ -129,9 +129,9 @@
-
+
-
+
@@ -171,7 +171,7 @@
-
+