Fix ThemeVariant equality (#17257)

* Added failing ThemeVariant theme * Fixed ThemeVariant.Equals
AvaloniaUI · Oct 27, 2024 · f965634 · f965634
1 parent d41d5bb
commit f965634
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Avalonia.Base/Styling/ThemeVariant.cs b/src/Avalonia.Base/Styling/ThemeVariant.cs
@@ -91,7 +91,7 @@ public override int GetHashCode()
 
     public bool Equals(ThemeVariant? other)
     {
-        return Key == other?.Key;
+        return other is not null && Equals(Key, other.Key);
     }
 
     public static explicit operator ThemeVariant(PlatformThemeVariant themeVariant)

diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ThemeDictionariesTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ThemeDictionariesTests.cs
@@ -45,7 +45,8 @@ public void DynamicResource_Updated_When_Control_Theme_Changed()
 
         Assert.Equal(Colors.White, ((ISolidColorBrush)border.Background)!.Color);
 
-        themeVariantScope.RequestedThemeVariant = ThemeVariant.Dark;
+        var themeVariantKey = new string(['D', 'a', 'r', 'k']); // Ensure that a non-interned string works
+        themeVariantScope.RequestedThemeVariant = new ThemeVariant(themeVariantKey, null);
 
         Assert.Equal(Colors.Black, ((ISolidColorBrush)border.Background)!.Color);
     }