Removed caches

0x5bfa · 0x5bfa · commit 6316fe143319 · 2024-08-15T13:50:14.000+09:00
diff --git a/src/Files.App.Controls/ThemedIcon/ThemedIcon.Properties.cs b/src/Files.App.Controls/ThemedIcon/ThemedIcon.Properties.cs
@@ -179,7 +179,7 @@ public ThemedIconColorType IconColorType
 
 		// <summary>
 		/// Gets or sets a value indicating the Icon's design size.
-		/// </summary>        
+		/// </summary>
 		public double IconSize
 		{
 			get => (double)GetValue(IconSizeProperty);
@@ -190,16 +190,16 @@ public double IconSize
 
 		/// <summary>
 		/// Gets or sets a value indicating whether the Icon should use Toggled states.
-		/// </summary>        
+		/// </summary>
 		public ToggleBehaviors ToggleBehavior
 		{
-			get => (ToggleBehaviors)GetValue( ToggleBehaviorProperty );
-			set => SetValue( ToggleBehaviorProperty , value);
+			get => (ToggleBehaviors)GetValue(ToggleBehaviorProperty);
+			set => SetValue(ToggleBehaviorProperty, value);
 		}
 
 		/// <summary>
 		/// Gets or sets a value indicating whether the Icon should use Filled states.
-		/// </summary>        
+		/// </summary>
 		public bool IsFilled
 		{
 			get => (bool)GetValue(IsFilledProperty);
@@ -208,7 +208,7 @@ public bool IsFilled
 
 		/// <summary>
 		/// Gets or sets a value indicating whether the Icon is in HighContrast state.
-		/// </summary>        
+		/// </summary>
 		public bool IsHighContrast
 		{
 			get => (bool)GetValue(IsHighContrastProperty);
@@ -246,7 +246,7 @@ protected virtual void OnOutlineIconPropertyChanged(string oldValue, string newV
 		protected virtual void OnColorPropertyChanged(Brush oldValue, Brush newValue)
 		{
 			UpdateIconTypeStates();
-		}		
+		}
 
 		// Enum changed events
 
@@ -261,27 +261,27 @@ protected virtual void OnIconColorTypePropertyChanged(ThemedIconColorType oldVal
 		}
 
 		// Double changed events
-		
+
 		protected virtual void OnIconSizePropertyChanged(double oldValue, double newValue)
 		{
-			IconSizePropertyChanged(newValue);
+			IconSizePropertyChanged();
 		}
 
 		// Boolean changed events
 
-		protected virtual void OnToggleBehaviorPropertyChanged(ToggleBehaviors oldValue , ToggleBehaviors newValue)
+		protected virtual void OnToggleBehaviorPropertyChanged(ToggleBehaviors oldValue, ToggleBehaviors newValue)
 		{
-			ToggleBehaviorChanged(newValue);
+			ToggleBehaviorChanged();
 		}
 
 		protected virtual void OnIsFilledPropertyChanged(bool oldValue, bool newValue)
 		{
-			FilledChanged(newValue);
+			FilledChanged();
 		}
 
 		protected virtual void OnIsHighContrastPropertyChanged(bool oldValue, bool newValue)
 		{
-			HighContrastChanged(newValue);
+			HighContrastChanged();
 		}
 
 		// Object changed events
diff --git a/src/Files.App.Controls/ThemedIcon/ThemedIcon.cs b/src/Files.App.Controls/ThemedIcon/ThemedIcon.cs
@@ -18,16 +18,12 @@ namespace Files.App.Controls
 	/// </summary>
 	public partial class ThemedIcon : Control
 	{
-		private bool				_isHighContrast;
-		private ToggleBehaviors		_toggleBehavior;
-		private bool				_ownerToggled;
-		private bool				_isEnabled;
-		private bool				_isFilled;
-		private double				_iconSize;
-
-		private ToggleButton?		ownerToggleButton		= null;
+		private bool _ownerToggled;
+		private bool _isEnabled;
+
+		private ToggleButton? ownerToggleButton = null;
 		private AppBarToggleButton? ownerAppBarToggleButton = null;
-		private Control?			ownerControl			= null;
+		private Control? ownerControl = null;
 
 		public ThemedIcon()
 		{
@@ -100,7 +96,7 @@ private void UpdateLayeredIconContent()
 						Foreground = this.Foreground,
 						HorizontalAlignment = HorizontalAlignment.Stretch,
 						VerticalAlignment = VerticalAlignment.Stretch,
-						LayerSize = _iconSize,
+						LayerSize = IconSize,
 						Width = layer.LayerSize,
 						Height = layer.LayerSize
 
@@ -120,8 +116,8 @@ private void SetPathData(string partName, string pathData, FrameworkElement elem
 			if (GetTemplateChild(partName) is Path path)
 			{
 				path.Data = geometry;
-				path.Width = _iconSize;
-				path.Height = _iconSize;
+				path.Width = IconSize;
+				path.Height = IconSize;
 			}
 		}
 
@@ -152,7 +148,7 @@ private void FindOwnerControlStates()
 				ownerToggleButton.Checked += OwnerControl_IsCheckedChanged;
 				ownerToggleButton.Unchecked += OwnerControl_IsCheckedChanged;
 
-				UpdateOwnerToggle( ownerToggleButton.IsChecked is true);
+				UpdateOwnerToggle(ownerToggleButton.IsChecked is true);
 			}
 
 			ownerAppBarToggleButton = this.FindAscendant<AppBarToggleButton>();
@@ -162,7 +158,7 @@ private void FindOwnerControlStates()
 				ownerAppBarToggleButton.Checked += OwnerControl_IsCheckedChanged;
 				ownerAppBarToggleButton.Unchecked += OwnerControl_IsCheckedChanged;
 
-				UpdateOwnerToggle( ownerAppBarToggleButton.IsChecked is true);
+				UpdateOwnerToggle(ownerAppBarToggleButton.IsChecked is true);
 			}
 
 			ownerControl = this.FindAscendant<Control>();
@@ -182,9 +178,9 @@ private void OwnerControl_IsCheckedChanged(object sender, RoutedEventArgs e)
 				return;
 
 			if (ownerToggleButton is not null)
-				UpdateOwnerToggle( ownerToggleButton.IsChecked is true);
+				UpdateOwnerToggle(ownerToggleButton.IsChecked is true);
 			else if (ownerAppBarToggleButton is not null)
-				UpdateOwnerToggle( ownerAppBarToggleButton.IsChecked is true);
+				UpdateOwnerToggle(ownerAppBarToggleButton.IsChecked is true);
 		}
 
 		private void OwnerControl_IsEnabledChanged(object sender, DependencyPropertyChangedEventArgs e)
@@ -196,11 +192,8 @@ private void OwnerControl_IsEnabledChanged(object sender, DependencyPropertyChan
 			EnabledChanged(ownerControl.IsEnabled);
 		}
 
-		private void ToggleBehaviorChanged(ToggleBehaviors value)
+		private void ToggleBehaviorChanged()
 		{
-			// Handles the IsToggled property change
-			_toggleBehavior = value;
-
 			UpdateVisualStates();
 		}
 
@@ -211,11 +204,8 @@ private void UpdateOwnerToggle(bool isToggled)
 			UpdateVisualStates();
 		}
 
-		private void FilledChanged(bool value)
+		private void FilledChanged()
 		{
-			// Handles the IsToggled property change
-			_isFilled = value;
-
 			UpdateVisualStates();
 		}
 
@@ -230,15 +220,11 @@ private void OnSizeChanged(object sender, SizeChangedEventArgs e)
 			// Handles resizing of child layers when Width and Height properties change
 		}
 
