From 4d4c678548ced566dbb4358e76c28bba60197e2c Mon Sep 17 00:00:00 2001
From: Juan Segura <juansda@hotmail.com>
Date: Sun, 1 Jun 2025 17:14:45 +0200
Subject: [PATCH 1/7] Undo & Redo working in sprite editor

---
 .../ZXGraphics/PaletteBuilderDialog.axaml     |  19 +-
 .../ZXGraphics/PaletteBuilderDialog.axaml.cs  | 173 +++++++++++++++++-
 .../ZXGraphics/SpriteEditor.axaml             |   4 +-
 .../ZXGraphics/SpriteEditor.axaml.cs          |  38 +---
 .../ZXGraphics/SpritePatternEditor.axaml.cs   | 125 ++++++++++---
 5 files changed, 291 insertions(+), 68 deletions(-)

diff --git a/ZXBStudio/DocumentEditors/ZXGraphics/PaletteBuilderDialog.axaml b/ZXBStudio/DocumentEditors/ZXGraphics/PaletteBuilderDialog.axaml
index 905fc94..2e60542 100644
--- a/ZXBStudio/DocumentEditors/ZXGraphics/PaletteBuilderDialog.axaml
+++ b/ZXBStudio/DocumentEditors/ZXGraphics/PaletteBuilderDialog.axaml
@@ -47,7 +47,7 @@
     <Grid Grid.Row="3" Grid.ColumnDefinitions="Auto,*" Grid.RowDefinitions="Auto,Auto,Auto,Auto,Auto">
       <CheckBox Grid.Row="0" Name="chkUseCurrent" IsChecked="True" HorizontalAlignment="Right"/>
       <TextBlock Grid.Row="0" Grid.Column="1" Classes="dialog" VerticalAlignment="Center">Convert to current palette</TextBlock>
-      
+
       <CheckBox Grid.Row="1" Name="chkAppend" IsChecked="False" HorizontalAlignment="Right"/>
       <TextBlock Grid.Row="1" Grid.Column="1" Classes="dialog" VerticalAlignment="Center">Append new colors to current palette</TextBlock>
 
@@ -78,10 +78,12 @@
         <NumericUpDown Classes="dialog" Name="txtBlue" Minimum="0" Increment="36" Maximum="255" Width="60" VerticalAlignment="Center" Value="0"/>
       </Border>
 
-      <Border Grid.Row="1" Grid.Column="3" Grid.RowSpan="3" HorizontalAlignment="Center" VerticalAlignment="Center" BorderThickness="1" BorderBrush="Red">
+      <Border Grid.Row="1" Grid.Column="3" Grid.RowSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" BorderThickness="1" BorderBrush="Red">
         <Grid Name="grdSelectedColor" Width="50" Height="50"></Grid>
       </Border>
 
+      <Button Name="btnColorPicker" Grid.Row="3" Grid.Column="8" IsVisible="False">Pick</Button>
+
       <StackPanel Grid.Row="5" Grid.ColumnSpan="4" Orientation="Horizontal">
         <Button Name="btnResetPalette" Classes="dialog">Reset to default</Button>
         <Button Name="btnLoadPalette" Classes="dialog">Load palette</Button>
@@ -93,10 +95,21 @@
       <Button Name="btnRefresh" Classes="dialog" HorizontalAlignment="Right">Refresh</Button>
       <Button Grid.Row="2" Name="btnSaveImage" Classes="dialog" HorizontalAlignment="Right">Save image</Button>
     </Grid>
-    
+
     <StackPanel Grid.Row="4" Grid.ColumnSpan="5" Orientation="Horizontal" HorizontalAlignment="Right">
       <Button Name="btnClose" Classes="dialog">Close</Button>
     </StackPanel>
+    
+    <Grid Name="grdColorPicker" Grid.ColumnSpan="5" Grid.RowSpan="5" IsVisible="False"
+          Margin="10" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" >
+      <Canvas x:Name="ColorWheelCanvas" Width="500" Height="500" Background="Black"
+             HorizontalAlignment="Center" VerticalAlignment="Center"
+             PointerPressed="ColorWheelCanvas_PointerPressed"/>
+      <Border Width="100" Height="30" Background="White"
+              HorizontalAlignment="Left" VerticalAlignment="Top" Margin="10">
+        <Rectangle x:Name="SelectedColorPreview" Fill="Transparent"/>
+      </Border>
+    </Grid>
 
   </Grid>
 </Window>
diff --git a/ZXBStudio/DocumentEditors/ZXGraphics/PaletteBuilderDialog.axaml.cs b/ZXBStudio/DocumentEditors/ZXGraphics/PaletteBuilderDialog.axaml.cs
index 123c6ed..251c34b 100644
--- a/ZXBStudio/DocumentEditors/ZXGraphics/PaletteBuilderDialog.axaml.cs
+++ b/ZXBStudio/DocumentEditors/ZXGraphics/PaletteBuilderDialog.axaml.cs
@@ -33,6 +33,7 @@
 using Avalonia.Controls.Shapes;
 using static CommunityToolkit.Mvvm.ComponentModel.__Internals.__TaskExtensions.TaskAwaitableWithoutEndValidation;
 using FFmpeg.AutoGen;
+using System.Diagnostics;
 
 namespace ZXBasicStudio.DocumentEditors.ZXGraphics
 {
@@ -44,6 +45,7 @@ public partial class PaletteBuilderDialog : Window, IDisposable
 
         private Rectangle[] rectangulos = new Rectangle[256];
         private PaletteColor[] palette = null;
+        private PaletteColor[] palette512 = null;
         private string sourceFile = null;
         private string convertedFile = null;
         private bool imgSourceLoaded = false;
@@ -68,8 +70,9 @@ public PaletteBuilderDialog()
 
             // Set the palette
             palette = ServiceLayer.GetPalette(GraphicsModes.Next);
-            selectedColorIndex = 0;
+            selectedColorIndex = 0;           
             DrawPalette();
+            DrawColorPicker();
 
             btnFileSource.Tapped += BtnFileSource_Tapped;
             btnResetPalette.Click += BtnResetPalette_Click;
@@ -85,7 +88,10 @@ public PaletteBuilderDialog()
             btnRefresh.Click += BtnRefresh_Click;
             btnSaveImage.Click += BtnSaveImage_Click;
 
+            btnColorPicker.Click += BtnColorPicker_Click;
+
             btnClose.Click += BtnClose_Click;
+
         }
 
 
@@ -893,5 +899,170 @@ private void CrearPaletaGPL9bits()
         }
 
         #endregion
