ToolDock wip

src/PixiEditor.AvaloniaUI/Styles/ToolPickerButton.Styles.axaml

@@ -4,12 +4,14 @@
         xmlns:system="clr-namespace:System;assembly=System.Runtime">
 
     <Styles.Resources>
+        <Color x:Key="SelectedToolBorderColor">#fff</Color>
         <CornerRadius x:Key="SelectedToolCornerRadius">50</CornerRadius>
+        <SolidColorBrush x:Key="SelectedToolBorderBrush" Color="{StaticResource SelectedToolBorderColor}"/>
     </Styles.Resources>
 
     <Style Selector="tools|ToolPickerButton Border">
         <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderThickness" Value="2" />
         <Setter Property="CornerRadius" Value="{DynamicResource SelectedToolCornerRadius}" />
     </Style>
 

src/PixiEditor.AvaloniaUI/Views/Main/Tools/ToolsPicker.axaml.cs

@@ -3,6 +3,7 @@ using System.Windows.Input;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using Dock.Model.Core;
 using PixiEditor.AvaloniaUI.Models.Handlers;
 using PixiEditor.AvaloniaUI.ViewModels.Tools;
 

src/PixiEditor.AvaloniaUI/Views/Main/Viewport.axaml

@@ -118,11 +118,6 @@
         </Border>
             </views:TogglableFlyout.Child>
         </views:TogglableFlyout>
-        <main:ToolsPicker ZIndex="2"
-                          Margin="10 0 0 0"
-                          HorizontalAlignment="Left"
-                          VerticalAlignment="Center"
-                          Tools="{Binding Source={viewModels:MainVM}, Path=ToolsSubViewModel.ToolSet}"/>
         <zoombox:Zoombox
             Tag="{Binding ElementName=vpUc}"
             x:Name="zoombox"

src/PixiEditor.AvaloniaUI/Views/MainView.axaml

@@ -26,6 +26,11 @@
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
         <main1:MainTitleBar/>
+        <main1:ToolsPicker ZIndex="2" Grid.Row="1"
+                           Margin="10 0 0 0"
+                           HorizontalAlignment="Left"
+                           VerticalAlignment="Center"
+                           Tools="{Binding Path=ToolsSubViewModel.ToolSet}"/>
         <DockControl Grid.Row="1" Layout="{Binding LayoutDockSubViewModel.Layout}"/>
     </Grid>
 </UserControl>

src/PixiEditor.UI.Common/Accents/Base.axaml

@@ -32,8 +32,6 @@
 
             <Color x:Key="NotificationCardBackgroundColor">#303030</Color>
 
-            <Color x:Key="SelectedToolBorderColor">#fff</Color>
-
             <system:Double x:Key="ThemeDisabledOpacity">0.4</system:Double>
 
             <SolidColorBrush x:Key="ThemeBackgroundBrush" Color="{StaticResource ThemeBackgroundColor}" />
@@ -61,7 +59,6 @@
             <SolidColorBrush x:Key="ErrorBrush" Color="{StaticResource ErrorColor}" />
             <SolidColorBrush x:Key="GlyphBrush" Color="{StaticResource GlyphColor}"/>
 
-            <SolidColorBrush x:Key="SelectedToolBorderBrush" Color="{StaticResource SelectedToolBorderColor}"/>
 
             <CornerRadius x:Key="ControlCornerRadius">5</CornerRadius>
             <system:Double x:Key="ControlCornerRadiusValue">5</system:Double>

src/PixiEditor.UI.Common/Controls/Dock/Controls/DockControl.axaml

@@ -27,7 +27,9 @@
             <DataTemplate DataType="dmc:IDocumentDock">
               <DocumentDockControl />
             </DataTemplate>
-
+            <DataTemplate DataType="dmc:IToolDock">
+              <ToolDockControl />
+            </DataTemplate>
             <DataTemplate DataType="dmc:IProportionalDock">
               <ProportionalDockControl />
             </DataTemplate>