Added color picker button

Juan Segura · Juan Segura · commit 3e0de1ca99e8 · 2025-06-01T23:37:36.000+02:00
diff --git 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
@@ -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
@@ -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
@@ -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>
diff --git 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" />

Original file line number	Diff line number	Diff line change
`@@ -327,6 +327,7 @@ private void _Initialize(string fileName)`
`327`	`327`	`btnRedo.Tapped += BtnRedo_Tapped;`
`328`	`328`
`329`	`329`	`btnViewAttributes.Tapped += BtnViewAttributes_Tapped;`
	`330`	`+ btnColorPicker.Tapped += BtnColorPicker_Tapped;`
`330`	`331`	`btnInvertColorsCell.Tapped += BtnInvertColorsCell_Tapped;`
`331`	`332`	`btnInvertPixelsCell.Tapped += BtnInvertPixelsCell_Tapped;`
`332`	`333`
`@@ -711,6 +712,9 @@ private void Editor_Command(SpritePatternEditor sender, string command)`
`711`	`712`	`ctrlProperties.PrimaryColor = sender.PrimaryColorIndex;`
`712`	`713`	`ctrlProperties.SecondaryColor = sender.SecondaryColorIndex;`
`713`	`714`	`ctrlPreview.SpriteData = sender.SpriteData;`
	`715`	`+`
	`716`	`+ btnColorPicker.IsChecked = !ctrlEditor.ColorPicker;`
	`717`	`+ UpdateColorPanel();`
`714`	`718`	`}`
`715`	`719`	`}`
`716`	`720`	`break;`
`@@ -1026,6 +1030,11 @@ private void BtnViewAttributes_Tapped(object? sender, TappedEventArgs e)`
`1026`	`1030`	`ctrlEditor.ViewAttributes = btnViewAttributes.IsChecked==true;`
`1027`	`1031`	`}`
`1028`	`1032`
	`1033`	`+ private void BtnColorPicker_Tapped(object? sender, TappedEventArgs e)`
	`1034`	`+ {`
	`1035`	`+ ctrlEditor.ColorPicker = btnColorPicker.IsChecked == false;`
	`1036`	`+ }`
	`1037`	`+`
`1029`	`1038`
`1030`	`1039`	`private void BtnInvertPixelsCell_Tapped(object? sender, TappedEventArgs e)`
`1031`	`1040`	`{`