From 5a077f9006ec592d6e4d5c22e6dec360b323aa9d Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Sun, 27 Nov 2022 17:07:21 +0800 Subject: [PATCH] Fix preview image size when PreviewImage is null --- Flow.Launcher/ViewModel/ResultViewModel.cs | 32 ++++++++++++---------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/Flow.Launcher/ViewModel/ResultViewModel.cs b/Flow.Launcher/ViewModel/ResultViewModel.cs index 99528a9a7..f20c18ab9 100644 --- a/Flow.Launcher/ViewModel/ResultViewModel.cs +++ b/Flow.Launcher/ViewModel/ResultViewModel.cs @@ -28,10 +28,11 @@ namespace Flow.Launcher.ViewModel } Result = result; - PreviewExtension = Path.GetExtension(result.PreviewImage ?? result.SubTitle); - if (PreviewExtension != null) + var extension = Path.GetExtension(result.PreviewImage); + if (!string.IsNullOrEmpty(extension)) { - PreviewExtension = PreviewExtension.ToLowerInvariant(); + // only when explicitly specified PreviewImage + PreviewIsImageOrVideo = IsMedia(extension.ToLowerInvariant()); } if (Result.Glyph is { FontFamily: not null } glyph) @@ -173,18 +174,21 @@ namespace Flow.Launcher.ViewModel private set => previewImage = value; } - public string PreviewExtension { get; set; } + public bool PreviewIsImageOrVideo { get; set; } = false; - public bool PreviewIsImageOrVideo => PreviewExtension is ".jpg" - or ".png" - or ".avi" - or ".mkv" - or ".bmp" - or ".gif" - or ".wmv" - or ".mp3" - or ".flac" - or ".mp4"; + public bool IsMedia(string extension) + { + return extension is ".jpg" + or ".png" + or ".avi" + or ".mkv" + or ".bmp" + or ".gif" + or ".wmv" + or ".mp3" + or ".flac" + or ".mp4"; + } public GlyphInfo Glyph { get; set; }