+
+
+        #region Color Picker
+
+        private int Circles = 8; //16;
+        private int Sectors = 32;
+        private double Radius = 200;
+
+        private void BtnColorPicker_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            grdColorPicker.IsVisible = true;
+        }
+
+
+        private void DrawColorPicker()
+        {
+            Create512Palette();
+
+            ColorWheelCanvas.Children.Clear();
+            double ringWidth = Radius / Circles;
+            double angleStep = 360.0 / Sectors;
+            double cx = Radius;
+            double cy = Radius;
+
+            for (int circle = 0; circle < Circles; circle++)
+            {
+                double r1 = ringWidth * circle;
+                double r2 = ringWidth * (circle + 1);
+                double value = (circle + 1) / (double)Circles;
+
+                for (int sector = 0; sector < Sectors; sector++)
+                {
+                    double hue = sector * angleStep;
+                    Color color = FromHSV(hue, 1.0, value);
+                    int idx=ServiceLayer.GetColor(color.R, color.G, color.B, palette512, 5);
+                    var p = palette512[idx];
+                    var color512=Color.FromRgb(p.Red, p.Green, p.Blue);
+                    DrawSegment(cx, cy, r1, r2, hue, angleStep, color512);
+                }
+            }
+        }
+
+        private void DrawSegment(double cx, double cy, double r1, double r2, double startAngle, double angleSize, Color color)
+        {
+            var startRad = Math.PI * startAngle / 180.0;
+            var endRad = Math.PI * (startAngle + angleSize) / 180.0;
+
+            var p1 = new Point(cx + r1 * Math.Cos(startRad), cy + r1 * Math.Sin(startRad));
+            var p2 = new Point(cx + r2 * Math.Cos(startRad), cy + r2 * Math.Sin(startRad));
+            var p3 = new Point(cx + r2 * Math.Cos(endRad), cy + r2 * Math.Sin(endRad));
+            var p4 = new Point(cx + r1 * Math.Cos(endRad), cy + r1 * Math.Sin(endRad));
+
+            var path = new Avalonia.Controls.Shapes.Path
+            {
+                Fill = new SolidColorBrush(color),
+                StrokeThickness = 0,
+                Data = new PathGeometry
+                {
+                    Figures = new PathFigures
+                {
+                    new PathFigure
+                    {
+                        StartPoint = p1,
+                        Segments = new PathSegments
+                        {
+                            new LineSegment { Point = p2 },
+                            new ArcSegment
+                            {
+                                Point = p3,
+                                Size = new Size(r2, r2),
+                                SweepDirection = SweepDirection.Clockwise,
+                                IsLargeArc = angleSize > 180
+                            },
+                            new LineSegment { Point = p4 },
+                            new ArcSegment
+                            {
+                                Point = p1,
+                                Size = new Size(r1, r1),
+                                SweepDirection = SweepDirection.CounterClockwise,
+                                IsLargeArc = angleSize > 180
+                            }
+                        }
+                    }
+                }
+                }
+            };
+
+            ColorWheelCanvas.Children.Add(path);
+        }
+
+        private void ColorWheelCanvas_PointerPressed(object? sender, PointerPressedEventArgs e)
+        {
+            var pos = e.GetPosition(ColorWheelCanvas);
+            double dx = pos.X - Radius;
+            double dy = pos.Y - Radius;
+            double distance = Math.Sqrt(dx * dx + dy * dy);
+            if (distance > Radius) return;
+
+            double angle = Math.Atan2(dy, dx) * 180 / Math.PI;
+            if (angle < 0) angle += 360;
+
+            int sector = (int)(angle / (360.0 / Sectors));
+            int circle = (int)(distance / (Radius / Circles));
+
+            double hue = sector * (360.0 / Sectors);
+            double value = (circle + 1) / (double)Circles;
+            Color color = FromHSV(hue, 1.0, value);
+
+            SelectedColorPreview.Fill = new SolidColorBrush(color);
+        }
+
+        private static Color FromHSV(double hue, double saturation, double value)
+        {
+            double c = value * saturation;
+            double x = c * (1 - Math.Abs((hue / 60.0 % 2) - 1));
+            double m = value - c;
+
+            double r = 0, g = 0, b = 0;
+
+            if (hue < 60) { r = c; g = x; }
+            else if (hue < 120) { r = x; g = c; }
+            else if (hue < 180) { g = c; b = x; }
+            else if (hue < 240) { g = x; b = c; }
+            else if (hue < 300) { r = x; b = c; }
+            else { r = c; b = x; }
+
+            byte R = (byte)((r + m) * 255);
+            byte G = (byte)((g + m) * 255);
+            byte B = (byte)((b + m) * 255);
+
+            return Color.FromRgb(R, G, B);
+        }
+
+        private void Create512Palette()
+        {
+            palette512 = new PaletteColor[512];
+            for (int i = 0; i < 512; i++)
+            {
+                int r = ((i & 0b111000000) >> 6)*36;
+                int g = ((i & 0b000111000) >> 3)*36;
+                int b = (i & 0b000000111)*36;
+                if (r > 250)
+                {
+                    r = 255;
+                }
+                if (g > 250)
+                {
+                    g = 255;
+                }
+                if (b > 250)
+                {
+                    b = 255;
+                }
+
+                palette512[i] = new PaletteColor()
+                {
+                    Red = (byte)r,
+                    Green = (byte)g,
+                    Blue = (byte)b,
+                    HasPriority = false
+                };
+            }
+        }
+
+        #endregion
     }
 }
diff --git a/ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml b/ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml
index 94da8c8..cf09cf0 100644
--- a/ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml
+++ b/ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml
@@ -27,10 +27,10 @@
       <Grid Grid.Column="2" Grid.Row="1" RowDefinitions="Auto,*,Auto">
         <WrapPanel Orientation="Horizontal" Grid.ColumnSpan="5" Margin="10" Background="#ff202020" Height="NaN">
 
-          <Button Classes="toolbar" Name="btnUndo" ToolTip.Tip="Undo last action" IsEnabled="False">
+          <Button Classes="toolbar" Name="btnUndo" ToolTip.Tip="Undo last action">
             <svg:Svg Path="/Svg/undo.svg"></svg:Svg>
           </Button>
-          <Button Classes="toolbar" Name="btnRedo" ToolTip.Tip="Redo last action" IsEnabled="False">
+          <Button Classes="toolbar" Name="btnRedo" ToolTip.Tip="Redo last action" >
             <svg:Svg Path="/Svg/redo.svg"></svg:Svg>
           </Button>
           
diff --git a/ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml.cs b/ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml.cs
index d3a2939..821f132 100644
--- a/ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml.cs
+++ b/ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml.cs
@@ -262,37 +262,7 @@ private void _Initialize(string fileName)
                     Sprite[] sprites = dataS.Deserializar<Sprite[]>();
 
                     foreach (var sprite in sprites)
-                    {
-                        /*
-                        // Check attributes for ZX Spectrum mode
-                        if (sprite != null && sprite.GraphicMode == GraphicsModes.ZXSpectrum)
-                        {
-                            // Force ZX Spectrum palette
-                            sprite.Palette = ServiceLayer.GetPalette(GraphicsModes.ZXSpectrum);
-                            foreach (var pattern in sprite.Patterns)
-                            {
-                                int cW = sprite.Width / 8;
-                                int cH = sprite.Height / 8;
-                                int l = cW * cH;
-                                if (pattern.Attributes == null)
-                                {
-                                    pattern.Attributes = new AttributeColor[cW * cH];
-                                    for (int n = 0; n < pattern.Attributes.Length; n++)
-                                    {
-                                        pattern.Attributes[n] = new AttributeColor()
-                                        {
-                                            Ink = 1,
-                                            Paper = 0
-                                        };
-                                    }
-                                }
-                                if (pattern.Attributes.Length != l)
-                                {
-                                    pattern.Attributes = pattern.Attributes.Take(l).ToArray();
-                                }
-                            }
-                        }
-                        */
+                    {                        
                         // Check attributes for ZX Spectrum mode
                         if (sprite != null && sprite.Patterns != null)
                         {
@@ -357,7 +327,7 @@ private void _Initialize(string fileName)
             btnRedo.Tapped += BtnRedo_Tapped;
             btnInvertColorsCell.Tapped += BtnInvertColorsCell_Tapped;
             btnInvertPixelsCell.Tapped += BtnInvertPixelsCell_Tapped;
-
+            
             Refresh();
 
             if (SpritePatternsList.Count > 1)
@@ -1062,13 +1032,13 @@ private void BtnInvertColorsCell_Tapped(object? sender, TappedEventArgs e)
 
         private void BtnRedo_Tapped(object? sender, TappedEventArgs e)
         {
-            
+            ctrlEditor.Redo();
         }
 
 
         private void BtnUndo_Tapped(object? sender, TappedEventArgs e)
         {
-            
+            ctrlEditor.Undo();
         }
 
         #endregion
diff --git a/ZXBStudio/DocumentEditors/ZXGraphics/SpritePatternEditor.axaml.cs b/ZXBStudio/DocumentEditors/ZXGraphics/SpritePatternEditor.axaml.cs
index dbc142c..4e818da 100644
--- a/ZXBStudio/DocumentEditors/ZXGraphics/SpritePatternEditor.axaml.cs
+++ b/ZXBStudio/DocumentEditors/ZXGraphics/SpritePatternEditor.axaml.cs
@@ -10,6 +10,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Threading.Tasks.Sources;
 using System.Xml.Schema;
 using ZXBasicStudio.Common;
 using ZXBasicStudio.DocumentEditors.ZXGraphics.log;
@@ -46,6 +47,7 @@ public Sprite SpriteData
                         lastId = _SpriteData.Id;
                     }
                 }
+                Undo_AddPoint();
                 Refresh(true);
             }
         }
@@ -168,44 +170,100 @@ public void Refresh(bool callBack = false)
 
         #region Undo and Redo
 
-        private List<Operation> operations = new List<Operation>();
-        private List<Operation> operationsDeleted = new List<Operation>();
+        private List<Pattern> operations = new List<Pattern>();
+        private int operationIndex = -1;
 
         public void Undo()
         {
-            // Get last operation
-            var op = operations.LastOrDefault();
+            if (operationIndex > operations.Count - 1)
+            {
+                operationIndex = operations.Count - 1;
+            }
+            if (operationIndex < 0)
+            {
+                return;
+            }
+            var op = operations[operationIndex];
+            if (Pattern_Equals(SpriteData.Patterns[SpriteData.CurrentFrame], op))
+            {
+                operationIndex--;
+                Undo();
+                return;
+            }
             if (op != null)
             {
-                // Move from operations to operationsDeleted
-                operations.Remove(op);
-                // Restore point value (Undo)
-                SetPoint(op.X, op.Y, op.ColorIndex);
-                // Remove new operation (Undo don't add operation)
-                var op2 = operations.LastOrDefault();
-                if (op2 != null)
-                {
-                    operations.Remove(op2);
-                    operationsDeleted.Add(op2);
-                }
+                SpriteData.Patterns[SpriteData.CurrentFrame] = op;
+                Refresh();
             }
         }
 
 
         public void Redo()
         {
-            // Get last undo operation
-            var op = operationsDeleted.LastOrDefault();
+            if (operationIndex > operations.Count - 1)
+            {
+                return;
+            }
+            if (operationIndex < 0)
+            {
+                return;
+            }
+            var op = operations[operationIndex];
+            if (Pattern_Equals(SpriteData.Patterns[SpriteData.CurrentFrame], op))
+            {
+                operationIndex++;
+                Redo();
+                return;
+            }
             if (op != null)
             {
-                // Delete from operationsDeleted
-                operationsDeleted.Remove(op);
-                // Set point value (Undo)
-                SetPoint(op.X, op.Y, op.ColorIndex);
+                SpriteData.Patterns[SpriteData.CurrentFrame] = op;
+                Refresh();
             }
         }
 
 
+        private void Undo_AddPoint()
+        {
+            try
+            {
+                if (SpriteData == null || SpriteData.Patterns == null)
+                {
+                    operations.Clear();
+                    return;
+                }
+
+                if (operationIndex >= 0 &&
+                    operationIndex < operations.Count)
+                {
+                    var lastOp = operations[operationIndex];
+                    if (Pattern_Equals(SpriteData.Patterns[SpriteData.CurrentFrame], lastOp))
+                    {
+                        return; // No changes
+                    }
+                }
+                operations = operations.Take(operationIndex+1).ToList();
+
+                var op = SpriteData.Patterns[SpriteData.CurrentFrame].Clonar<Pattern>();
+                operations.Add(op);
+                operationIndex = operations.Count - 1;
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"Error in Undo_AddPoint: {ex.Message}");
+            }
+        }
+
+        private bool Pattern_Equals(Pattern p1, Pattern p2)
+        {
+            if (p1 == null || p2 == null)
+            {
+                return false;
+            }
+            var pc1 = p1.Serializar();
+            var pc2 = p2.Serializar();
+            return pc1 == pc2;
+        }
         #endregion
 
 
@@ -302,13 +360,6 @@ private void SetPoint(double mx, double my, int value)
             }
 
             int dir = (SpriteData.Width * y) + x;
-            operations.Add(new Operation()
-            {
-                ColorIndex = SpriteData.Patterns[SpriteData.CurrentFrame].RawData[dir],
-                X = (int)mx,
-                Y = (int)my
-            });
-
             var sprite = SpriteData.Patterns[SpriteData.CurrentFrame];
 
             switch (SpriteData.GraphicMode)
@@ -331,6 +382,7 @@ private void SetPoint(double mx, double my, int value)
                     break;
             }
 
+            Undo_AddPoint();
             Refresh(false);
 
             if (tmr == null)
@@ -409,6 +461,7 @@ public void Clear()
             {
                 SpriteData.Patterns[SpriteData.CurrentFrame].RawData[n] = SecondaryColorIndex;
             }
+            Undo_AddPoint();
             Refresh(true);
         }
 
@@ -418,6 +471,7 @@ public void Clear()
         /// </summary>
         public void Cut()
         {
+            Undo_AddPoint();
             Copy();
             Clear();
         }
@@ -514,6 +568,7 @@ public async void Paste()
                     }
                 }
             }
+            Undo_AddPoint();
             Refresh(true);
         }
 
@@ -536,6 +591,7 @@ public void HorizontalMirror()
                 }
             }
             SpriteData.Patterns[SpriteData.CurrentFrame] = pat2;
+            Undo_AddPoint();
             Refresh(true);
         }
 
@@ -558,6 +614,7 @@ public void VerticalMirror()
                 }
             }
             SpriteData.Patterns[SpriteData.CurrentFrame] = pat2;
+            Undo_AddPoint();
             Refresh(true);
         }
 
@@ -587,6 +644,7 @@ public void RotateLeft()
                 }
             }
             SpriteData.Patterns[SpriteData.CurrentFrame] = pattern2;
+            Undo_AddPoint();
             Refresh(true);
         }
 
@@ -616,6 +674,7 @@ public void RotateRight()
                 }
             }
             SpriteData.Patterns[SpriteData.CurrentFrame] = pattern2;
+            Undo_AddPoint();
             Refresh(true);
         }
 
@@ -644,6 +703,7 @@ public void ShiftUp()
                 }
             }
             SpriteData.Patterns[SpriteData.CurrentFrame] = pattern2;
+            Undo_AddPoint();
             Refresh(true);
         }
 
@@ -672,6 +732,7 @@ public void ShiftRight()
                 }
             }
             SpriteData.Patterns[SpriteData.CurrentFrame] = pattern2;
+            Undo_AddPoint();
             Refresh(true);
         }
 
@@ -700,6 +761,7 @@ public void ShiftDown()
                 }
             }
             SpriteData.Patterns[SpriteData.CurrentFrame] = pattern2;
+            Undo_AddPoint();
             Refresh(true);
         }
 
@@ -728,6 +790,7 @@ public void ShiftLeft()
                 }
             }
             SpriteData.Patterns[SpriteData.CurrentFrame] = pattern2;
+            Undo_AddPoint();
             Refresh(true);
         }
 
@@ -757,6 +820,7 @@ public void MoveUp()
                 }
             }
             SpriteData.Patterns[SpriteData.CurrentFrame] = pattern2;
+            Undo_AddPoint();
             Refresh(true);
         }
 
@@ -786,6 +850,7 @@ public void MoveRight()
                 }
             }
             SpriteData.Patterns[SpriteData.CurrentFrame] = pattern2;
+            Undo_AddPoint();
             Refresh(true);
         }
 
@@ -815,6 +880,7 @@ public void MoveDown()
                 }
             }
             SpriteData.Patterns[SpriteData.CurrentFrame] = pattern2;
+            Undo_AddPoint();
             Refresh(true);
         }
 
@@ -844,6 +910,7 @@ public void MoveLeft()
                 }
             }
             SpriteData.Patterns[SpriteData.CurrentFrame] = pattern2;
+            Undo_AddPoint();
             Refresh(true);
         }
 
@@ -879,6 +946,7 @@ public void Invert()
                 }
             }
             SpriteData.Patterns[SpriteData.CurrentFrame] = pattern2;
+            Undo_AddPoint();
             Refresh(true);
         }
 
@@ -905,6 +973,7 @@ public void Mask()
             _Mask(0, maxY, ref pattern, ref pattern2);
             _Mask(maxX, maxY, ref pattern, ref pattern2);
             SpriteData.Patterns[SpriteData.CurrentFrame] = pattern2;
+            Undo_AddPoint();
             Refresh(true);
         }
 

From ea7755821b4e65258e3df498f022faf841761cf3 Mon Sep 17 00:00:00 2001
From: Juan Segura <juansda@hotmail.com>
Date: Sun, 1 Jun 2025 17:27:55 +0200
Subject: [PATCH 2/7] Modified flag fixed

