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

fix lazy load image

Browse source
This commit is contained in:
Hongtao Zhang 2024-01-22 12:15:35 -06:00
parent 5303e132b8
commit 84fe131d50
2 changed files with 9 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Flow.Launcher/ViewModels/MainViewModel.cs
View file

@ -25,7 +25,9 @@ using CommunityToolkit.Mvvm.Input;
using System.Globalization;
using System.Windows.Input;
using System.ComponentModel;
using Avalonia.Media;
using Avalonia.Threading;
using Flow.Launcher.Infrastructure.Image;
namespace Flow.Launcher.ViewModel
{
@ -104,15 +106,6 @@ namespace Flow.Launcher.ViewModel
};
_selectedResults = ResultsVM;
ResultsVM.PropertyChanged += (_, args) =>
{
switch (args.PropertyName)
{
case nameof(ResultsVM.SelectedItem):
UpdatePreview();
break;
}
};
RegisterViewUpdate();
RegisterResultsUpdatedEvent();
@ -479,7 +472,6 @@ namespace Flow.Launcher.ViewModel
{
ResultAreaColumn = 1;
PreviewVisible = true;
ResultsVM.SelectedItem?.LoadPreviewImage();
}
private void HidePreview()
@ -500,13 +492,6 @@ namespace Flow.Launcher.ViewModel
}
}
private void UpdatePreview()
{
if (PreviewVisible)
{
ResultsVM.SelectedItem?.LoadPreviewImage();
}
}
/// <summary>
/// we need move cursor to end when we manually changed query
@ -596,7 +581,7 @@ namespace Flow.Launcher.ViewModel
set => Settings.WindowSize = value;
}
public string PluginIconPath { get; set; } = null;
public Task<IImage> PluginIcon { get; set; } = null;
public string OpenResultCommandModifiers => Settings.OpenResultModifiers;
public string D1Gesture => $"{OpenResultCommandModifiers}+D1";
@ -609,7 +594,7 @@ namespace Flow.Launcher.ViewModel
public string D8Gesture => $"{OpenResultCommandModifiers}+D8";
public string D9Gesture => $"{OpenResultCommandModifiers}+D9";
public string D0Gesture => $"{OpenResultCommandModifiers}+D0";
public string PreviewHotkey
{
get
@ -751,8 +736,7 @@ namespace Flow.Launcher.ViewModel
if (query == null) // shortcut expanded
{
ResultsVM.Clear();
ResultsVM.Visibility = false;
PluginIconPath = null;
PluginIcon = null;
SearchIconVisibility = true;
return;
}
@ -785,12 +769,12 @@ namespace Flow.Launcher.ViewModel
if (plugins.Count == 1)
{
PluginIconPath = plugins.Single().Metadata.IcoPath;
PluginIcon = ImageLoader.LoadAsync(plugins.Single().Metadata.IcoPath, false).AsTask();
SearchIconVisibility = false;
}
else
{
PluginIconPath = null;
PluginIcon = null;
SearchIconVisibility = true;
}

36
Flow.Launcher/ViewModels/ResultViewModel.cs
View file

@ -62,9 +62,6 @@ namespace Flow.Launcher.ViewModel
Glyph = glyph;
}
}
LoadImage();
}
@ -170,9 +167,9 @@ namespace Flow.Launcher.ViewModel
? Result.SubTitle
: Result.SubTitleToolTip;
public Task<IImage> Image { get; set; }
public Task<IImage> Image => LoadImageInternalAsync(Result.IcoPath, Result.Icon, false);
public Task<IImage> PreviewImage { get; set; }
public Task<IImage> PreviewImage => LoadImageInternalAsync(Result.IcoPath, Result.Icon, false);
/// <summary>
/// Determines if to use the full width of the preview panel
@ -202,35 +199,6 @@ namespace Flow.Launcher.ViewModel
return await ImageLoader.LoadAsync(imagePath, loadFullImage).ConfigureAwait(false);
}
private void LoadImage()
{
var imagePath = Result.IcoPath;
var iconDelegate = Result.Icon;
if (ImageLoader.TryGetValue(imagePath, false, out var img))
{
Image = Task.FromResult(img);
}
else
{
// We need to modify the property not field here to trigger the OnPropertyChanged event
Image = LoadImageInternalAsync(imagePath, iconDelegate, false);
}
}
public void LoadPreviewImage()
{
var imagePath = Result.Preview.PreviewImagePath ?? Result.IcoPath;
var iconDelegate = Result.Preview.PreviewDelegate ?? Result.Icon;
if (ImageLoader.TryGetValue(imagePath, true, out var img))
{
PreviewImage = Task.FromResult(img);
}
else
{
// We need to modify the property not field here to trigger the OnPropertyChanged event
PreviewImage = LoadImageInternalAsync(imagePath, iconDelegate, true);
}
}
public Result Result { get; }