Better initial visibility settings on ModListGallery items

This commit is contained in:
Justin Swanson 2020-02-03 18:49:57 -06:00
parent 40c9521cee
commit 7b41606625
2 changed files with 5 additions and 2 deletions

View File

@ -51,7 +51,7 @@
</ItemsControl> </ItemsControl>
</ScrollViewer> </ScrollViewer>
</Border> </Border>
<mahapps:ProgressRing x:Name="LoadingRing" Grid.Row="1" /> <mahapps:ProgressRing x:Name="LoadingRing" Grid.Row="1" Visibility="Collapsed" />
<iconPacks:PackIconControl <iconPacks:PackIconControl
x:Name="ErrorIcon" x:Name="ErrorIcon"
Grid.Row="1" Grid.Row="1"
@ -61,7 +61,8 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Foreground="{StaticResource ErrorBrush}" Foreground="{StaticResource ErrorBrush}"
Kind="{x:Static iconPacks:PackIconMaterialKind.AlertCircle}" Kind="{x:Static iconPacks:PackIconMaterialKind.AlertCircle}"
ToolTip="Error loading modlist gallery" /> ToolTip="Error loading modlist gallery"
Visibility="Collapsed" />
<local:TopProgressView <local:TopProgressView
Title="Browsing Modlists" Title="Browsing Modlists"
Grid.Row="0" Grid.Row="0"

View File

@ -33,10 +33,12 @@ namespace Wabbajack
return !hasContent && succeeded; return !hasContent && succeeded;
}) })
.Select(x => x ? Visibility.Visible : Visibility.Collapsed) .Select(x => x ? Visibility.Visible : Visibility.Collapsed)
.StartWith(Visibility.Collapsed)
.BindToStrict(this, x => x.LoadingRing.Visibility) .BindToStrict(this, x => x.LoadingRing.Visibility)
.DisposeWith(dispose); .DisposeWith(dispose);
this.WhenAny(x => x.ViewModel.Error) this.WhenAny(x => x.ViewModel.Error)
.Select(e => (e?.Succeeded ?? true) ? Visibility.Collapsed : Visibility.Visible) .Select(e => (e?.Succeeded ?? true) ? Visibility.Collapsed : Visibility.Visible)
.StartWith(Visibility.Collapsed)
.BindToStrict(this, x => x.ErrorIcon.Visibility) .BindToStrict(this, x => x.ErrorIcon.Visibility)
.DisposeWith(dispose); .DisposeWith(dispose);
}); });