prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use separate variable for preview image

Browse source
This commit is contained in:
Vic 2022-12-28 21:37:53 +08:00
parent 95aaa9f085
commit 617d2f5efb
2 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Flow.Launcher/MainWindow.xaml
View file

@ -438,7 +438,7 @@
HorizontalAlignment="Center" HorizontalAlignment="Center"
Source="{Binding PreviewImage}" Source="{Binding PreviewImage}"
StretchDirection="DownOnly" StretchDirection="DownOnly"
Visibility="{Binding ShowIcon}"> Visibility="{Binding ShowPreviewImage, Converter={StaticResource BoolToVisibilityConverter}}">
<Image.Style> <Image.Style>
<Style TargetType="{x:Type Image}"> <Style TargetType="{x:Type Image}">
<Setter Property="MaxWidth" Value="96" /> <Setter Property="MaxWidth" Value="96" />

28
Flow.Launcher/ViewModel/ResultViewModel.cs
View file

@ -90,6 +90,30 @@ namespace Flow.Launcher.ViewModel
} }
} }
public bool ShowPreviewImage
{
get
{
if (!string.IsNullOrEmpty(Result.Preview.PreviewImagePath) || Result.Preview.PreviewDelegate != null)
{
return true;
}
else
{
// Fall back to Icon
if (!ImgIconAvailable && !GlyphAvailable)
return true;
// Although user can choose to use glyph icons, plugins may choose to supply only image icons.
// In this case we ignore the setting because otherwise icons will not display as intended
if (Settings.UseGlyphIcons && !GlyphAvailable && ImgIconAvailable)
return true;
return !Settings.UseGlyphIcons && ImgIconAvailable;
}
}
}
public double IconRadius public double IconRadius
{ {
get get
@ -120,6 +144,8 @@ namespace Flow.Launcher.ViewModel
private bool ImgIconAvailable => !string.IsNullOrEmpty(Result.IcoPath) || Result.Icon is not null; private bool ImgIconAvailable => !string.IsNullOrEmpty(Result.IcoPath) || Result.Icon is not null;
private bool PreviewImageAvailable => !string.IsNullOrEmpty(Result.Preview.PreviewImagePath) || Result.Preview.PreviewDelegate != null;
public string OpenResultModifiers => Settings.OpenResultModifiers; public string OpenResultModifiers => Settings.OpenResultModifiers;
public string ShowTitleToolTip => string.IsNullOrEmpty(Result.TitleToolTip) public string ShowTitleToolTip => string.IsNullOrEmpty(Result.TitleToolTip)
@ -218,7 +244,7 @@ namespace Flow.Launcher.ViewModel
{ {
if (ShowDefaultPreview == Visibility.Visible) if (ShowDefaultPreview == Visibility.Visible)
{ {
if (!PreviewImageLoaded && ShowIcon == Visibility.Visible) if (!PreviewImageLoaded && ShowPreviewImage)
{ {
PreviewImageLoaded = true; PreviewImageLoaded = true;
_ = LoadPreviewImageAsync(); _ = LoadPreviewImageAsync();