More bug fix.

AvaloniaUtils · Aug 21, 2022 · c4a802e · c4a802e
1 parent 9c8e5d5
commit c4a802e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/AsyncImageLoader.Avalonia.Demo/App.axaml b/AsyncImageLoader.Avalonia.Demo/App.axaml
@@ -7,6 +7,7 @@
     </Application.DataTemplates>
 
     <Application.Styles>
+        <FluentTheme Mode="Light"/>
         <StyleInclude Source="avares://AsyncImageLoader.Avalonia/AdvancedImage.axaml" />
         <StyleInclude Source="avares://AsyncImageLoader.Avalonia.Demo/Controls/HamburgerMenu.axaml" />
     </Application.Styles>

diff --git a/AsyncImageLoader.Avalonia.Demo/AsyncImageLoader.Avalonia.Demo.csproj b/AsyncImageLoader.Avalonia.Demo/AsyncImageLoader.Avalonia.Demo.csproj
@@ -11,6 +11,8 @@
     <ItemGroup>
         <PackageReference Include="Avalonia" Version="11.0.0-preview1" />
         <PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview1" />
+        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-preview1" />
+
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
         <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-preview1" />
         <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview1" />

diff --git a/AsyncImageLoader.Avalonia/AdvancedImage.axaml.cs b/AsyncImageLoader.Avalonia/AdvancedImage.axaml.cs
@@ -69,7 +69,7 @@ static AdvancedImage() {
 
             var loaderChangedObservable = LoaderProperty.Changed
                 .Where(args => args.IsEffectiveValueChange)
-                .Where((args, i) => i == 0 || (bool)args.Sender.GetValue(ShouldLoaderChangeTriggerUpdateProperty))
+                .Where((args, i) => i == 0 || (bool)args.Sender.GetValue(ShouldLoaderChangeTriggerUpdateProperty)!)
                 .Select(args => args.NewValue.Value)
                 .StartWith((IAsyncImageLoader?)null);