-		private void IconSizePropertyChanged(double value)
+		private void IconSizePropertyChanged()
 		{
-			// Code to handle the design time Icon Size changing
-			_iconSize = value;
-
 			UpdateVisualStates();
 		}
 
-
 		private void EnabledChanged(bool value)
 		{
 			// Handles the IsEnabled property change
@@ -247,37 +233,25 @@ private void EnabledChanged(bool value)
 			UpdateVisualStates();
 		}
 
-		private void ThemeSettings_OnHighContrastChanged(object sender, bool e)
-		{
-			HighContrastChanged(e);
-		}
-
-		private void HighContrastChanged(bool value)
+		private void HighContrastChanged()
 		{
-			// handles HighContrast property change
-			_isHighContrast = value;
-
 			UpdateVisualStates();
 		}
 
 		private void InitialIconStateValues()
 		{
 			_isEnabled = IsEnabled;
-			_toggleBehavior = ToggleBehavior;
-			_isHighContrast = IsHighContrast;
-			_iconSize = IconSize;
 		}
 
 		private void UpdateIconStates()
 		{
-			ToggleBehaviorChanged(_toggleBehavior);
 			EnabledChanged(_isEnabled);
-			HighContrastChanged(_isHighContrast);
+
+			UpdateVisualStates();
 		}
 
 		private void UpdateVisualStates()
 		{
-			// Updates all Icon Visual States.
 			UpdateIconTypeStates();
 			UpdateIconColorTypeStates();
 		}
