Merge branch 'font-icons' into avalonia-rewrite

src/PixiEditor.AvaloniaUI/Helpers/IconEvaluators.cs

@@ -1,7 +1,10 @@
 using System.Globalization;
+using System.Reflection;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Avalonia.Platform;
 using PixiEditor.AvaloniaUI.Models.Commands.Attributes.Evaluators;
 using PixiEditor.AvaloniaUI.Models.Commands.Commands;
 using PixiEditor.AvaloniaUI.Models.Commands.Search;
@@ -10,44 +13,56 @@ namespace PixiEditor.AvaloniaUI.Helpers;
 
 internal static class IconEvaluators
 {
-    /*TODO: Segoe is Windows only*/
-    private static readonly FontFamily segeoMdl2 = new FontFamily("Segoe MDL2 Assets");
+    public static Dictionary<string, Bitmap> images = new();
 
-    [Evaluator.Icon("PixiEditor.FontIcon")]
-    public static IImage GetFontIcon(object parameter)
+    [Evaluator.Icon("PixiEditor.BitmapIcon")]
+    public static IImage GetBitmapIcon(object parameter)
     {
-        string symbolCode = GetIconName(parameter);
+        string path = GetDefaultPath(parameter as Command);
 
-        var textBlock = new TextBlock
-        {
-            FontFamily = segeoMdl2,
-            Foreground = Brushes.White,
-            Text = char.ConvertFromUtf32(int.Parse(symbolCode, NumberStyles.HexNumber)),
-        };
+        var image = images.GetValueOrDefault(path);
+        if (image is not null)
+            return image;
+            
+        Uri uri = new($"avares://{Assembly.GetExecutingAssembly().GetName().Name}/{path}");
+        if (!AssetLoader.Exists(uri))
+            return null;
+            
+        image = new Bitmap(AssetLoader.Open(uri));
+        images.Add(path, image);
 
-        var brush = new VisualBrush
-        {
-            Visual = textBlock,
-            Stretch = Stretch.Uniform
-        };
+        return image;
+    }
+    
+    public static string GetDefaultPath(Command command)
+    {
+        string path;
 
-        var drawing = new GeometryDrawing
+        if (command.Icon != null)
         {
-            Brush = brush,
-            Geometry = new RectangleGeometry(
-                new Rect(0, 0, 32, 32))
-        };
-
-        return new DrawingImage(drawing);
-    }
+            if (command.Icon.StartsWith('@'))
+            {
+                path = command.Icon[1..];
+            }
+            else if (command.Icon.StartsWith('$'))
+            {
+                path = $"Images/Commands/{command.Icon[1..].Replace('.', '/')}.png";
+            }
+            else
+            {
+                path = $"Images/{command.Icon}";
+            }
+        }
+        else
+        {
+            path = $"Images/Commands/{command.InternalName.Replace('.', '/')}.png";
+        }
 
-    private static string GetIconName(object parameter)
-    {
-        return parameter switch
+        if (path.StartsWith("/"))
         {
-            Command command => command.IconPath,
-            CommandSearchResult cmdResult => cmdResult.Command.IconPath,
-            _ => throw new NotImplementedException($"Parameter typeof {parameter.GetType()} has not been implemented yet.")
-        };
+            path = path[1..];
+        }
+
+        return path;
     }
 }

src/PixiEditor.AvaloniaUI/Images/Create-mask.svg

@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="24"
-   height="24"
-   viewBox="0 0 6.3499999 6.3500002"
-   version="1.1"
-   id="svg5"
-   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
-   sodipodi:docname="Create-mask.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="false"
-     inkscape:document-units="px"
-     showgrid="true"
-     units="px"
-     width="24px"
-     inkscape:snap-bbox="true"
-     inkscape:zoom="11.313709"
-     inkscape:cx="12.948893"
-     inkscape:cy="15.954097"
-     inkscape:window-width="1920"
-     inkscape:window-height="1009"
-     inkscape:window-x="1272"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1"
-     inkscape:showpageshadow="2"
-     inkscape:deskcolor="#000000">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1308"
-       spacingx="0.13229167"
-       spacingy="0.13229167"
-       empspacing="4"
-       visible="false"
-       enabled="true" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2" />
-  <g
-     inkscape:label="Слой 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <circle
-       style="display:none;opacity:1;fill:#ffffff;stroke:none;stroke-width:0.264583"
-       id="path3065"
-       cx="3.1750002"
-       cy="2.3812501"
-       r="2.1166668" />
-    <rect
-       style="display:none;opacity:1;fill:#ffffff;stroke:none;stroke-width:0.264583"
-       id="rect3169"
-       width="4.2333336"
-       height="0.92604166"
-       x="1.0583332"
-       y="2.3812501" />
-    <path
-       id="path3295"
-       style="display:none;opacity:1;fill:#333333;stroke:none;stroke-width:0.288637"
-       d="m 3.1750001,0.79375002 a 1.5875,1.5875 0 0 1 1.5875,1.58750008 V 2.9104167 H 1.5875 V 2.3812501 A 1.5875,1.5875 0 0 1 3.1750001,0.79375002 Z" />
-    <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.554366;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:0.554366, 1.10873"
-       id="rect359"
-       width="5.8208332"
-       height="5.8208332"
-       x="0.26458335"
-       y="0.26458335"
-       ry="1.3229166" />
-    <circle
-       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.551216;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:0.551216, 1.10242"
-       id="path1170"
-       cx="3.175"
-       cy="3.175"
-       r="1.6536459" />
-  </g>
-</svg>

src/PixiEditor.AvaloniaUI/Images/Lock-alpha.svg

