Browse Source

fixup

pull/7449/head
Emmanuel Hansen 4 years ago
parent
commit
9a5fe6cbdf
  1. 19
      src/Avalonia.Themes.Fluent/FluentTheme.cs

19
src/Avalonia.Themes.Fluent/FluentTheme.cs

@ -56,6 +56,10 @@ namespace Avalonia.Themes.Fluent
public static readonly StyledProperty<FluentThemeMode> ModeProperty = public static readonly StyledProperty<FluentThemeMode> ModeProperty =
AvaloniaProperty.Register<FluentTheme, FluentThemeMode>(nameof(Mode)); AvaloniaProperty.Register<FluentTheme, FluentThemeMode>(nameof(Mode));
public static readonly StyledProperty<DensityStyle> DensityStyleProperty =
AvaloniaProperty.Register<FluentTheme, DensityStyle>(nameof(DensityStyle));
/// <summary> /// <summary>
/// Gets or sets the mode of the fluent theme (light, dark). /// Gets or sets the mode of the fluent theme (light, dark).
/// </summary> /// </summary>
@ -64,9 +68,7 @@ namespace Avalonia.Themes.Fluent
get => GetValue(ModeProperty); get => GetValue(ModeProperty);
set => SetValue(ModeProperty, value); set => SetValue(ModeProperty, value);
} }
public static readonly StyledProperty<DensityStyle> DensityStyleProperty =
AvaloniaProperty.Register<FluentTheme, DensityStyle>(nameof(DensityStyle));
/// <summary> /// <summary>
/// Gets or sets the density style of the fluent theme (normal, compact). /// Gets or sets the density style of the fluent theme (normal, compact).
/// </summary> /// </summary>
@ -97,16 +99,9 @@ namespace Avalonia.Themes.Fluent
{ {
if (DensityStyle == DensityStyle.Compact) if (DensityStyle == DensityStyle.Compact)
{ {
if ((Loaded as Styles)!.Count > 3) (Loaded as Styles)!.Add(_densityStyles[0]);
{
(Loaded as Styles)![3] = _densityStyles[0];
}
else
{
(Loaded as Styles)!.Add( _densityStyles[0]);
}
} }
else if(DensityStyle == DensityStyle.Normal) else if (DensityStyle == DensityStyle.Normal)
{ {
(Loaded as Styles)!.Remove(_densityStyles[0]); (Loaded as Styles)!.Remove(_densityStyles[0]);
} }

Loading…
Cancel
Save