@@ -287,59 +261,59 @@ private void UpdateIconTypeStates()
 			// Handles changes to the IconType and setting the correct Visual States.
 
 			// If ToggleBehavior is Auto, we check for _ownerToggle
-			if ( _toggleBehavior == ToggleBehaviors.Auto )
+			if (ToggleBehavior == ToggleBehaviors.Auto)
 			{
-				if ( _ownerToggled is true || _isFilled is true || IsFilled is true )
+				if (_ownerToggled is true || IsFilled is true)
 				{
-					VisualStateManager.GoToState( this , FilledTypeStateName , true );
+					VisualStateManager.GoToState(this, FilledTypeStateName, true);
 					return;
 				}
-				else if ( _isHighContrast is true || IsHighContrast is true || _isEnabled is false || IsEnabled is false )
+				else if (IsHighContrast is true || _isEnabled is false || IsEnabled is false)
 				{
-					VisualStateManager.GoToState( this , OutlineTypeStateName , true );
-					VisualStateManager.GoToState( this , DisabledStateName , true );
+					VisualStateManager.GoToState(this, OutlineTypeStateName, true);
+					VisualStateManager.GoToState(this, DisabledStateName, true);
 					return;
 				}
 				else
 				{
-					if ( IconType == ThemedIconTypes.Layered )
+					if (IconType == ThemedIconTypes.Layered)
 					{
-						VisualStateManager.GoToState( this , LayeredTypeStateName , true );
+						VisualStateManager.GoToState(this, LayeredTypeStateName, true);
 					}
 					else
 					{
-						VisualStateManager.GoToState( this , OutlineTypeStateName , true );
+						VisualStateManager.GoToState(this, OutlineTypeStateName, true);
 					}
 				}
 			}
 			// If ToggleBehavior is On, we only go to Filled.
-			else if ( _toggleBehavior == ToggleBehaviors.On )
+			else if (ToggleBehavior == ToggleBehaviors.On)
 			{
-				VisualStateManager.GoToState( this , FilledTypeStateName , true );
+				VisualStateManager.GoToState(this, FilledTypeStateName, true);
 			}
 			// For Off, we don't respond to _ownerToggle at all
 			else
 			{
-				if ( _isFilled is true || IsFilled is true )
+				if (IsFilled is true)
 				{
-					VisualStateManager.GoToState( this , FilledTypeStateName , true );
+					VisualStateManager.GoToState(this, FilledTypeStateName, true);
 					return;
 				}
-				else if ( _isHighContrast is true || IsHighContrast is true || _isEnabled is false || IsEnabled is false )
+				else if (IsHighContrast is true || _isEnabled is false || IsEnabled is false)
 				{
-					VisualStateManager.GoToState( this , OutlineTypeStateName , true );
-					VisualStateManager.GoToState( this , DisabledStateName , true );
+					VisualStateManager.GoToState(this, OutlineTypeStateName, true);
+					VisualStateManager.GoToState(this, DisabledStateName, true);
 					return;
 				}
 				else
 				{
-					if ( IconType == ThemedIconTypes.Layered )
+					if (IconType == ThemedIconTypes.Layered)
 					{
-						VisualStateManager.GoToState( this , LayeredTypeStateName , true );
+						VisualStateManager.GoToState(this, LayeredTypeStateName, true);
 					}
 					else
 					{
-						VisualStateManager.GoToState( this , OutlineTypeStateName , true );
+						VisualStateManager.GoToState(this, OutlineTypeStateName, true);
 					}
 				}
 			}
