Преглед на файлове

Added color viewer beneath tools

CPKreuz преди 3 години
родител
ревизия
78c4e103be
променени са 2 файла, в които са добавени 19 реда и са изтрити 5 реда
  1. 10 1
      PixiEditor/Helpers/Converters/SKColorToMediaColorConverter.cs
  2. 9 4
      PixiEditor/Views/MainWindow.xaml

+ 10 - 1
PixiEditor/Helpers/Converters/SKColorToMediaColorConverter.cs

@@ -11,7 +11,16 @@ namespace PixiEditor.Helpers.Converters
         public override object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             var skcolor = (SKColor)value;
-            return Color.FromArgb(skcolor.Alpha, skcolor.Red, skcolor.Green, skcolor.Blue);
+            var color = Color.FromArgb(skcolor.Alpha, skcolor.Red, skcolor.Green, skcolor.Blue);
+
+            if (targetType == typeof(Brush))
+            {
+                return new SolidColorBrush(color);
+            }
+            else
+            {
+                return color;
+            }
         }
 
         public override object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

+ 9 - 4
PixiEditor/Views/MainWindow.xaml

@@ -708,9 +708,11 @@
                 Background="{StaticResource AccentColor}"
                 Grid.RowSpan="2"
                 CornerRadius="5,0,5,5">
-                <StackPanel
-                    Orientation="Vertical"
-                    Cursor="Arrow">
+                <Grid Cursor="Arrow">
+                    <Grid.RowDefinitions>
+                        <RowDefinition/>
+                        <RowDefinition Height="Auto"/>
+                    </Grid.RowDefinitions>
 
                     <ItemsControl
                         ItemsSource="{Binding ToolsSubViewModel.ToolSet}">
@@ -740,7 +742,10 @@
                             </DataTemplate>
                         </ItemsControl.ItemTemplate>
                     </ItemsControl>
-                </StackPanel>
+                    <Border Background="{Binding ColorsSubViewModel.PrimaryColor, Mode=TwoWay, Converter={converters:SKColorToMediaColorConverter}}"
+                            BorderBrush="Gray" BorderThickness="1" CornerRadius="0,0,5,5"
+                            Grid.Row="1" Height="30"/>
+                </Grid>
             </Border>
 
             <Grid