Merge branch 'master' into fix/autocomplete

Juan Segura · Juan Segura · commit d13f89aae671 · 2025-02-01T19:23:45.000+01:00
diff --git a/ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml.cs b/ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml.cs
@@ -299,7 +299,10 @@ private void _Initialize(string fileName)
                             var al = (sprite.Width / 8) * (sprite.Height / 8);
                             foreach (var pattern in sprite.Patterns)
                             {
-                                pattern.Attributes = pattern.Attributes.Take(al).ToArray();
+                                if (pattern.Attributes != null)
+                                {
+                                    pattern.Attributes = pattern.Attributes.Take(al).ToArray();
+                                }
                             }
                         }
 
diff --git a/ZXBStudio/Svg/Undo.svg b/ZXBStudio/Svg/Undo.svg
diff --git a/ZXBStudio/Svg/undo.svg b/ZXBStudio/Svg/undo.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M16 17L16 15C16 12.7909 14.2091 11 12 11L7 11" stroke="#200E32" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M10 8L7 11L10 14" stroke="#200E32" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/ZXBStudio/ZXBasicStudio.csproj b/ZXBStudio/ZXBasicStudio.csproj
@@ -11,9 +11,9 @@
     <Platforms>AnyCPU;x64</Platforms>
     <ApplicationIcon>zxbs.ico</ApplicationIcon>
     <Title>ZX Basic Studio</Title>
-    <AssemblyVersion>1.3.*</AssemblyVersion>
+    <AssemblyVersion>1.4.*</AssemblyVersion>
     <Deterministic>False</Deterministic>
-    <Version>1.3.99.0</Version>
+    <Version></Version>
   </PropertyGroup>
   <ItemGroup>
     <AvaloniaXaml Remove="LanguageDefinitions\**" />
@@ -206,7 +206,7 @@
     <None Remove="Svg\trash-can-regular.svg" />
     <None Remove="Svg\trash-solid.svg" />
     <None Remove="Svg\truck-fast-solid.svg" />
-    <None Remove="Svg\Undo.svg" />
+    <None Remove="Svg\undo.svg" />
     <None Remove="Svg\White\backward-solid.svg" />
     <None Remove="Svg\White\backward-step-solid.svg" />
     <None Remove="Svg\White\box-open-solid.svg" />

Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,10 @@ private void _Initialize(string fileName)`
`299`	`299`	`var al = (sprite.Width / 8) * (sprite.Height / 8);`
`300`	`300`	`foreach (var pattern in sprite.Patterns)`
`301`	`301`	`{`
`302`		`- pattern.Attributes = pattern.Attributes.Take(al).ToArray();`
	`302`	`+ if (pattern.Attributes != null)`
	`303`	`+ {`
	`304`	`+ pattern.Attributes = pattern.Attributes.Take(al).ToArray();`
	`305`	`+ }`
`303`	`306`	`}`
`304`	`307`	`}`
`305`	`308`