@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="24"
-   height="24"
-   viewBox="0 0 6.3499999 6.3500002"
-   version="1.1"
-   id="svg5"
-   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
-   sodipodi:docname="рисунок.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="false"
-     inkscape:document-units="px"
-     showgrid="true"
-     units="px"
-     width="24px"
-     inkscape:snap-bbox="true"
-     inkscape:zoom="22.627417"
-     inkscape:cx="10.076272"
-     inkscape:cy="12.153398"
-     inkscape:window-width="1920"
-     inkscape:window-height="1009"
-     inkscape:window-x="1272"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1308"
-       spacingx="0.13229167"
-       spacingy="0.13229167"
-       empspacing="4"
-       visible="false"
-       enabled="true" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2" />
-  <g
-     inkscape:label="Слой 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="opacity:1;fill:none;stroke:#ffffff;stroke-width:0.529167;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       id="rect1310"
-       width="4.7625008"
-       height="3.5718749"
-       x="0.79375005"
-       y="2.2489583"
-       ry="0.52916658" />
-    <circle
-       style="display:none;opacity:1;fill:#ffffff;stroke:none;stroke-width:0.264583"
-       id="path3065"
-       cx="3.1750002"
-       cy="2.3812501"
-       r="2.1166668" />
-    <rect
-       style="display:none;opacity:1;fill:#ffffff;stroke:none;stroke-width:0.264583"
-       id="rect3169"
-       width="4.2333336"
-       height="0.92604166"
-       x="1.0583332"
-       y="2.3812501" />
-    <path
-       id="path3295"
-       style="display:none;opacity:1;fill:#333333;stroke:none;stroke-width:0.288637"
-       d="m 3.1750001,0.79375002 a 1.5875,1.5875 0 0 1 1.5875,1.58750008 V 2.9104167 H 1.5875 V 2.3812501 A 1.5875,1.5875 0 0 1 3.1750001,0.79375002 Z" />
-    <path
-       style="fill:none;stroke:#ffffff;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 1.4552084,2.5135417 V 1.3229168 c 0,-0.39687506 0.396875,-0.79375003 0.79375,-0.79375003 l 1.8520834,-4e-8 c 0.3968751,0 0.7937501,0.39687501 0.7937501,0.79375007 l -1e-7,1.1906249"
-       id="path1511"
-       sodipodi:nodetypes="cscccc" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.7625px;line-height:1.25;font-family:'Palatino Linotype';-inkscape-font-specification:'Palatino Linotype Bold';fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583"
-       x="1.5875001"
-       y="5.1593752"
-       id="text26385"><tspan
-         sodipodi:role="line"
-         id="tspan26383"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.7625px;font-family:'Palatino Linotype';-inkscape-font-specification:'Palatino Linotype Bold';fill:#ffffff;stroke-width:0.264583"
-         x="1.5875001"
-         y="5.1593752">α</tspan></text>
-  </g>
-</svg>

src/PixiEditor.AvaloniaUI/Images/Merge-downwards.svg

@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="24"
-   height="24"
-   viewBox="0 0 6.3499199 6.3499199"
-   version="1.1"
-   id="svg1920"
-   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
-   sodipodi:docname="Merge-downwards.svg"
-   inkscape:export-filename="C:\Users\egor0\source\repos\PixiEditor\src\PixiEditor\Images\Merge-downwards.png"
-   inkscape:export-xdpi="192"
-   inkscape:export-ydpi="192"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview1922"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="false"
-     inkscape:document-units="px"
-     showgrid="true"
-     units="px"
-     width="24mm"
-     showborder="false"
-     inkscape:showpageshadow="false"
-     inkscape:zoom="18.136363"
-     inkscape:cx="8.9874688"
-     inkscape:cy="12.957394"
-     inkscape:window-width="1920"
-     inkscape:window-height="1009"
-     inkscape:window-x="1272"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2247"
-       empspacing="2"
-       spacingy="0.13229"
-       spacingx="0.13229"
-       enabled="false"
-       visible="true"
-       dotted="false" />
-  </sodipodi:namedview>
-  <defs
-     id="defs1917">
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lstart"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lstart"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(12.5,0)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path7176" />
-    </marker>
-  </defs>
-  <g
-     inkscape:label="Слой 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       id="rect2406"
-       style="fill:none;stroke:#ffffff;stroke-width:0.52916;stroke-linecap:butt;stroke-linejoin:bevel"
-       d="M 2.38122,2.6458 H 2.6458 V 1.05832 c 0,-0.29315463 0.2360055,-0.52915998 0.5291601,-0.52915998 H 5.2916 c 0.2931547,0 0.52916,0.23600535 0.52916,0.52915998 v 2.11664 c 0,0.2931546 -0.236005,0.5291599 -0.5291601,0.5291599 L 3.70412,3.70412 V 3.9687"
-       sodipodi:nodetypes="ccsssssscc" />
-    <path
-       id="rect2406-0"
-       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-opacity:1"
-       d="M 7,10 H 4 c -1.1079999,0 -2,0.892 -2,2 v 8 c 0,1.108 0.8920001,2 2,2 h 8 c 1.108,0 2,-0.892 2,-2 l 0,-3"
-       transform="scale(0.26458)"
-       sodipodi:nodetypes="cssssssc" />
-    <path
-       style="fill:none;stroke:#ffffff;stroke-width:0.52916;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 3.70412,2.6458 1.58748,4.76244"
-       id="path3902"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#ffffff;stroke-width:0.52916;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 1.58748,3.70412 V 4.76244 H 2.6458"
-       id="path4182"
-       sodipodi:nodetypes="ccc" />
-  </g>
-</svg>