mirror of
https://github.com/Flow-Launcher/Flow.Launcher.git
synced 2026-03-11 08:54:32 +00:00
rename to IcoPathAbsolute
This commit is contained in:
parent
7c670de7c2
commit
f9df44a2cd
5 changed files with 11 additions and 13 deletions
|
|
@ -23,7 +23,7 @@ namespace Flow.Launcher.Plugin
|
|||
|
||||
private string _icoPath;
|
||||
|
||||
private string _icoAbsoluteFullPath;
|
||||
private string _icoPathAbsolute;
|
||||
|
||||
private string _copyText = string.Empty;
|
||||
|
||||
|
|
@ -72,9 +72,7 @@ namespace Flow.Launcher.Plugin
|
|||
/// </summary>
|
||||
/// <value>Can be a local file path or a URL.</value>
|
||||
/// <remarks>
|
||||
/// GlyphInfo is prioritized if not null.
|
||||
/// Use IcoPathRelative for storage where it needs to be resistant to plugin location change.
|
||||
/// </remarks>
|
||||
/// GlyphInfo is prioritized if not null</remarks>
|
||||
public string IcoPath
|
||||
{
|
||||
get => _icoPath;
|
||||
|
|
@ -90,11 +88,11 @@ namespace Flow.Launcher.Plugin
|
|||
&& !value.StartsWith("https://", StringComparison.OrdinalIgnoreCase)
|
||||
&& !value.StartsWith("data:image", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
_icoAbsoluteFullPath = Path.Combine(PluginDirectory, value);
|
||||
_icoPathAbsolute = Path.Combine(PluginDirectory, value);
|
||||
}
|
||||
else
|
||||
{
|
||||
_icoAbsoluteFullPath = value;
|
||||
_icoPathAbsolute = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -102,7 +100,7 @@ namespace Flow.Launcher.Plugin
|
|||
/// <summary>
|
||||
/// TODO COMMENT
|
||||
/// </summary>
|
||||
public string IcoAbsoluteFullPath => _icoAbsoluteFullPath;
|
||||
public string IcoPathAbsolute => _icoPathAbsolute;
|
||||
|
||||
/// <summary>
|
||||
/// The image to be displayed for the badge of the result.
|
||||
|
|
|
|||
|
|
@ -333,7 +333,7 @@
|
|||
Margin="18 24 0 0"
|
||||
HorizontalAlignment="Left"
|
||||
RenderOptions.BitmapScalingMode="Fant"
|
||||
Source="{Binding IcoAbsoluteFullPath, IsAsync=True}" />
|
||||
Source="{Binding IcoPathAbsolute, IsAsync=True}" />
|
||||
<Border
|
||||
x:Name="LabelUpdate"
|
||||
Height="12"
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ namespace Flow.Launcher.Storage
|
|||
/// Refresh stored PluginDirectory (and optionally normalize relative ico paths)
|
||||
/// using current plugin metadata. Call this after plugins are loaded/initialized.
|
||||
/// </summary>
|
||||
public void UpdateIcoAbsoluteFullPath()
|
||||
public void UpdateIcoPathAbsolute()
|
||||
{
|
||||
if (LastOpenedHistoryItems.Count == 0) return;
|
||||
|
||||
|
|
|
|||
|
|
@ -1370,7 +1370,7 @@ namespace Flow.Launcher.ViewModel
|
|||
internal void RefreshLastOpenedHistoryResult()
|
||||
{
|
||||
_history.PopulateHistoryFromLegacyHistory();
|
||||
_history.UpdateIcoAbsoluteFullPath();
|
||||
_history.UpdateIcoPathAbsolute();
|
||||
}
|
||||
|
||||
private async Task QueryResultsAsync(bool searchDelay, bool isReQuery = false, bool reSelect = true)
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ namespace Flow.Launcher.ViewModel
|
|||
|
||||
private bool GlyphAvailable => Glyph is not null;
|
||||
|
||||
private bool ImgIconAvailable => !string.IsNullOrEmpty(Result.IcoAbsoluteFullPath) || Result.Icon is not null;
|
||||
private bool ImgIconAvailable => !string.IsNullOrEmpty(Result.IcoPathAbsolute) || Result.Icon is not null;
|
||||
|
||||
private bool BadgeIconAvailable => !string.IsNullOrEmpty(Result.BadgeIcoPath) || Result.BadgeIcon is not null;
|
||||
|
||||
|
|
@ -236,7 +236,7 @@ namespace Flow.Launcher.ViewModel
|
|||
|
||||
private async Task LoadImageAsync()
|
||||
{
|
||||
var imagePath = Result.IcoAbsoluteFullPath;
|
||||
var imagePath = Result.IcoPathAbsolute;
|
||||
var iconDelegate = Result.Icon;
|
||||
if (ImageLoader.TryGetValue(imagePath, false, out var img))
|
||||
{
|
||||
|
|
@ -266,7 +266,7 @@ namespace Flow.Launcher.ViewModel
|
|||
|
||||
private async Task LoadPreviewImageAsync()
|
||||
{
|
||||
var imagePath = Result.Preview.PreviewImagePath ?? Result.IcoAbsoluteFullPath;
|
||||
var imagePath = Result.Preview.PreviewImagePath ?? Result.IcoPathAbsolute;
|
||||
var iconDelegate = Result.Preview.PreviewDelegate ?? Result.Icon;
|
||||
if (ImageLoader.TryGetValue(imagePath, true, out var img))
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue