Updated Avalonia Nugets to try to solve a bug in Mac versions

Fixed Paste data from GDU/Chars to Sprite

Author: Duefectu

ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml

@@ -9,45 +9,7 @@
              Focusable="True"
              Background="#ff202020"
              x:Class="ZXBasicStudio.DocumentEditors.ZXGraphics.SpriteEditor">
-  <UserControl.Styles>
-    <Style Selector="Button.toolbar_r90">
-      <Setter Property="Background" Value="#fff0f0f0" />
-      <Setter Property="Width" Value="32" />
-      <Setter Property="Height" Value="32" />
-      <Setter Property="Padding" Value="4" />
-      <Setter Property="CornerRadius" Value="4" />
-      <Setter Property="RenderTransform">
-        <Setter.Value>
-          <RotateTransform Angle="90"/>
-        </Setter.Value>
-      </Setter>
-    </Style>
-    <Style Selector="Button.toolbar_r270">
-      <Setter Property="Background" Value="#fff0f0f0" />
-      <Setter Property="Width" Value="32" />
-      <Setter Property="Height" Value="32" />
-      <Setter Property="Padding" Value="4" />
-      <Setter Property="CornerRadius" Value="4" />
-      <Setter Property="RenderTransform">
-        <Setter.Value>
-          <RotateTransform Angle="270"/>
-        </Setter.Value>
-      </Setter>
-    </Style>
-    <Style Selector="Button.toolbar_hMirror">
-      <Setter Property="Background" Value="#fff0f0f0" />
-      <Setter Property="Width" Value="32" />
-      <Setter Property="Height" Value="32" />
-      <Setter Property="Padding" Value="4" />
-      <Setter Property="CornerRadius" Value="4" />
-      <Setter Property="RenderTransform">
-        <Setter.Value>
-          <ScaleTransform ScaleX="-1"/>
-        </Setter.Value>
-      </Setter>
-    </Style>
-  </UserControl.Styles>
-
+  
   <Grid Name="grdMain" RowDefinitions="*,Auto">
     <Grid Name="grdEditor" Grid.RowSpan="2" ColumnDefinitions="180,4,*,4,200" Margin="0,8,0,0">
 

ZXBStudio/DocumentEditors/ZXGraphics/SpritePatternEditor.axaml.cs

@@ -10,6 +10,7 @@
 using System.Linq;
 using System.Xml.Schema;
 using ZXBasicStudio.Common;
+using ZXBasicStudio.DocumentEditors.ZXGraphics.log;
 using ZXBasicStudio.DocumentEditors.ZXGraphics.neg;
 using ZXBasicStudio.Extensions;
 
@@ -363,8 +364,14 @@ public async void Paste()
 
             if (cbPatterns.Length == 1)
             {
-                SpriteData.Patterns[SpriteData.CurrentFrame].Data = cbPatterns[0].Data;
-                SpriteData.Patterns[SpriteData.CurrentFrame].RawData = cbPatterns[0].RawData;
+                if (cbPatterns[0].RawData == null)
+                {
+                    SpriteData.Patterns[SpriteData.CurrentFrame].RawData = ServiceLayer.PointData2RawData(cbPatterns[0].Data, 8, 8);
+                }
+                else
+                {
+                    SpriteData.Patterns[SpriteData.CurrentFrame].RawData = cbPatterns[0].RawData;
+                }
             }
             else
             {
@@ -377,19 +384,24 @@ public async void Paste()
                     // Paste from PointData
                     int ox = 0;
                     int oy = 0;
+                    int dir = 0;
                     for (int n = 0; n < cbPatterns.Length; n++)
                     {
+                        //int d1 = (n / SpriteData.Width);
+                        //int d2 = (d1 * SpriteData.Width) - n;
                         for (int py = 0; py < 8; py++)
                         {
                             for (int px = 0; px < 8; px++)
                             {
                                 var po = cbPatterns[n].Data.FirstOrDefault(d => d.X == px && d.Y == py);
                                 if (po != null)
                                 {
-                                    var pd = pat2.Data.FirstOrDefault(d => d.X == px + ox && d.Y == py + oy);
-                                    if (pd != null)
+                                    dir = ((oy+py) * SpriteData.Width) + (ox+px);
+
+                                    if (dir < pattern.RawData.Length)
                                     {
-                                        pd.ColorIndex = po.ColorIndex;
+                                        SpriteData.Patterns[SpriteData.CurrentFrame].RawData[dir] = po.ColorIndex;
+                                        //pattern.RawData[dir] = po.ColorIndex;
                                     }
                                 }
                             }
@@ -401,7 +413,7 @@ public async void Paste()
                             oy += 8;
                         }
                     }
-                    SpriteData.Patterns[SpriteData.CurrentFrame].Data = pat2.Data;
+                    //SpriteData.Patterns[SpriteData.CurrentFrame].Data = pat2.Data;
                 }
                 else
                 {