Skip to content
This repository has been archived by the owner on Sep 4, 2024. It is now read-only.

Simplify implementation for ImageTagSet equality #1116

Draft
wants to merge 11 commits into
base: main
Choose a base branch
from
Draft

Simplify implementation for ImageTagSet equality #1116

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3550ded
Simplify implementation for ImageTagSet equality
Therzok Feb 20, 2023
25cb1aa
Reuse the same tag separator array
Therzok Feb 20, 2023
30ee113
Add a lookup table for most common tags used in images
Therzok Feb 20, 2023
1557d48
Remove unused tags string and improvements to caching
Therzok Feb 21, 2023
455d72b
Forgot to initialize
Therzok Feb 21, 2023
3dd2e28
Correct formatting of tags string
Therzok Feb 21, 2023
cb9c628
Avoid allocating substrings
Therzok Feb 21, 2023
7511a91
Reuse a cached array for the manifest resource names
Therzok Feb 21, 2023
681e4cd
More caching in enumerating alternative files
Therzok Feb 21, 2023
be8d81a
Use specialized APIs to get the handles
Therzok Feb 21, 2023
b4ceca4
This shoudl be static
Therzok Feb 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions Xwt/Xwt.Drawing/Image.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ public class Image: XwtObject, IDisposable
internal StyleSet styles;

internal static int[] SupportedScales = { 2 };
internal static string[] SupportedScalesTags = SupportedScales.Select(scale => "@" + scale + "x").ToArray();

internal Image ()
{
Expand Down Expand Up @@ -1183,16 +1184,22 @@ public override object LoadImage (string fileName)

public override IEnumerable<string> GetAlternativeFiles (string fileName, string baseName, string ext)
{
if (!Context.RegisteredStyles.Any ()) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This check breaks my brain. I don't really understand why it is !Context.RegisteredStyles.Any()

foreach (var s in Image.SupportedScales) {
var fn = baseName + "@" + s + "x" + ext;
if (File.Exists (fn))
yield return fn;
}
} else {
var files = Directory.EnumerateFiles (Path.GetDirectoryName (fileName), Path.GetFileName (baseName) + "*" + ext);
foreach (var f in files)
yield return f;
if (!Context.RegisteredStyles.Any())
{
return EnumerateFilesForRegisteredStyles(baseName, ext);
}
else
{
return Directory.EnumerateFiles(Path.GetDirectoryName(fileName), Path.GetFileName(baseName) + "*" + ext);
}
}

IEnumerable<string> EnumerateFilesForRegisteredStyles (string baseName, string ext)
{
foreach (var scaleTag in Image.SupportedScalesTags) {
var fn = baseName + scaleTag + ext;
if (File.Exists (fn))
yield return fn;
}
}

Expand Down