Merge pull request #349 from AvaloniaCommunity/textBoxBorderBrushChan…

…ging Return MaterialTextBoxBorderBrush animation, bump Avalonia dependency…
AvaloniaCommunity · Feb 25, 2024 · dcff995 · dcff995
2 parents 9d66801 + 6bf6f20
commit dcff995
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
-    <AvaloniaVersion>11.0.0</AvaloniaVersion>
+    <AvaloniaVersion>11.0.9</AvaloniaVersion>
     <ShowMeTheXamlVersion>1.4.1</ShowMeTheXamlVersion>
   </PropertyGroup>
   <ItemGroup>

diff --git a/Material.Styles/Themes/MaterialThemeBase.cs b/Material.Styles/Themes/MaterialThemeBase.cs
@@ -107,9 +107,7 @@ internal IResourceDictionary InternalResources {
             { "MaterialColumnHeaderBrush", theme => theme.ColumnHeader },
             { "MaterialCheckBoxOffBrush", theme => theme.CheckBoxOff },
             { "MaterialCheckBoxDisabledBrush", theme => theme.CheckBoxDisabled },
-            // Workaround for TextBlock text color does not changing: https://github.com/AvaloniaCommunity/Material.Avalonia/issues/262
-            // Comment should be removed when https://github.com/AvaloniaUI/Avalonia/issues/12408 fixed
-            // { "MaterialTextBoxBorderBrush", theme => theme.TextBoxBorder },
+            { "MaterialTextBoxBorderBrush", theme => theme.TextBoxBorder },
             { "MaterialDividerBrush", theme => theme.Divider },
             { "MaterialSelectionBrush", theme => theme.Selection },
             { "MaterialToolForegroundBrush", theme => theme.ToolForeground },