@@ -355,33 +329,33 @@ private void UpdateIconColorTypeStates()
 			if (_isEnabled is false || IsEnabled is false)
 			{
 				// If ToggleBehavior is Auto and _ownerToggled is true
-				if ( _toggleBehavior == ToggleBehaviors.Auto && _ownerToggled is true )
+				if (ToggleBehavior == ToggleBehaviors.Auto && _ownerToggled is true)
 				{
-					VisualStateManager.GoToState( this , DisabledToggleColorStateName , true );
+					VisualStateManager.GoToState(this, DisabledToggleColorStateName, true);
 				}
 				// If ToggleBehavior is On
-				else if ( _toggleBehavior == ToggleBehaviors.On )
+				else if (ToggleBehavior == ToggleBehaviors.On)
 				{
-					VisualStateManager.GoToState( this , DisabledToggleColorStateName , true );
+					VisualStateManager.GoToState(this, DisabledToggleColorStateName, true);
 				}
 				// everything else uses Disabled Color
 				else
 				{
-					VisualStateManager.GoToState( this , DisabledColorStateName , true );
+					VisualStateManager.GoToState(this, DisabledColorStateName, true);
 				}
 			}
 			// Everything else is Enabled
 			else
 			{
 				// If ToggleBehavior is Auto and _ownerToggled is true
-				if ( _toggleBehavior == ToggleBehaviors.Auto && _ownerToggled is true )
+				if (ToggleBehavior == ToggleBehaviors.Auto && _ownerToggled is true)
 				{
 					VisualStateManager.GoToState(this, ToggleStateName, true);
 				}
 				// If ToggleBehavior is On
-				else if ( _toggleBehavior == ToggleBehaviors.On )
+				else if (ToggleBehavior == ToggleBehaviors.On)
 				{
-					VisualStateManager.GoToState( this , ToggleStateName , true );
+					VisualStateManager.GoToState(this, ToggleStateName, true);
 				}
 				// everything else uses the appropriate color state
 				else

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ public ThemedIconColorType IconColorType`
`179`	`179`
`180`	`180`	`// <summary>`
`181`	`181`	`/// Gets or sets a value indicating the Icon's design size.`
`182`		`- /// </summary>`
	`182`	`+ /// </summary>`
`183`	`183`	`public double IconSize`
`184`	`184`	`{`
`185`	`185`	`get => (double)GetValue(IconSizeProperty);`
`@@ -190,16 +190,16 @@ public double IconSize`
`190`	`190`
`191`	`191`	`/// <summary>`
`192`	`192`	`/// Gets or sets a value indicating whether the Icon should use Toggled states.`
`193`		`- /// </summary>`
	`193`	`+ /// </summary>`
`194`	`194`	`public ToggleBehaviors ToggleBehavior`
`195`	`195`	`{`
`196`		`- get => (ToggleBehaviors)GetValue( ToggleBehaviorProperty );`
`197`		`- set => SetValue( ToggleBehaviorProperty , value);`
	`196`	`+ get => (ToggleBehaviors)GetValue(ToggleBehaviorProperty);`
	`197`	`+ set => SetValue(ToggleBehaviorProperty, value);`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`/// <summary>`
`201`	`201`	`/// Gets or sets a value indicating whether the Icon should use Filled states.`
`202`		`- /// </summary>`
	`202`	`+ /// </summary>`
`203`	`203`	`public bool IsFilled`
`204`	`204`	`{`
`205`	`205`	`get => (bool)GetValue(IsFilledProperty);`
`@@ -208,7 +208,7 @@ public bool IsFilled`
`208`	`208`
`209`	`209`	`/// <summary>`
`210`	`210`	`/// Gets or sets a value indicating whether the Icon is in HighContrast state.`
`211`		`- /// </summary>`
	`211`	`+ /// </summary>`
`212`	`212`	`public bool IsHighContrast`
`213`	`213`	`{`
`214`	`214`	`get => (bool)GetValue(IsHighContrastProperty);`
`@@ -246,7 +246,7 @@ protected virtual void OnOutlineIconPropertyChanged(string oldValue, string newV`
`246`	`246`	`protected virtual void OnColorPropertyChanged(Brush oldValue, Brush newValue)`
`247`	`247`	`{`
`248`	`248`	`UpdateIconTypeStates();`
`249`		`- }`
	`249`	`+ }`
`250`	`250`
`251`	`251`	`// Enum changed events`
`252`	`252`
`@@ -261,27 +261,27 @@ protected virtual void OnIconColorTypePropertyChanged(ThemedIconColorType oldVal`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`// Double changed events`
`264`		`-`
	`264`	`+`
`265`	`265`	`protected virtual void OnIconSizePropertyChanged(double oldValue, double newValue)`
`266`	`266`	`{`
`267`		`- IconSizePropertyChanged(newValue);`
	`267`	`+ IconSizePropertyChanged();`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`// Boolean changed events`
`271`	`271`
`272`		`- protected virtual void OnToggleBehaviorPropertyChanged(ToggleBehaviors oldValue , ToggleBehaviors newValue)`
	`272`	`+ protected virtual void OnToggleBehaviorPropertyChanged(ToggleBehaviors oldValue, ToggleBehaviors newValue)`
`273`	`273`	`{`
`274`		`- ToggleBehaviorChanged(newValue);`
	`274`	`+ ToggleBehaviorChanged();`
`275`	`275`	`}`
`276`	`276`
`277`	`277`	`protected virtual void OnIsFilledPropertyChanged(bool oldValue, bool newValue)`
`278`	`278`	`{`
`279`		`- FilledChanged(newValue);`
	`279`	`+ FilledChanged();`
`280`	`280`	`}`
`281`	`281`
`282`	`282`	`protected virtual void OnIsHighContrastPropertyChanged(bool oldValue, bool newValue)`
`283`	`283`	`{`
`284`		`- HighContrastChanged(newValue);`
	`284`	`+ HighContrastChanged();`
`285`	`285`	`}`
`286`	`286`
`287`	`287`	`// Object changed events`
Original file line number	Diff line number	Diff line change
`@@ -18,16 +18,12 @@ namespace Files.App.Controls`
`18`	`18`	`/// </summary>`
`19`	`19`	`public partial class ThemedIcon : Control`
`20`	`20`	`{`
`21`		`- private bool _isHighContrast;`
`22`		`- private ToggleBehaviors _toggleBehavior;`
`23`		`- private bool _ownerToggled;`
`24`		`- private bool _isEnabled;`
`25`		`- private bool _isFilled;`
`26`		`- private double _iconSize;`
`27`		`-`
`28`		`- private ToggleButton? ownerToggleButton = null;`
	`21`	`+ private bool _ownerToggled;`
	`22`	`+ private bool _isEnabled;`
	`23`	`+`
	`24`	`+ private ToggleButton? ownerToggleButton = null;`
`29`	`25`	`private AppBarToggleButton? ownerAppBarToggleButton = null;`
`30`		`- private Control? ownerControl = null;`
	`26`	`+ private Control? ownerControl = null;`
`31`	`27`
`32`	`28`	`public ThemedIcon()`
`33`	`29`	`{`
`@@ -100,7 +96,7 @@ private void UpdateLayeredIconContent()`
`100`	`96`	`Foreground = this.Foreground,`
`101`	`97`	`HorizontalAlignment = HorizontalAlignment.Stretch,`
`102`	`98`	`VerticalAlignment = VerticalAlignment.Stretch,`
`103`		`- LayerSize = _iconSize,`
	`99`	`+ LayerSize = IconSize,`
`104`	`100`	`Width = layer.LayerSize,`
`105`	`101`	`Height = layer.LayerSize`
`106`	`102`
`@@ -120,8 +116,8 @@ private void SetPathData(string partName, string pathData, FrameworkElement elem`
`120`	`116`	`if (GetTemplateChild(partName) is Path path)`
`121`	`117`	`{`
`122`	`118`	`path.Data = geometry;`
`123`		`- path.Width = _iconSize;`
`124`		`- path.Height = _iconSize;`
	`119`	`+ path.Width = IconSize;`
	`120`	`+ path.Height = IconSize;`
`125`	`121`	`}`
`126`	`122`	`}`
`127`	`123`
`@@ -152,7 +148,7 @@ private void FindOwnerControlStates()`
`152`	`148`	`ownerToggleButton.Checked += OwnerControl_IsCheckedChanged;`
`153`	`149`	`ownerToggleButton.Unchecked += OwnerControl_IsCheckedChanged;`
`154`	`150`
`155`		`- UpdateOwnerToggle( ownerToggleButton.IsChecked is true);`
	`151`	`+ UpdateOwnerToggle(ownerToggleButton.IsChecked is true);`
`156`	`152`	`}`
`157`	`153`
`158`	`154`	`ownerAppBarToggleButton = this.FindAscendant<AppBarToggleButton>();`
`@@ -162,7 +158,7 @@ private void FindOwnerControlStates()`
`162`	`158`	`ownerAppBarToggleButton.Checked += OwnerControl_IsCheckedChanged;`
`163`	`159`	`ownerAppBarToggleButton.Unchecked += OwnerControl_IsCheckedChanged;`
`164`	`160`
`165`		`- UpdateOwnerToggle( ownerAppBarToggleButton.IsChecked is true);`
	`161`	`+ UpdateOwnerToggle(ownerAppBarToggleButton.IsChecked is true);`
`166`	`162`	`}`
`167`	`163`
`168`	`164`	`ownerControl = this.FindAscendant<Control>();`
`@@ -182,9 +178,9 @@ private void OwnerControl_IsCheckedChanged(object sender, RoutedEventArgs e)`
`182`	`178`	`return;`
`183`	`179`
`184`	`180`	`if (ownerToggleButton is not null)`
`185`		`- UpdateOwnerToggle( ownerToggleButton.IsChecked is true);`
	`181`	`+ UpdateOwnerToggle(ownerToggleButton.IsChecked is true);`
`186`	`182`	`else if (ownerAppBarToggleButton is not null)`
`187`		`- UpdateOwnerToggle( ownerAppBarToggleButton.IsChecked is true);`
	`183`	`+ UpdateOwnerToggle(ownerAppBarToggleButton.IsChecked is true);`
`188`	`184`	`}`
`189`	`185`
`190`	`186`	`private void OwnerControl_IsEnabledChanged(object sender, DependencyPropertyChangedEventArgs e)`
`@@ -196,11 +192,8 @@ private void OwnerControl_IsEnabledChanged(object sender, DependencyPropertyChan`
`196`	`192`	`EnabledChanged(ownerControl.IsEnabled);`
`197`	`193`	`}`
`198`	`194`
`199`		`- private void ToggleBehaviorChanged(ToggleBehaviors value)`
	`195`	`+ private void ToggleBehaviorChanged()`
`200`	`196`	`{`
`201`		`- // Handles the IsToggled property change`
`202`		`- _toggleBehavior = value;`
`203`		`-`
`204`	`197`	`UpdateVisualStates();`
`205`	`198`	`}`
`206`	`199`
`@@ -211,11 +204,8 @@ private void UpdateOwnerToggle(bool isToggled)`
`211`	`204`	`UpdateVisualStates();`
`212`	`205`	`}`
`213`	`206`
`214`		`- private void FilledChanged(bool value)`
	`207`	`+ private void FilledChanged()`
`215`	`208`	`{`
`216`		`- // Handles the IsToggled property change`
`217`		`- _isFilled = value;`
`218`		`-`
`219`	`209`	`UpdateVisualStates();`
`220`	`210`	`}`
`221`	`211`
`@@ -230,15 +220,11 @@ private void OnSizeChanged(object sender, SizeChangedEventArgs e)`
`230`	`220`	`// Handles resizing of child layers when Width and Height properties change`
`231`	`221`	`}`
`232`	`222`
`233`		`- private void IconSizePropertyChanged(double value)`
	`223`	`+ private void IconSizePropertyChanged()`
`234`	`224`	`{`
`235`		`- // Code to handle the design time Icon Size changing`
`236`		`- _iconSize = value;`
`237`		`-`
`238`	`225`	`UpdateVisualStates();`
`239`	`226`	`}`
`240`	`227`
`241`		`-`
`242`	`228`	`private void EnabledChanged(bool value)`
`243`	`229`	`{`
`244`	`230`	`// Handles the IsEnabled property change`
`@@ -247,37 +233,25 @@ private void EnabledChanged(bool value)`
`247`	`233`	`UpdateVisualStates();`
`248`	`234`	`}`
`249`	`235`
`250`		`- private void ThemeSettings_OnHighContrastChanged(object sender, bool e)`
`251`		`- {`
`252`		`- HighContrastChanged(e);`
`253`		`- }`
`254`		`-`
`255`		`- private void HighContrastChanged(bool value)`
	`236`	`+ private void HighContrastChanged()`
`256`	`237`	`{`
`257`		`- // handles HighContrast property change`
`258`		`- _isHighContrast = value;`
`259`		`-`
`260`	`238`	`UpdateVisualStates();`
`261`	`239`	`}`
`262`	`240`
`263`	`241`	`private void InitialIconStateValues()`
`264`	`242`	`{`
`265`	`243`	`_isEnabled = IsEnabled;`
`266`		`- _toggleBehavior = ToggleBehavior;`
`267`		`- _isHighContrast = IsHighContrast;`
`268`		`- _iconSize = IconSize;`
`269`	`244`	`}`
`270`	`245`
`271`	`246`	`private void UpdateIconStates()`
`272`	`247`	`{`
`273`		`- ToggleBehaviorChanged(_toggleBehavior);`
`274`	`248`	`EnabledChanged(_isEnabled);`
`275`		`- HighContrastChanged(_isHighContrast);`
	`249`	`+`
	`250`	`+ UpdateVisualStates();`
`276`	`251`	`}`
`277`	`252`
`278`	`253`	`private void UpdateVisualStates()`
`279`	`254`	`{`
`280`		`- // Updates all Icon Visual States.`
`281`	`255`	`UpdateIconTypeStates();`
`282`	`256`	`UpdateIconColorTypeStates();`
`283`	`257`	`}`
`@@ -287,59 +261,59 @@ private void UpdateIconTypeStates()`
`287`	`261`	`// Handles changes to the IconType and setting the correct Visual States.`
`288`	`262`
`289`	`263`	`// If ToggleBehavior is Auto, we check for _ownerToggle`
`290`		`- if ( _toggleBehavior == ToggleBehaviors.Auto )`
	`264`	`+ if (ToggleBehavior == ToggleBehaviors.Auto)`
`291`	`265`	`{`
`292`		`- if ( _ownerToggled is true \|\| _isFilled is true \|\| IsFilled is true )`
	`266`	`+ if (_ownerToggled is true \|\| IsFilled is true)`
`293`	`267`	`{`
`294`		`- VisualStateManager.GoToState( this , FilledTypeStateName , true );`
	`268`	`+ VisualStateManager.GoToState(this, FilledTypeStateName, true);`
`295`	`269`	`return;`
`296`	`270`	`}`
`297`		`- else if ( _isHighContrast is true \|\| IsHighContrast is true \|\| _isEnabled is false \|\| IsEnabled is false )`
	`271`	`+ else if (IsHighContrast is true \|\| _isEnabled is false \|\| IsEnabled is false)`
`298`	`272`	`{`
`299`		`- VisualStateManager.GoToState( this , OutlineTypeStateName , true );`
`300`		`- VisualStateManager.GoToState( this , DisabledStateName , true );`
	`273`	`+ VisualStateManager.GoToState(this, OutlineTypeStateName, true);`
	`274`	`+ VisualStateManager.GoToState(this, DisabledStateName, true);`
`301`	`275`	`return;`
`302`	`276`	`}`
`303`	`277`	`else`
`304`	`278`	`{`
`305`		`- if ( IconType == ThemedIconTypes.Layered )`
	`279`	`+ if (IconType == ThemedIconTypes.Layered)`
`306`	`280`	`{`
`307`		`- VisualStateManager.GoToState( this , LayeredTypeStateName , true );`
	`281`	`+ VisualStateManager.GoToState(this, LayeredTypeStateName, true);`
`308`	`282`	`}`
`309`	`283`	`else`
`310`	`284`	`{`
`311`		`- VisualStateManager.GoToState( this , OutlineTypeStateName , true );`
	`285`	`+ VisualStateManager.GoToState(this, OutlineTypeStateName, true);`
`312`	`286`	`}`
`313`	`287`	`}`
`314`	`288`	`}`
`315`	`289`	`// If ToggleBehavior is On, we only go to Filled.`
`316`		`- else if ( _toggleBehavior == ToggleBehaviors.On )`
	`290`	`+ else if (ToggleBehavior == ToggleBehaviors.On)`
`317`	`291`	`{`
`318`		`- VisualStateManager.GoToState( this , FilledTypeStateName , true );`
	`292`	`+ VisualStateManager.GoToState(this, FilledTypeStateName, true);`
`319`	`293`	`}`
`320`	`294`	`// For Off, we don't respond to _ownerToggle at all`
`321`	`295`	`else`
`322`	`296`	`{`
`323`		`- if ( _isFilled is true \|\| IsFilled is true )`
	`297`	`+ if (IsFilled is true)`
`324`	`298`	`{`
`325`		`- VisualStateManager.GoToState( this , FilledTypeStateName , true );`
	`299`	`+ VisualStateManager.GoToState(this, FilledTypeStateName, true);`
`326`	`300`	`return;`
`327`	`301`	`}`
`328`		`- else if ( _isHighContrast is true \|\| IsHighContrast is true \|\| _isEnabled is false \|\| IsEnabled is false )`
	`302`	`+ else if (IsHighContrast is true \|\| _isEnabled is false \|\| IsEnabled is false)`
`329`	`303`	`{`
`330`		`- VisualStateManager.GoToState( this , OutlineTypeStateName , true );`
`331`		`- VisualStateManager.GoToState( this , DisabledStateName , true );`
	`304`	`+ VisualStateManager.GoToState(this, OutlineTypeStateName, true);`
	`305`	`+ VisualStateManager.GoToState(this, DisabledStateName, true);`
`332`	`306`	`return;`
`333`	`307`	`}`
`334`	`308`	`else`
`335`	`309`	`{`
`336`		`- if ( IconType == ThemedIconTypes.Layered )`
	`310`	`+ if (IconType == ThemedIconTypes.Layered)`
`337`	`311`	`{`
`338`		`- VisualStateManager.GoToState( this , LayeredTypeStateName , true );`
	`312`	`+ VisualStateManager.GoToState(this, LayeredTypeStateName, true);`
`339`	`313`	`}`
`340`	`314`	`else`
`341`	`315`	`{`
`342`		`- VisualStateManager.GoToState( this , OutlineTypeStateName , true );`
	`316`	`+ VisualStateManager.GoToState(this, OutlineTypeStateName, true);`
`343`	`317`	`}`
`344`	`318`	`}`
`345`	`319`	`}`
`@@ -355,33 +329,33 @@ private void UpdateIconColorTypeStates()`
`355`	`329`	`if (_isEnabled is false \|\| IsEnabled is false)`
`356`	`330`	`{`
`357`	`331`	`// If ToggleBehavior is Auto and _ownerToggled is true`
`358`		`- if ( _toggleBehavior == ToggleBehaviors.Auto && _ownerToggled is true )`
	`332`	`+ if (ToggleBehavior == ToggleBehaviors.Auto && _ownerToggled is true)`
`359`	`333`	`{`
`360`		`- VisualStateManager.GoToState( this , DisabledToggleColorStateName , true );`
	`334`	`+ VisualStateManager.GoToState(this, DisabledToggleColorStateName, true);`
`361`	`335`	`}`
`362`	`336`	`// If ToggleBehavior is On`
`363`		`- else if ( _toggleBehavior == ToggleBehaviors.On )`
	`337`	`+ else if (ToggleBehavior == ToggleBehaviors.On)`
`364`	`338`	`{`
`365`		`- VisualStateManager.GoToState( this , DisabledToggleColorStateName , true );`
	`339`	`+ VisualStateManager.GoToState(this, DisabledToggleColorStateName, true);`
`366`	`340`	`}`
`367`	`341`	`// everything else uses Disabled Color`
`368`	`342`	`else`
`369`	`343`	`{`
`370`		`- VisualStateManager.GoToState( this , DisabledColorStateName , true );`
	`344`	`+ VisualStateManager.GoToState(this, DisabledColorStateName, true);`
`371`	`345`	`}`
`372`	`346`	`}`
`373`	`347`	`// Everything else is Enabled`
`374`	`348`	`else`
`375`	`349`	`{`
`376`	`350`	`// If ToggleBehavior is Auto and _ownerToggled is true`
`377`		`- if ( _toggleBehavior == ToggleBehaviors.Auto && _ownerToggled is true )`
	`351`	`+ if (ToggleBehavior == ToggleBehaviors.Auto && _ownerToggled is true)`
`378`	`352`	`{`
`379`	`353`	`VisualStateManager.GoToState(this, ToggleStateName, true);`
`380`	`354`	`}`
`381`	`355`	`// If ToggleBehavior is On`
`382`		`- else if ( _toggleBehavior == ToggleBehaviors.On )`
	`356`	`+ else if (ToggleBehavior == ToggleBehaviors.On)`
`383`	`357`	`{`
`384`		`- VisualStateManager.GoToState( this , ToggleStateName , true );`
	`358`	`+ VisualStateManager.GoToState(this, ToggleStateName, true);`
`385`	`359`	`}`
`386`	`360`	`// everything else uses the appropriate color state`
`387`	`361`	`else`