Code cleanup

Author: jonashertzman

FileDiff/AppSettings.cs

@@ -437,30 +437,6 @@ public static Brush PartialMatchBackground
 		}
 	}
 
-	public static Brush IgnoredForeground
-	{
-		get;
-		set
-		{
-			field = value;
-			field.Freeze();
-			CurrentTheme.IgnoredForeground = ((SolidColorBrush)value).Color.ToString();
-			NotifyStaticPropertyChanged(nameof(IgnoredForeground));
-		}
-	}
-
-	public static Brush IgnoredBackground
-	{
-		get;
-		set
-		{
-			field = value;
-			field.Freeze();
-			CurrentTheme.IgnoredBackground = ((SolidColorBrush)value).Color.ToString();
-			NotifyStaticPropertyChanged(nameof(IgnoredBackground));
-		}
-	}
-
 
 	// Editor colors
 	public static Brush WhiteSpaceForeground
@@ -892,9 +868,6 @@ private static void UpdateCachedSettings()
 			NewForeground = new SolidColorBrush((Color)ColorConverter.ConvertFromString(CurrentTheme.NewForeground));
 			NewBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString(CurrentTheme.NewBackground));
 
-			IgnoredForeground = new SolidColorBrush((Color)ColorConverter.ConvertFromString(CurrentTheme.IgnoredForeground));
-			IgnoredBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString(CurrentTheme.IgnoredBackground));
-
 			MovedFromBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString(CurrentTheme.MovedFromBackground));
 			MovedToBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString(CurrentTheme.MovedToBackground));
 
@@ -942,8 +915,6 @@ internal static Brush GetFileForeground(TextState state)
 				return NewForeground;
 			case TextState.PartialMatch:
 				return PartialMatchForeground;
-			case TextState.Ignored:
-				return IgnoredForeground;
 
 			default:
 				return FullMatchForeground;
@@ -964,8 +935,6 @@ internal static Brush GetFileBackground(TextState state)
 				return MovedToBackground;
 			case TextState.PartialMatch:
 				return PartialMatchBackground;
-			case TextState.Ignored:
-				return IgnoredBackground;
 
 			default:
 				return FullMatchBackground;

FileDiff/ColorTheme.cs

@@ -40,9 +40,6 @@ public class ColorTheme
 	public required string PartialMatchForeground { get; set; }
 	public required string PartialMatchBackground { get; set; }
 
-	public required string IgnoredForeground { get; set; }
-	public required string IgnoredBackground { get; set; }
-
 	// Editor colors
 	public required string WhiteSpaceForeground { get; set; }
 	public required string SelectionBackground { get; set; }

FileDiff/DefaultSettings.cs

@@ -42,9 +42,6 @@ public static class DefaultSettings
 		PartialMatchForeground = "#FF9698FF",
 		PartialMatchBackground = "#FF2B293A",
 
-		IgnoredForeground = "#FF7E7E7E",
-		IgnoredBackground = "#FF212121",
-
 		// Editor colors
 		WhiteSpaceForeground = "#FF3871A7",
 		SelectionBackground = "#320096D2",
@@ -107,9 +104,6 @@ public static class DefaultSettings
 		PartialMatchForeground = "#FF000000",
 		PartialMatchBackground = "#FFDCDCFF",
 
-		IgnoredForeground = "#FF5A5A5A",
-		IgnoredBackground = "#FFDCDCDC",
-
 		// Editor colors
 		WhiteSpaceForeground = "#FF2E8CB5",
 		SelectionBackground = "#320096D2",

FileDiff/Windows/OptionsWindow.xaml

@@ -194,9 +194,18 @@
 										<Rectangle Grid.Row="12" Grid.Column="1" Margin="5" Fill="{Binding Path=(local:AppSettings.PartialMatchForeground), Mode=TwoWay}" MouseLeftButtonUp="Rectangle_MouseUp" />
 										<Rectangle Grid.Row="12" Grid.Column="2" Margin="5" Fill="{Binding Path=(local:AppSettings.PartialMatchBackground), Mode=TwoWay}" MouseLeftButtonUp="Rectangle_MouseUp" />
 
-										<Label Grid.Row="13" Content="Ignored" />
-										<Rectangle Grid.Row="13" Grid.Column="1" Margin="5" Fill="{Binding Path=(local:AppSettings.IgnoredForeground), Mode=TwoWay}" MouseLeftButtonUp="Rectangle_MouseUp" />
-										<Rectangle Grid.Row="13" Grid.Column="2" Margin="5" Fill="{Binding Path=(local:AppSettings.IgnoredBackground), Mode=TwoWay}" MouseLeftButtonUp="Rectangle_MouseUp" />
+
+										<Border Grid.Row="13" Grid.ColumnSpan="3" Margin="0,5" BorderThickness="1">
+											<Border.Background>
+												<LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
+													<GradientStop Offset="0" Color="{Binding Path=(local:AppSettings.WindowBackgroundColor), FallbackValue=#FFFFFFFF}" />
+													<GradientStop Offset="1" Color="{Binding Path=(local:AppSettings.DialogBackgroundColor), FallbackValue=#FFF0F0F0}" />
+												</LinearGradientBrush>
+											</Border.Background>
+											<TextBlock Padding="7" Text="Editor Colors" />
+										</Border>
+										<Label Grid.Row="13" Grid.Column="1" Content="Foreground" />
+										<Label Grid.Row="13" Grid.Column="2" Content="Background" />
 
 										<Label Grid.Row="14" Content="White Space Characters" />
 										<Rectangle x:Name="WhiteSpaceForeground" Grid.Row="14" Grid.Column="1" Margin="5" Fill="{Binding Path=(local:AppSettings.WhiteSpaceForeground), Mode=TwoWay}" MouseLeftButtonUp="Rectangle_MouseUp" />