Remove obsolete code

Kinnara · Sep 15, 2020 · 8a56ee5 · 8a56ee5
1 parent 89fe988
commit 8a56ee5
Show file tree

Hide file tree

Showing 17 changed files with 2 additions and 623 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>0.9.2-preview.200831.1</Version>
+    <Version>0.9.2-debug.200915.0</Version>
     <Authors>Yimeng Wu</Authors>
     <Product>ModernWPF UI Library</Product>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/ModernWpf.Controls/CommandBar/AppBarButton.cs b/ModernWpf.Controls/CommandBar/AppBarButton.cs
@@ -278,22 +278,6 @@ public string InputGestureText
 
         #endregion
 
-        #region HasInputGestureText
-
-        [Obsolete]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public static readonly DependencyProperty HasInputGestureTextProperty =
-            AppBarElementProperties.HasInputGestureTextProperty.AddOwner(typeof(AppBarButton));
-
-        [Obsolete]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool HasInputGestureText
-        {
-            get => (bool)GetValue(HasInputGestureTextProperty);
-        }
-
-        #endregion
-
         public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();

diff --git a/ModernWpf.Controls/CommandBar/AppBarToggleButton.cs b/ModernWpf.Controls/CommandBar/AppBarToggleButton.cs
@@ -229,35 +229,6 @@ void IAppBarElement.ApplyApplicationViewState()
 
         #endregion
 
-        #region IsCheckedOrIndeterminate
-
-        private static readonly DependencyPropertyKey IsCheckedOrIndeterminatePropertyKey =
-            DependencyProperty.RegisterReadOnly(
-                nameof(IsCheckedOrIndeterminate),
-                typeof(bool),
-                typeof(AppBarToggleButton),
-                new PropertyMetadata(false));
-
-        [Obsolete]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public static readonly DependencyProperty IsCheckedOrIndeterminateProperty =
-            IsCheckedOrIndeterminatePropertyKey.DependencyProperty;
-
-        [Obsolete]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsCheckedOrIndeterminate
-        {
-            get => (bool)GetValue(IsCheckedOrIndeterminateProperty);
-            private set => SetValue(IsCheckedOrIndeterminatePropertyKey, value);
-        }
-
-        private void UpdateIsCheckedOrIndeterminate()
-        {
-            IsCheckedOrIndeterminate = IsChecked != false;
-        }
-
-        #endregion
-
         #region InputGestureText
 
         public static readonly DependencyProperty InputGestureTextProperty =
@@ -271,22 +242,6 @@ public string InputGestureText
 
         #endregion
 
-        #region HasInputGestureText
-
-        [Obsolete]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public static readonly DependencyProperty HasInputGestureTextProperty =
-            AppBarElementProperties.HasInputGestureTextProperty.AddOwner(typeof(AppBarToggleButton));
-
-        [Obsolete]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool HasInputGestureText
-        {
-            get => (bool)GetValue(HasInputGestureTextProperty);
-        }
-
-        #endregion
-
         public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
@@ -343,7 +298,6 @@ private static void OnCommandPropertyChanged(DependencyObject d, DependencyPrope
         private static void OnIsCheckedChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             var button = (AppBarToggleButton)d;
-            button.UpdateIsCheckedOrIndeterminate();
             button.UpdateCommonState();
         }
 

diff --git a/ModernWpf.Controls/ToggleSwitch/ToggleSwitch.cs b/ModernWpf.Controls/ToggleSwitch/ToggleSwitch.cs
@@ -224,29 +224,6 @@ public DataTemplate OnContentTemplate
 
         #endregion
 
-        #region IsPressed
-
-        private static readonly DependencyPropertyKey IsPressedPropertyKey =
-            DependencyProperty.RegisterReadOnly(
-                nameof(IsPressed),
-                typeof(bool),
-                typeof(ToggleSwitch),
-                null);
-
-        [Obsolete]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public static readonly DependencyProperty IsPressedProperty = IsPressedPropertyKey.DependencyProperty;
-
-        [Obsolete]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsPressed
-        {
-            get => (bool)GetValue(IsPressedProperty);
-            private set => SetValue(IsPressedPropertyKey, value);
-        }
-
-        #endregion
-
         #region UseSystemFocusVisuals
 
         public static readonly DependencyProperty UseSystemFocusVisualsProperty =
@@ -403,7 +380,6 @@ private static void OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         private void OnSwitchThumbDragStarted(object sender, DragStartedEventArgs e)
         {
             e.Handled = true;
-            IsPressed = true;
             _startTranslation = KnobTranslateTransform.X;
             UpdateVisualStates(true);
             KnobTranslateTransform.X = _startTranslation;
@@ -423,7 +399,6 @@ private void OnSwitchThumbDragDelta(object sender, DragDeltaEventArgs e)
         private void OnSwitchThumbDragCompleted(object sender, DragCompletedEventArgs e)
         {
             e.Handled = true;
-            IsPressed = false;
             bool click = false;
             if (_wasDragged)
             {
@@ -467,10 +442,6 @@ private void UpdateVisualStates(bool useTransitions)
             {
                 stateName = VisualStates.StateDisabled;
             }
-            else if (IsPressed)
-            {
-                stateName = VisualStates.StatePressed;
-            }
             else if (IsMouseOver)
             {
                 stateName = VisualStates.StateMouseOver;

diff --git a/ModernWpf/ApplicationThemeResources.cs b/ModernWpf/ApplicationThemeResources.cs
diff --git a/ModernWpf/Common/BindableSystemColors.cs b/ModernWpf/Common/BindableSystemColors.cs