---
 ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml.cs b/ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml.cs
index 821f132..669b45b 100644
--- a/ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml.cs
+++ b/ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml.cs
@@ -245,7 +245,7 @@ public bool Initialize(string fileName)
 
         private void _Initialize(string fileName)
         {
-            _Modified = false;
+            _Modified = true;
 
             ServiceLayer.Initialize();
 

From 1e2a406f28261c74caff165a48ffc6bcfabecee4 Mon Sep 17 00:00:00 2001
From: Juan Segura <juansda@hotmail.com>
Date: Sun, 1 Jun 2025 23:19:37 +0200
Subject: [PATCH 3/7] - Added View/Hide attributes button - Added Invert pixels
 on selected cell button - Added Invert colors on selected cell button

---
 README.md                                     |   2 +
 .../ZXGraphics/SpriteEditor.axaml             |  15 ++-
 .../ZXGraphics/SpriteEditor.axaml.cs          |  27 +++-
 .../ZXGraphics/SpritePatternEditor.axaml.cs   | 121 ++++++++++++++++--
 .../ZXGraphics/ZXGridImageView.axaml.cs       |  17 +++
 .../ZXGraphics/ZXSpriteImage.cs               |  25 +++-
 ZXBStudio/Svg/hide.svg                        |   7 +
 ZXBStudio/Svg/select.svg                      |   1 +
 ZXBStudio/ZXBasicStudio.csproj                |   4 +
 9 files changed, 200 insertions(+), 19 deletions(-)
 create mode 100644 ZXBStudio/Svg/hide.svg
 create mode 100644 ZXBStudio/Svg/select.svg

diff --git a/README.md b/README.md
index 45a238c..8c611fd 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,8 @@ Have fun!
   - <a href="https://github.com/phosphor-icons/phosphor-icons?ref=svgrepo.com" target="_blank">Phosphor</a> in MIT License
   - <a href="https://www.zondicons.com/?ref=svgrepo.com" target="_blank">Steve Schoger</a> in PD License
   - <a href="https://www.figma.com/@thewolfkit?ref=svgrepo.com" target="_blank">Thewolfkit</a> in CC Attribution License
+  - <a href="https://github.com/UXAspects/UXAspects?ref=svgrepo.com" target="_blank">Uxaspects</a> in Apache License
+  - <a href="https://github.com/uxwb/icons?ref=svgrepo.com" target="_blank">Uxwb</a> in GPL License
   - <a href="https://www.wishforge.games/?ref=svgrepo.com" target="_blank">Wishforge.games</a> in CC Attribution License
   - <a href="https://github.com/yamatsum/nonicons?ref=svgrepo.com" target="_blank">Yamatsum</a> in MIT License
   - <a href="https://github.com/32pixelsCo/zest-icons/blob/master/packages/zest-free/LICENSE.md?ref=svgrepo.com" target="_blank">Zest</a> in MIT License
diff --git a/ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml b/ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml
index cf09cf0..98d8a9f 100644
--- a/ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml
+++ b/ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml
@@ -103,14 +103,21 @@
           </Button>
           <Line StartPoint="0,0" EndPoint="0,32" Stroke="White" Margin="5,0,5,0"></Line>
 
-          <Button Classes="toolbar" Name="btnInvertPixelsCell" ToolTip.Tip="Invert pixels on cell" IsEnabled="False">
+          <ToggleButton Classes="toolbar" Name="btnViewAttributes" ToolTip.Tip="Hide or view attributes" IsChecked="True">
+            <svg:Svg Path="/Svg/hide.svg"></svg:Svg>
+          </ToggleButton>
+          <ToggleButton Classes="toolbar" Name="btnSelectPixelsCell" ToolTip.Tip="Select cell"  IsChecked="True" IsVisible="False">
+            <svg:Svg Path="/Svg/select.svg"></svg:Svg>
+          </ToggleButton>
+          <ToggleButton Classes="toolbar" Name="btnInvertPixelsCell" ToolTip.Tip="Invert pixels on selected cell" IsChecked="True">
             <svg:Svg Path="/Svg/invert-mode-svgrepo-com.svg"></svg:Svg>
-          </Button>
-          <Button Classes="toolbar" Name="btnInvertColorsCell" ToolTip.Tip="Invert colors on cell" IsEnabled="False">
+          </ToggleButton>
+          <ToggleButton Classes="toolbar" Name="btnInvertColorsCell" ToolTip.Tip="Invert attributes on selected cell" IsChecked="True">
             <svg:Svg Path="/Svg/invert-color-svgrepo-com.svg"></svg:Svg>
-          </Button>
+          </ToggleButton>
           <Line StartPoint="0,0" EndPoint="0,32" Stroke="White" Margin="5,0,5,0"></Line>
 
+          
           <Button Classes="toolbar" Name="btnImport" ToolTip.Tip="Import from image or data">
             <svg:Svg Path="/Svg/ImageImport.svg"></svg:Svg>
           </Button>
diff --git a/ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml.cs b/ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml.cs
index 669b45b..1d65b18 100644
--- a/ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml.cs
+++ b/ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml.cs
@@ -325,9 +325,11 @@ private void _Initialize(string fileName)
 
             btnUndo.Tapped += BtnUndo_Tapped;
             btnRedo.Tapped += BtnRedo_Tapped;
+
+            btnViewAttributes.Tapped += BtnViewAttributes_Tapped;
             btnInvertColorsCell.Tapped += BtnInvertColorsCell_Tapped;
-            btnInvertPixelsCell.Tapped += BtnInvertPixelsCell_Tapped;
-            
+            btnInvertPixelsCell.Tapped += BtnInvertPixelsCell_Tapped;            
+
             Refresh();
 
             if (SpritePatternsList.Count > 1)
@@ -1018,15 +1020,32 @@ private void BtnImport_Tapped(object? sender, TappedEventArgs e)
         }
 
 
+
+        private void BtnViewAttributes_Tapped(object? sender, TappedEventArgs e)
+        {
+            ctrlEditor.ViewAttributes = btnViewAttributes.IsChecked==true;
+        }
+
+
         private void BtnInvertPixelsCell_Tapped(object? sender, TappedEventArgs e)
         {
-            
+            ctrlEditor.InvertPixelsCell = btnInvertPixelsCell.IsChecked == false;
+            if (ctrlEditor.InvertPixelsCell)
+            {
+                btnInvertColorsCell.IsChecked = true;
+                ctrlEditor.InvertColorsCell = false;
+            }
         }
 
 
         private void BtnInvertColorsCell_Tapped(object? sender, TappedEventArgs e)
         {
-            
+            ctrlEditor.InvertColorsCell = btnInvertColorsCell.IsChecked == false;
+            if (ctrlEditor.InvertColorsCell)
+            {
+                btnInvertPixelsCell.IsChecked = true;
+                ctrlEditor.InvertPixelsCell = false;
+            }
         }
 
 
diff --git a/ZXBStudio/DocumentEditors/ZXGraphics/SpritePatternEditor.axaml.cs b/ZXBStudio/DocumentEditors/ZXGraphics/SpritePatternEditor.axaml.cs
index 4e818da..d9320ae 100644
--- a/ZXBStudio/DocumentEditors/ZXGraphics/SpritePatternEditor.axaml.cs
+++ b/ZXBStudio/DocumentEditors/ZXGraphics/SpritePatternEditor.axaml.cs
@@ -83,6 +83,26 @@ public int Zoom
         public bool Bright { get; set; }
         public bool Flash { get; set; }
 
+        public bool ViewAttributes
+        {
+            get
+            {
+                return _ViewAttributes;
+            }
+            set
+            {
+                _ViewAttributes = value;
+                aspect.ViewAttributes = value;
+                Refresh(false);
+            }
+        } 
+
+        private bool _ViewAttributes = true;
+
+        public bool InvertPixelsCell { get; set; } = false;
+
+        public bool InvertColorsCell { get; set; } = false;
+
         #endregion
 
 
@@ -126,6 +146,8 @@ public SpritePatternEditor()
             grdEditor.PointerPressed += GrdEditor_PointerPressed;
             grdEditor.PointerReleased += GrdEditor_PointerReleased;
             grdEditor.PointerExited += GrdEditor_PointerExited;
+
+            aspect.ViewAttributes = true;
         }
 
 
@@ -277,19 +299,31 @@ private bool Pattern_Equals(Pattern p1, Pattern p2)
         private void GrdEditor_PointerPressed(object? sender, Avalonia.Input.PointerPressedEventArgs e)
         {
             var p = e.GetCurrentPoint(grdEditor);
-            if (p.Properties.IsLeftButtonPressed)
+
+            if (InvertPixelsCell)
             {
-                SetPoint(p.Position.X, p.Position.Y, PrimaryColorIndex);
-                MouseLeftPressed = true;
-                MouseRightPressed = false;
+                GrdEditor_InvertPixelsCell(p.Position.X, p.Position.Y);
             }
-            else if (p.Properties.IsRightButtonPressed)
+            else if (InvertColorsCell)
             {
-                SetPoint(p.Position.X, p.Position.Y, SecondaryColorIndex);
-                MouseLeftPressed = false;
-                MouseRightPressed = true;
+                GrdEditor_InvertColorsCell(p.Position.X, p.Position.Y);
             }
-        }
+            else
+            {
+                if (p.Properties.IsLeftButtonPressed)
+                {
+                    SetPoint(p.Position.X, p.Position.Y, PrimaryColorIndex);
+                    MouseLeftPressed = true;
+                    MouseRightPressed = false;
+                }
+                else if (p.Properties.IsRightButtonPressed)
+                {
+                    SetPoint(p.Position.X, p.Position.Y, SecondaryColorIndex);
+                    MouseLeftPressed = false;
+                    MouseRightPressed = true;
+                }
+            }
+        }        
 
 
         /// <summary>
@@ -1053,5 +1087,74 @@ private void SetPointValue(int x, int y, int colorIndex, ref Pattern pattern)
         }
 
         #endregion
+
+
+        #region Invert pixels and colors
+
+        private void GrdEditor_InvertPixelsCell(double mx, double my)
+        {
+            if (SpriteData == null)
+            {
+                return;
+            }
+
+            int x = (int)mx;
+            int y = (int)my;
+
+            x = x / (_Zoom + 1);
+            y = y / (_Zoom + 1);
+
+            x = x / 8;
+            y = y / 8;
+
+            if (x < 0 || y < 0 || x >= SpriteData.Width || y >= SpriteData.Height)
+            {
+                return;
+            }
+
+            for(int py = 0; py < 8; py++)
+            {
+                for (int px = 0; px < 8; px++)
+                {
+                    int dir = ((y * 8 + py) * SpriteData.Width) + (x * 8 + px);
+                    if (dir < SpriteData.Patterns[SpriteData.CurrentFrame].RawData.Length)
+                    {
+                        var value = SpriteData.Patterns[SpriteData.CurrentFrame].RawData[dir];
+                        if (value == PrimaryColorIndex)
+                        {
+                            SpriteData.Patterns[SpriteData.CurrentFrame].RawData[dir] = SecondaryColorIndex;
+                        }
+                        else if (value == SecondaryColorIndex)
+                        {
+                            SpriteData.Patterns[SpriteData.CurrentFrame].RawData[dir] = PrimaryColorIndex;
+                        }
+                    }
+                }
+            }
+            Refresh();
+        }
+
+        private void GrdEditor_InvertColorsCell(double mx, double my)
+        {
+            if (SpriteData == null)
+            {
+                return;
+            }
+            int x = (int)mx;
+            int y = (int)my;
+            x = x / (_Zoom + 1);
+            y = y / (_Zoom + 1);
+
+            var inkBak = PrimaryColorIndex;
+            var paperBak = SecondaryColorIndex;
+            var attr=GetAttribute(SpriteData.Patterns[SpriteData.CurrentFrame], x, y);
+            PrimaryColorIndex = attr.Paper;
+            SecondaryColorIndex = attr.Ink;
+            SetAttribute(SpriteData.Patterns[SpriteData.CurrentFrame], x, y);
+            PrimaryColorIndex = inkBak;
+            SecondaryColorIndex=paperBak;
+            Refresh();
+        }
+        #endregion
     }
 }
