Palette (#8)

* Colorpicker

* VS Cleanup

* Current palette set

* VS Cleanup

* Right panel in scrollbar

* Update readme

* Palete button icons

* Palette commands without IO; Tab size stretch

* Palettes IO

* Palette list button; Empty PaletteWindow

* Palette selection

* Palette rename

Author: Mateusz-Nejman

Pixed.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.11.35208.52
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pixed", "Pixed\Pixed.csproj", "{CE3A10C1-6BEB-4A34-9CED-0542EA04D6BB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pixed", "Pixed\Pixed.csproj", "{CE3A10C1-6BEB-4A34-9CED-0542EA04D6BB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Pixed/ActionCommand.cs

@@ -5,15 +5,15 @@ namespace Pixed
     internal class ActionCommand<T> : ICommand
     {
         #region Fields
-        private readonly Action<T> action;
+        private readonly Action<T> _action;
         #endregion
         #region Events
         public event EventHandler? CanExecuteChanged;
         #endregion
         #region Constructors
         public ActionCommand(Action<T> action)
         {
-            this.action = action;
+            this._action = action;
             CanExecuteChanged?.Invoke(this, EventArgs.Empty);
         }
 
@@ -31,28 +31,28 @@ public void Execute(object? parameter)
                 return;
             }
 
-            action?.Invoke((T)parameter);
+            _action?.Invoke((T)parameter);
         }
 
         public void Execute(T parameter)
         {
-            action?.Invoke(parameter);
+            _action?.Invoke(parameter);
         }
         #endregion
     }
 
     internal class ActionCommand : ICommand
     {
         #region Fields
-        private readonly Action action;
+        private readonly Action _action;
         #endregion
         #region Events
         public event EventHandler? CanExecuteChanged;
         #endregion
         #region Constructors
         public ActionCommand(Action action)
         {
-            this.action = action;
+            this._action = action;
             CanExecuteChanged?.Invoke(this, EventArgs.Empty);
         }
 
@@ -70,7 +70,43 @@ public void Execute(object? parameter)
 
         public void Execute()
         {
-            action?.Invoke();
+            _action?.Invoke();
+        }
+        #endregion
+    }
+
+    internal class StaticActionCommand<T> : ICommand
+    {
+        #region Fields
+        private readonly Action<T> _action;
+        private readonly T _parameter;
+        #endregion
+        #region Events
+        public event EventHandler? CanExecuteChanged;
+        #endregion
+        #region Constructors
+        public StaticActionCommand(Action<T> action, T param)
+        {
+            this._action = action;
+            _parameter = param;
+            CanExecuteChanged?.Invoke(this, EventArgs.Empty);
+        }
+
+        #endregion
+        #region Public Methods
+        public bool CanExecute(object? parameter)
+        {
+            return true;
+        }
+
+        public void Execute(object? parameter)
+        {
+            Execute();
+        }
+
+        public void Execute()
+        {
+            _action?.Invoke(_parameter);
         }
         #endregion
     }

Pixed/App.xaml

@@ -4,6 +4,11 @@
              xmlns:local="clr-namespace:Pixed"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
-        <ResourceDictionary Source="Styles.xaml"/>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="Styles.xaml"/>
+                <ResourceDictionary Source="pack://application:,,,/ColorPicker;component/Styles/DefaultColorPickerStyle.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
     </Application.Resources>
 </Application>

Pixed/Constants.cs

@@ -1,6 +1,4 @@
-using System.Drawing;
-
-namespace Pixed
+namespace Pixed
 {
     internal static class Constants
     {

Pixed/Controls/ColorGrid.xaml

@@ -0,0 +1,12 @@
+<UserControl x:Class="Pixed.Controls.ColorGrid"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Pixed.Controls"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <StackPanel Name="colorStack" MinHeight="30">
+        
+    </StackPanel>
+</UserControl>

Pixed/Controls/ColorGrid.xaml.cs

@@ -0,0 +1,83 @@
+using System.Collections.ObjectModel;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+
+namespace Pixed.Controls
+{
+    /// <summary>
+    /// Interaction logic for ColorGrid.xaml
+    /// </summary>
+    public partial class ColorGrid : UserControl
+    {
+        public int Columns
+        {
+            get { return (int)GetValue(ColumnsProperty); }
+            set { SetValue(ColumnsProperty, value); }
+        }
+
+        internal ObservableCollection<UniColor> Colors
+        {
+            get { return (ObservableCollection<UniColor>)GetValue(ColorsProperty); }
+            set { SetValue(ColorsProperty, value); }
+        }
+
+        public static readonly DependencyProperty ColumnsProperty = DependencyProperty.Register("Columns", typeof(int), typeof(ColorGrid), new PropertyMetadata(1));
+        public static readonly DependencyProperty ColorsProperty = DependencyProperty.Register("Colors", typeof(ObservableCollection<UniColor>), typeof(ColorGrid), new PropertyMetadata(new ObservableCollection<UniColor>(), OnColorsChanged));
+        public ColorGrid()
+        {
+            InitializeComponent();
+        }
+
+        private void RefreshControls()
+        {
+            colorStack.Children.Clear();
+
+            int gridCount = (int)Math.Ceiling((double)Colors.Count / (double)Columns);
+            int colorIndex = 0;
+
+            for (int g = 0; g < gridCount; g++)
+            {
+                Grid grid = new();
+                grid.Height = 30;
+
+                for (int a = 0; a < Columns; a++)
+                {
+                    grid.ColumnDefinitions.Add(new ColumnDefinition() { Width = new GridLength(1, GridUnitType.Star) });
+                }
+
+                for (int a = 0; a < Columns; a++)
+                {
+                    if (colorIndex >= Colors.Count)
+                    {
+                        break;
+                    }
+
+                    Button colorButton = new Button();
+                    colorButton.BorderBrush = new SolidColorBrush(Colors[colorIndex]);
+                    colorButton.Background = new SolidColorBrush(Colors[colorIndex]);
+                    colorButton.Command = new ActionCommand<UniColor>(Subjects.PrimaryColorChange.OnNext);
+                    colorButton.CommandParameter = Colors[colorIndex];
+                    colorButton.Width = 30;
+                    colorButton.Height = 30;
+                    Grid.SetColumn(colorButton, a);
+
+                    grid.Children.Add(colorButton);
+                    colorIndex++;
+                }
+
+                colorStack.Children.Add(grid);
+            }
+        }
+
+        private static void OnColorsChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (e.NewValue == null)
+            {
+                return;
+            }
+            var grid = (ColorGrid)d;
+            grid.RefreshControls();
+        }
+    }
+}

Pixed/Converters/TabSizeConverter.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+using System.Windows.Data;
+
+namespace Pixed.Converters
+{
+    public class TabSizeConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter,
+            System.Globalization.CultureInfo culture)
+        {
+            TabControl tabControl = values[0] as TabControl;
+            double width = tabControl.ActualWidth / tabControl.Items.Count;
+            return (width <= 1) ? 0 : (width - tabControl.Items.Count);
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter,
+            System.Globalization.CultureInfo culture)
+        {
+            throw new NotSupportedException();
+        }
+    }
+}

Pixed/Global.cs

@@ -1,13 +1,16 @@
 using Pixed.Models;
 using Pixed.Selection;
 using Pixed.Services.Keyboard;
+using Pixed.Services.Palette;
 using Pixed.Tools;
 
 namespace Pixed
 {
     internal static class Global
     {
+        public static string DataFolder { get; set; }
         public static ShortcutService? ShortcutService { get; set; }
+        public static PaletteService? PaletteService { get; set; }
         public static SelectionManager? SelectionManager { get; set; }
         public static Settings UserSettings { get; set; } = new Settings();
         public static BaseTool ToolSelected { get; set; }
@@ -19,5 +22,7 @@ internal static class Global
         public static Frame CurrentFrame => CurrentModel.Frames[CurrentFrameIndex];
         public static Layer CurrentLayer => CurrentFrame.Layers[CurrentLayerIndex];
         public static ToolSelector ToolSelector { get; set; }
+        public static UniColor PrimaryColor { get; set; }
+        public static UniColor SecondaryColor { get; set; }
     }
 }