Merge pull request #8291 from AvaloniaUI/fix-fluent-loader

Fix FluentTheme density style
AvaloniaUI · Jun 6, 2022 · b3cf3d9 · b3cf3d9
2 parents 7064690 + 7c8aa9e
commit b3cf3d9
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/Avalonia.Themes.Fluent/FluentTheme.cs b/src/Avalonia.Themes.Fluent/FluentTheme.cs
@@ -83,6 +83,14 @@ public DensityStyle DensityStyle
         protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
+
+            if (_loaded is null)
+            {
+                // If style wasn't yet loaded, no need to change children styles,
+                // it will be applied later in Loaded getter.
+                return;
+            }
+
             if (change.Property == ModeProperty)
             {
                 if (Mode == FluentThemeMode.Dark)