diff --git a/ZXBStudio/DocumentEditors/ZXGraphics/ZXGridImageView.axaml.cs b/ZXBStudio/DocumentEditors/ZXGraphics/ZXGridImageView.axaml.cs
index 455cf3f..e063b0e 100644
--- a/ZXBStudio/DocumentEditors/ZXGraphics/ZXGridImageView.axaml.cs
+++ b/ZXBStudio/DocumentEditors/ZXGraphics/ZXGridImageView.axaml.cs
@@ -14,6 +14,19 @@ namespace ZXBasicStudio.DocumentEditors.ZXGraphics
 {
     public partial class ZXGridImageView : UserControl
     {
+        public bool ViewAttributes {
+            get
+            {
+                return _ViewAttributes;
+            }
+            set
+            {
+                _ViewAttributes = value;
+                InvalidateVisual();
+            }
+        }
+        private bool _ViewAttributes = false;
+
         private WriteableBitmap? gridImage;
         private IZXBitmap? backgroundImage;
         private SKColor gridColor = new SKColor(0x00, 0x00, 0x00, 0xFF);
@@ -75,7 +88,9 @@ public ZXGridImageView()
         private void EnsureGrid()
         {
             if (backgroundImage == null)
+            {
                 return;
+            }
 
             int w = (int)(backgroundImage.PixelSize.Width * Zoom + backgroundImage.PixelSize.Width + 1);
             int h = (int)(backgroundImage.PixelSize.Height * Zoom + backgroundImage.PixelSize.Height + 1);
@@ -83,7 +98,9 @@ private void EnsureGrid()
             if (gridImage != null)
             {
                 if (gridImage.PixelSize.Width == w && gridImage.PixelSize.Height == h)
+                {
                     return;
+                }
 
                 gridImage.Dispose();
 
diff --git a/ZXBStudio/DocumentEditors/ZXGraphics/ZXSpriteImage.cs b/ZXBStudio/DocumentEditors/ZXGraphics/ZXSpriteImage.cs
index 0f6a1e5..4b03213 100644
--- a/ZXBStudio/DocumentEditors/ZXGraphics/ZXSpriteImage.cs
+++ b/ZXBStudio/DocumentEditors/ZXGraphics/ZXSpriteImage.cs
@@ -17,7 +17,10 @@ public class ZXSpriteImage : IZXBitmap, IDisposable
         #endregion
 
         #region Public properties
+
         public bool IsEmpty { get; private set; }
+        public bool ViewAttributes { get; set; } = true;
+
         #endregion
 
         #region Constructors
@@ -90,9 +93,27 @@ public unsafe void RenderSprite(Sprite Sprite, int FrameNumber)
                                 {
                                     var attr = GetAttribute(Sprite, frame, x, y);
                                     if (colorIndex == 0)
-                                        color = Sprite.Palette[attr.Paper];
+                                    {
+                                        if (ViewAttributes)
+                                        {
+                                            color = Sprite.Palette[attr.Paper];                                            
+                                        }
+                                        else
+                                        {
+                                            color = Sprite.Palette[7];
+                                        }
+                                    }
                                     else
-                                        color = Sprite.Palette[attr.Ink];
+                                    {
+                                        if(ViewAttributes)
+                                        {
+                                            color = Sprite.Palette[attr.Ink];
+                                        }
+                                        else
+                                        {
+                                            color = Sprite.Palette[0];
+                                        }
+                                    }
                                 }
                                 break;
                             case GraphicsModes.Monochrome:
diff --git a/ZXBStudio/Svg/hide.svg b/ZXBStudio/Svg/hide.svg
new file mode 100644
index 0000000..60bcb77
--- /dev/null
+++ b/ZXBStudio/Svg/hide.svg
@@ -0,0 +1,7 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
<!-- Uploaded to: SVG Repo, www.svgrepo.com, Transformed by: SVG Repo Mixer Tools -->
+<svg viewBox="0 0 600 600" version="1.1" id="svg9724" sodipodi:docname="hide.svg" inkscape:version="1.2.2 (1:1.2.2+202212051550+b0a8486541)" width="800px" height="800px" 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" fill="#ffffff" stroke="#ffffff">
+
<g id="SVGRepo_bgCarrier" stroke-width="0"/>
+
<g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"/>
+
<g id="SVGRepo_iconCarrier"> <defs id="defs9728"/> <sodipodi:namedview id="namedview9726" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:showpageshadow="2" inkscape:pageopacity="0.0" inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1" showgrid="true" inkscape:zoom="0.84118632" inkscape:cx="0.59439863" inkscape:cy="251.43062" inkscape:window-width="1920" inkscape:window-height="1009" inkscape:window-x="0" inkscape:window-y="1080" inkscape:window-maximized="1" inkscape:current-layer="svg9724" showguides="true"> <inkscape:grid type="xygrid" id="grid9972" originx="0" originy="0"/> <sodipodi:guide position="300,360" orientation="1,0" id="guide1208" inkscape:locked="false"/> <sodipodi:guide position="30,300" orientation="0,-1" id="guide345" inkscape:locked="false"/> </sodipodi:namedview> <path id="path401" style="color:#000000;fill:#000000;stroke-linecap:round;-inkscape-stroke:none" d="M 304.97266 60.011719 C 301.64345 59.975172 298.30561 60.017867 294.96094 60.138672 C 187.93101 64.004416 94.223965 145.76059 6.6503906 276.92188 A 40 40 0 0 0 0.4921875 296.11328 A 40 40 0 0 0 0.12695312 299.21094 A 40 40 0 0 0 0.82226562 305.09961 A 40 40 0 0 0 2.3222656 312.62891 A 40 40 0 0 0 2.9257812 313.93945 A 40 40 0 0 0 6.734375 322.21094 C 35.448585 365.21698 64.840816 402.78301 95.126953 434.16211 L 152.01367 377.27539 C 131.15224 355.76877 109.85224 330.01133 88.212891 299.50781 C 163.93506 192.80386 235.70134 142.33057 297.84766 140.08594 C 321.03713 139.24837 345.5035 144.82962 371.17969 158.10938 L 429.63086 99.658203 C 389.28095 74.112324 347.77391 60.481577 304.97266 60.011719 z M 506.57617 164.13477 L 450 220.71094 C 470.20947 242.16957 491.00555 268.20117 512.4082 299.62891 C 432.36032 417.12964 360.51926 461.30947 297.92969 459.04883 C 276.74748 458.28376 254.42556 451.76693 231.23242 439.47852 L 172.28711 498.42383 C 211.38229 523.18429 252.12675 537.44604 295.04297 538.99609 C 402.07287 542.86185 501.15072 465.95461 593.82422 321.61133 A 40 40 0 0 0 599.95898 296.71289 A 40 40 0 0 0 599.73242 294.32031 A 40 40 0 0 0 599.60938 293.48633 A 40 40 0 0 0 593.74219 277.52344 C 565.30627 233.23316 536.26259 195.34152 506.57617 164.13477 z M 300 180 C 234.08138 180 180 234.08138 180 300 C 180 314.63297 182.79619 328.62076 187.66406 341.625 L 241.15625 288.13281 C 245.81666 264.29004 264.29004 245.81666 288.13281 241.15625 L 341.625 187.66406 C 328.62076 182.79619 314.63297 180 300 180 z M 412.33594 258.375 L 358.84375 311.86719 C 354.18334 335.70996 335.70996 354.18334 311.86719 358.84375 L 258.375 412.33594 C 271.37924 417.20381 285.36703 420 300 420 C 365.91862 420 420 365.91862 420 300 C 420 285.36703 417.20381 271.37924 412.33594 258.375 z "/> <path style="color:#000000;fill:#000000;stroke-linecap:round;-inkscape-stroke:none" d="M 570,0 A 30,30 0 0 0 548.78711,8.7871094 L 8.7871094,548.78711 a 30,30 0 0 0 0,42.42578 30,30 0 0 0 42.4257816,0 L 591.21289,51.212891 a 30,30 0 0 0 0,-42.4257816 A 30,30 0 0 0 570,0 Z" id="path345"/> </g>
+
</svg>
\ No newline at end of file
diff --git a/ZXBStudio/Svg/select.svg b/ZXBStudio/Svg/select.svg
new file mode 100644
index 0000000..c816e73
--- /dev/null
+++ b/ZXBStudio/Svg/select.svg
@@ -0,0 +1 @@
+<svg fill="#000000" height="200px" width="200px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 24 24" xml:space="preserve" stroke="#000000"><g id="SVGRepo_bgCarrier" stroke-width="0"></g><g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g><g id="SVGRepo_iconCarrier"> <g id="select"> <path d="M14.8,24l-3.3-4.3l-3.2,4.2L5.8,6.9l16,7.2L16.4,16l3.2,4.3L14.8,24z M11.6,16.4l3.6,4.8l1.6-1.3L13.1,15l3.3-1.1l-8.1-3.6 l1.3,8.7L11.6,16.4z"></path> <path d="M4,18H0v-4h2v2h2V18z M2,12H0V6h2V12z M18,10h-2V6h2V10z M18,4h-2V2h-2V0h4V4z M2,4H0V0h4v2H2V4z M12,2H6V0h6V2z"></path> </g> </g></svg>
\ No newline at end of file
diff --git a/ZXBStudio/ZXBasicStudio.csproj b/ZXBStudio/ZXBasicStudio.csproj
index 2c38e46..e7e38b8 100644
--- a/ZXBStudio/ZXBasicStudio.csproj
+++ b/ZXBStudio/ZXBasicStudio.csproj
@@ -170,6 +170,7 @@
     <None Remove="Svg\gears-solid.svg" />
     <None Remove="Svg\github.svg" />
     <None Remove="Svg\hashtag-solid.svg" />
+    <None Remove="Svg\hide.svg" />
     <None Remove="Svg\ImageImport.svg" />
     <None Remove="Svg\invert-color-svgrepo-com.svg" />
     <None Remove="Svg\invert-mode-svgrepo-com.svg" />
@@ -195,6 +196,7 @@
     <None Remove="Svg\redo.svg" />
     <None Remove="Svg\scissors-solid.svg" />
     <None Remove="Svg\Seal.svg" />
+    <None Remove="Svg\select.svg" />
     <None Remove="Svg\square-minus-solid.svg" />
     <None Remove="Svg\square-plus-solid.svg" />
     <None Remove="Svg\stop-solid.svg" />
@@ -359,6 +361,8 @@
     <AvaloniaResource Include="Svg\circle-question-solid.svg" />
     <AvaloniaResource Include="Svg\Documents\file-zxramdisk.svg" />
     <AvaloniaResource Include="Svg\github.svg" />
+    <AvaloniaResource Include="Svg\hide.svg" />
+    <AvaloniaResource Include="Svg\select.svg" />
     <AvaloniaResource Include="Svg\White\book.svg" />
     <AvaloniaResource Include="Svg\White\chat.svg" />
     <AvaloniaResource Include="Svg\White\discord.svg" />

From 3e0de1ca99e82527920a2dce0eec91a9203280c2 Mon Sep 17 00:00:00 2001
From: Juan Segura <juansda@hotmail.com>
Date: Sun, 1 Jun 2025 23:37:36 +0200
Subject: [PATCH 4/7] Added color picker button

---
 .../ZXGraphics/SpriteEditor.axaml                |  4 ++--
 .../ZXGraphics/SpriteEditor.axaml.cs             |  9 +++++++++
 .../ZXGraphics/SpritePatternEditor.axaml.cs      | 16 +++++++++++++++-
 ZXBStudio/Svg/picker.svg                         |  7 +++++++
 ZXBStudio/ZXBasicStudio.csproj                   |  2 ++
 5 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 ZXBStudio/Svg/picker.svg

diff --git a/ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml b/ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml
index 98d8a9f..f38140e 100644
--- a/ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml
+++ b/ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml
@@ -106,8 +106,8 @@
           <ToggleButton Classes="toolbar" Name="btnViewAttributes" ToolTip.Tip="Hide or view attributes" IsChecked="True">
             <svg:Svg Path="/Svg/hide.svg"></svg:Svg>
           </ToggleButton>
-          <ToggleButton Classes="toolbar" Name="btnSelectPixelsCell" ToolTip.Tip="Select cell"  IsChecked="True" IsVisible="False">
-            <svg:Svg Path="/Svg/select.svg"></svg:Svg>
+          <ToggleButton Classes="toolbar" Name="btnColorPicker" ToolTip.Tip="Select cell"  IsChecked="True">
+            <svg:Svg Path="/Svg/picker.svg"></svg:Svg>
           </ToggleButton>
           <ToggleButton Classes="toolbar" Name="btnInvertPixelsCell" ToolTip.Tip="Invert pixels on selected cell" IsChecked="True">
             <svg:Svg Path="/Svg/invert-mode-svgrepo-com.svg"></svg:Svg>
diff --git a/ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml.cs b/ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml.cs
index 1d65b18..0168356 100644
--- a/ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml.cs
+++ b/ZXBStudio/DocumentEditors/ZXGraphics/SpriteEditor.axaml.cs
@@ -327,6 +327,7 @@ private void _Initialize(string fileName)
             btnRedo.Tapped += BtnRedo_Tapped;
 
             btnViewAttributes.Tapped += BtnViewAttributes_Tapped;
+            btnColorPicker.Tapped += BtnColorPicker_Tapped;
             btnInvertColorsCell.Tapped += BtnInvertColorsCell_Tapped;
             btnInvertPixelsCell.Tapped += BtnInvertPixelsCell_Tapped;            
 
@@ -711,6 +712,9 @@ private void Editor_Command(SpritePatternEditor sender, string command)
                             ctrlProperties.PrimaryColor = sender.PrimaryColorIndex;
                             ctrlProperties.SecondaryColor = sender.SecondaryColorIndex;
                             ctrlPreview.SpriteData = sender.SpriteData;
+
+                            btnColorPicker.IsChecked = !ctrlEditor.ColorPicker;
+                            UpdateColorPanel();
                         }
                     }
                     break;
@@ -1026,6 +1030,11 @@ private void BtnViewAttributes_Tapped(object? sender, TappedEventArgs e)
             ctrlEditor.ViewAttributes = btnViewAttributes.IsChecked==true;
         }
 
+        private void BtnColorPicker_Tapped(object? sender, TappedEventArgs e)
+        {
+            ctrlEditor.ColorPicker = btnColorPicker.IsChecked == false;
+        }
+
 
         private void BtnInvertPixelsCell_Tapped(object? sender, TappedEventArgs e)
         {
diff --git a/ZXBStudio/DocumentEditors/ZXGraphics/SpritePatternEditor.axaml.cs b/ZXBStudio/DocumentEditors/ZXGraphics/SpritePatternEditor.axaml.cs
index d9320ae..22693db 100644
--- a/ZXBStudio/DocumentEditors/ZXGraphics/SpritePatternEditor.axaml.cs
+++ b/ZXBStudio/DocumentEditors/ZXGraphics/SpritePatternEditor.axaml.cs
@@ -103,6 +103,8 @@ public bool ViewAttributes
 
         public bool InvertColorsCell { get; set; } = false;
 
+        public bool ColorPicker { get; set; } = false;
+
         #endregion
 
 
@@ -300,7 +302,19 @@ private void GrdEditor_PointerPressed(object? sender, Avalonia.Input.PointerPres
         {
             var p = e.GetCurrentPoint(grdEditor);
 
-            if (InvertPixelsCell)
+            if (ColorPicker)
+            {
+                int x = (int)p.Position.X;
+                int y = (int)p.Position.Y;
+                x = x / (_Zoom + 1);
+                y = y / (_Zoom + 1);
+                var atr=GetAttribute(SpriteData.Patterns[SpriteData.CurrentFrame], x,y);
+                PrimaryColorIndex = atr.Ink;
+                SecondaryColorIndex = atr.Paper;
+                ColorPicker = false;
+                Refresh(true);
+            }
+            else if (InvertPixelsCell)
             {
                 GrdEditor_InvertPixelsCell(p.Position.X, p.Position.Y);
             }
diff --git a/ZXBStudio/Svg/picker.svg b/ZXBStudio/Svg/picker.svg
new file mode 100644
index 0000000..cf539f2
--- /dev/null
+++ b/ZXBStudio/Svg/picker.svg
@@ -0,0 +1,7 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
<!-- Uploaded to: SVG Repo, www.svgrepo.com, Transformed by: SVG Repo Mixer Tools -->
+<svg fill="#000000" height="800px" width="800px" version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" xml:space="preserve" stroke="#000000">
+
<g id="SVGRepo_bgCarrier" stroke-width="0"/>
+
<g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"/>
+
<g id="SVGRepo_iconCarrier"> <path d="M27.7,3.3c-1.5-1.5-3.9-1.5-5.4,0L17,8.6l-1.3-1.3c-0.4-0.4-1-0.4-1.4,0s-0.4,1,0,1.4l1.3,1.3L5,20.6 c-0.6,0.6-1,1.4-1.1,2.3C3.3,23.4,3,24.2,3,25c0,1.7,1.3,3,3,3c0.8,0,1.6-0.3,2.2-0.9C9,27,9.8,26.6,10.4,26L21,15.4l1.3,1.3 c0.2,0.2,0.5,0.3,0.7,0.3s0.5-0.1,0.7-0.3c0.4-0.4,0.4-1,0-1.4L22.4,14l5.3-5.3C29.2,7.2,29.2,4.8,27.7,3.3z M9,24.6 c-0.4,0.4-0.8,0.6-1.3,0.5c-0.4,0-0.7,0.2-0.9,0.5C6.7,25.8,6.3,26,6,26c-0.6,0-1-0.4-1-1c0-0.3,0.2-0.7,0.5-0.8 c0.3-0.2,0.5-0.5,0.5-0.9c0-0.5,0.2-1,0.5-1.3L17,11.4l2.6,2.6L9,24.6z"/> </g>
+
</svg>
\ No newline at end of file
diff --git a/ZXBStudio/ZXBasicStudio.csproj b/ZXBStudio/ZXBasicStudio.csproj
index e7e38b8..baef0c0 100644
--- a/ZXBStudio/ZXBasicStudio.csproj
+++ b/ZXBStudio/ZXBasicStudio.csproj
@@ -189,6 +189,7 @@
     <None Remove="Svg\minus-solid.svg" />
     <None Remove="Svg\paste-solid.svg" />
     <None Remove="Svg\pause-solid.svg" />
+    <None Remove="Svg\picker.svg" />
     <None Remove="Svg\play-solid.svg" />
     <None Remove="Svg\power-off-solid.svg" />
     <None Remove="Svg\rectangle-list-solid.svg" />
@@ -362,6 +363,7 @@
     <AvaloniaResource Include="Svg\Documents\file-zxramdisk.svg" />
     <AvaloniaResource Include="Svg\github.svg" />
     <AvaloniaResource Include="Svg\hide.svg" />
+    <AvaloniaResource Include="Svg\picker.svg" />
     <AvaloniaResource Include="Svg\select.svg" />
     <AvaloniaResource Include="Svg\White\book.svg" />
     <AvaloniaResource Include="Svg\White\chat.svg" />

From 4ddbe7417ee9191e1024092afd4b1369f24b3862 Mon Sep 17 00:00:00 2001
From: Juan Segura <juansda@hotmail.com>
Date: Mon, 2 Jun 2025 01:33:32 +0200
Subject: [PATCH 5/7] - Fixed attribute bug in paste command - Fixed import
 image bright mismatch

---
 .../ZXGraphics/SpriteImportDialog.axaml.cs      | 17 +++++++++++------
 .../ZXGraphics/SpritePatternEditor.axaml.cs     |  1 +
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ZXBStudio/DocumentEditors/ZXGraphics/SpriteImportDialog.axaml.cs b/ZXBStudio/DocumentEditors/ZXGraphics/SpriteImportDialog.axaml.cs
index 3148690..47e7129 100644
--- a/ZXBStudio/DocumentEditors/ZXGraphics/SpriteImportDialog.axaml.cs
+++ b/ZXBStudio/DocumentEditors/ZXGraphics/SpriteImportDialog.axaml.cs
@@ -330,7 +330,7 @@ private void _UpdatePreview()
                                             var dirAttr = (cy * sw) + cx;
                                             var attr = pattern.Attributes[dirAttr];
                                             attr.Bright = attr.Bright | (idxAttr > 7);
-                                            byte cCol = (byte)(idxAttr & 0b111);
+                                            byte cCol = (byte)(idxAttr /*& 0b111*/);
                                             if (paper == -1)
                                             {
                                                 attr.Paper = cCol;
@@ -406,9 +406,10 @@ private void _UpdatePreview()
 
         private int GetColor(byte r, byte g, byte b, PaletteColor[] palette)
         {
-            if (r > 0)
+            bool brigth = false;
+            if (r > 250 || g > 250 || b > 250)
             {
-
+                brigth = true;
             }
             byte cr = GetColor_CutOff(r);
             byte cg = GetColor_CutOff(g);
@@ -428,6 +429,10 @@ private int GetColor(byte r, byte g, byte b, PaletteColor[] palette)
                     palColor.Green == p.Green &&
                     palColor.Blue == p.Blue)
                 {
+                    if (brigth && n<8)
+                    {
+                        return n + 8;
+                    }
                     return n;
                 }
             }
@@ -471,9 +476,9 @@ private byte GetColor_CutOff(byte c)
 
         private static double GetColorDistance(PaletteColor c1, PaletteColor c2)
         {
-            int rDiff = c1.Red - c2.Red;
-            int gDiff = c1.Green - c2.Green;
-            int bDiff = c1.Blue - c2.Blue;
+            int rDiff = Math.Abs(c1.Red - c2.Red);
+            int gDiff = Math.Abs(c1.Green - c2.Green);
+            int bDiff = Math.Abs(c1.Blue - c2.Blue);
             return Math.Sqrt(rDiff * rDiff + gDiff * gDiff + bDiff * bDiff);
         }
 
diff --git a/ZXBStudio/DocumentEditors/ZXGraphics/SpritePatternEditor.axaml.cs b/ZXBStudio/DocumentEditors/ZXGraphics/SpritePatternEditor.axaml.cs
index 22693db..1d1d99a 100644
--- a/ZXBStudio/DocumentEditors/ZXGraphics/SpritePatternEditor.axaml.cs
+++ b/ZXBStudio/DocumentEditors/ZXGraphics/SpritePatternEditor.axaml.cs
@@ -561,6 +561,7 @@ public async void Paste()
                 else
                 {
                     SpriteData.Patterns[SpriteData.CurrentFrame].RawData = cbPatterns[0].RawData;
+                    SpriteData.Patterns[SpriteData.CurrentFrame].Attributes = cbPatterns[0].Attributes;
                 }
             }
             else

From 6f2171ab84c2a1c99a1eeb6b8ff90f3f06948e0e Mon Sep 17 00:00:00 2001
From: Juan Segura <juansda@hotmail.com>
Date: Sun, 5 Oct 2025 16:04:39 +0200
Subject: [PATCH 6/7] v1.6.0-beta5

---
 ZXBStudio/BuildSystem/ZXProjectBuilder.cs | 6 +++++-
 ZXBStudio/Dialogs/ZXAboutDialog.axaml.cs  | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ZXBStudio/BuildSystem/ZXProjectBuilder.cs b/ZXBStudio/BuildSystem/ZXProjectBuilder.cs
index 3341b83..80e702e 100644
--- a/ZXBStudio/BuildSystem/ZXProjectBuilder.cs
+++ b/ZXBStudio/BuildSystem/ZXProjectBuilder.cs
@@ -123,7 +123,11 @@ public class ZXProjectBuilder
                     }
                 }
 
-                byte[] binary = File.ReadAllBytes(binFile);
+                byte[] binary = new byte[0];
+                if (File.Exists(binFile))
+                {
+                    binary = File.ReadAllBytes(binFile);
+                }
 
                 Cleanup(project.ProjectPath, binFile);
 
diff --git a/ZXBStudio/Dialogs/ZXAboutDialog.axaml.cs b/ZXBStudio/Dialogs/ZXAboutDialog.axaml.cs
index 2305e45..c855260 100644
--- a/ZXBStudio/Dialogs/ZXAboutDialog.axaml.cs
+++ b/ZXBStudio/Dialogs/ZXAboutDialog.axaml.cs
@@ -12,8 +12,8 @@ public ZXAboutDialog()
     {
         InitializeComponent();
 
-        txtBuild.Text = "1.6.0-beta4";
-        txtDate.Text = "2025-05-21";
+        txtBuild.Text = "1.6.0-beta5";
+        txtDate.Text = "2025-10-05";
 
         btnClose.Click += BtnClose_Click;
 

From fb27aa585cfa1e49b51270379617138d5a648223 Mon Sep 17 00:00:00 2001
From: Juan Segura <juansda@hotmail.com>
Date: Sun, 5 Oct 2025 17:35:59 +0200
Subject: [PATCH 7/7] v1.6.0 - beta 5 (reloaded)

---
 ZXBStudio/Dialogs/SplashScreen.axaml     | 3 ++-
 ZXBStudio/Dialogs/SplashScreen.axaml.cs  | 1 +
 ZXBStudio/Dialogs/ZXAboutDialog.axaml.cs | 4 ++--
 ZXBStudio/Program.cs                     | 3 +++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ZXBStudio/Dialogs/SplashScreen.axaml b/ZXBStudio/Dialogs/SplashScreen.axaml
index b4e06de..e64bebd 100644
--- a/ZXBStudio/Dialogs/SplashScreen.axaml
+++ b/ZXBStudio/Dialogs/SplashScreen.axaml
@@ -12,7 +12,8 @@
 		    Topmost="True">
   <Border BorderBrush="Black" BorderThickness="2">
     <Grid RowDefinitions="*,Auto">
-      <Image Grid.RowSpan="2" Source="/Assets/LogoBig.png"></Image>      
+      <Image Grid.RowSpan="2" Source="/Assets/LogoBig.png"></Image>
+      <Label x:Name="lblVersion" VerticalAlignment="Bottom"/>
     </Grid>
   </Border>
 </Window>
diff --git a/ZXBStudio/Dialogs/SplashScreen.axaml.cs b/ZXBStudio/Dialogs/SplashScreen.axaml.cs
index 1059378..0f58757 100644
--- a/ZXBStudio/Dialogs/SplashScreen.axaml.cs
+++ b/ZXBStudio/Dialogs/SplashScreen.axaml.cs
@@ -8,6 +8,7 @@ public partial class SplashScreen : Window
         public SplashScreen()
         {
             InitializeComponent();
+            lblVersion.Content=$"{Program.Version} | {Program.VersionDate}";
         }
     }
 }
