From 36e31ecc5539287656e2958d307cb9073e05244b Mon Sep 17 00:00:00 2001 From: flabbet Date: Mon, 4 Jan 2021 19:30:02 +0100 Subject: [PATCH 1/9] Changed theme of portable color picker and added scrollviewer to layers --- .../ToolSettings/Settings/ColorSetting.cs | 14 ++- PixiEditor/Views/MainWindow.xaml | 96 ++++++++++--------- 2 files changed, 63 insertions(+), 47 deletions(-) diff --git a/PixiEditor/Models/Tools/ToolSettings/Settings/ColorSetting.cs b/PixiEditor/Models/Tools/ToolSettings/Settings/ColorSetting.cs index 3394821ef..b050da835 100644 --- a/PixiEditor/Models/Tools/ToolSettings/Settings/ColorSetting.cs +++ b/PixiEditor/Models/Tools/ToolSettings/Settings/ColorSetting.cs @@ -1,4 +1,5 @@ -using System.Windows.Data; +using System.Windows; +using System.Windows.Data; using System.Windows.Media; using ColorPicker; @@ -11,12 +12,19 @@ public ColorSetting(string name, string label = "") { Label = label; SettingControl = GenerateColorPicker(); - Value = Color.FromArgb(0, 0, 0, 0); + Value = Color.FromArgb(255, 255, 255, 255); } private PortableColorPicker GenerateColorPicker() { - PortableColorPicker picker = new PortableColorPicker(); + var resourceDictionary = new ResourceDictionary(); + resourceDictionary.Source = new System.Uri("pack://application:,,,/ColorPicker;component/Styles/DefaultColorPickerStyle.xaml", + System.UriKind.RelativeOrAbsolute); + PortableColorPicker picker = new PortableColorPicker + { + Style = (Style)resourceDictionary["DefaultColorPickerStyle"], + SecondaryColor = System.Windows.Media.Colors.Black + }; Binding binding = new Binding("Value") { Mode = BindingMode.TwoWay diff --git a/PixiEditor/Views/MainWindow.xaml b/PixiEditor/Views/MainWindow.xaml index a2106a901..7904e1201 100644 --- a/PixiEditor/Views/MainWindow.xaml +++ b/PixiEditor/Views/MainWindow.xaml @@ -293,58 +293,66 @@ - -