diff --git a/ZXBStudio/Dialogs/ZXAboutDialog.axaml.cs b/ZXBStudio/Dialogs/ZXAboutDialog.axaml.cs
index c855260..6aba0e8 100644
--- a/ZXBStudio/Dialogs/ZXAboutDialog.axaml.cs
+++ b/ZXBStudio/Dialogs/ZXAboutDialog.axaml.cs
@@ -12,8 +12,8 @@ public ZXAboutDialog()
     {
         InitializeComponent();
 
-        txtBuild.Text = "1.6.0-beta5";
-        txtDate.Text = "2025-10-05";
+        txtBuild.Text = Program.Version;
+        txtDate.Text = Program.VersionDate;
 
         btnClose.Click += BtnClose_Click;
 
diff --git a/ZXBStudio/Program.cs b/ZXBStudio/Program.cs
index ff67436..3a1420b 100644
--- a/ZXBStudio/Program.cs
+++ b/ZXBStudio/Program.cs
@@ -8,6 +8,9 @@ namespace ZXBasicStudio
 {
     internal class Program
     {
+        public static string Version = "1.6.0 - beta 5";
+        public static string VersionDate = "2025.10.05";
+
         // Initialization code. Don't use any Avalonia, third-party APIs or any
         // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
         // yet and stuff might break.