Fixed layers drag and drop

src/PixiEditor.AvaloniaUI/Views/Layers/FolderControl.axaml

@@ -38,8 +38,8 @@
                 <RowDefinition Height="16"/>
                 <RowDefinition Height="10"/>
             </Grid.RowDefinitions>
-            <Grid DragDrop.AllowDrop="True" Grid.Row="0" Grid.ColumnSpan="3" Background="Transparent" Panel.ZIndex="3"/>
-            <Grid IsVisible="False" x:Name="middleDropGrid" Grid.Row="1" DragDrop.AllowDrop="True" Panel.ZIndex="2" Background="Transparent"></Grid>
+            <Grid DragDrop.AllowDrop="True" helpers:DragDropEvents.DragEnter="Grid_DragEnter" helpers:DragDropEvents.Drop="Grid_Drop_Top" helpers:DragDropEvents.DragLeave="Grid_DragLeave" Grid.Row="0" Grid.ColumnSpan="3" Background="Transparent" Panel.ZIndex="3"/>
+            <Grid IsVisible="True" x:Name="middleDropGrid" Grid.Row="1" DragDrop.AllowDrop="True" Panel.ZIndex="2" Background="Transparent" helpers:DragDropEvents.DragEnter="Grid_CenterEnter" helpers:DragDropEvents.Drop="Grid_Drop_Center" helpers:DragDropEvents.DragLeave="Grid_CenterLeave"></Grid>
             <Grid x:Name="centerGrid" Grid.Row="0" Grid.RowSpan="3" Background="Transparent">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="24"/>
@@ -127,6 +127,8 @@
             </Grid>
             <Grid
                   Grid.Row="2"
+                  helpers:DragDropEvents.DragEnter="Grid_DragEnter" helpers:DragDropEvents.Drop="Grid_Drop_Bottom"
+                  helpers:DragDropEvents.DragLeave="Grid_DragLeave"
                   DragDrop.AllowDrop="false"
                   Grid.ColumnSpan="2" Background="Transparent"/>
         </Grid>

src/PixiEditor.AvaloniaUI/Views/Layers/FolderControl.axaml.cs

@@ -40,7 +40,11 @@ internal partial class FolderControl : UserControl
     public FolderControl()
     {
         InitializeComponent();
-        highlightColor = (Brush?)App.Current.Resources["SoftSelectedLayerColor"];
+        if (App.Current.TryGetResource("SoftSelectedLayerBrush", App.Current.ActualThemeVariant, out var value))
+        {
+            highlightColor = value as IBrush;
+        }
+
         Loaded += OnLoaded;
     }
 

src/PixiEditor.AvaloniaUI/Views/Layers/LayerControl.axaml

@@ -136,12 +136,25 @@
                             IsVisible="{Binding Layer.LockTransparencyBindable, ElementName=uc}"/>
                     </WrapPanel>
                 </StackPanel>
-                <Grid Margin="0, 0, 0, -2.5" helpers:DragDropEvents.DragEnter="Grid_DragEnter" VerticalAlignment="Bottom" helpers:DragDropEvents.Drop="Grid_Drop_Below"  helpers:DragDropEvents.DragLeave="Grid_DragLeave" Height="10" Grid.Row="2" Grid.Column="0" DragDrop.AllowDrop="True"  Background="Transparent" Name="dropBelowGrid"/>
-                <Grid Margin="0, 0, 0, -2.5" VerticalAlignment="Bottom" Height="10" Grid.Row="2" Grid.Column="1" Background="{Binding ElementName=dropBelowGrid, Path=Background}"/>
+                <Grid Margin="0, 0, 0, -2.5"
+                      helpers:DragDropEvents.DragEnter="Grid_DragEnter"
+                      VerticalAlignment="Bottom"
+                      helpers:DragDropEvents.Drop="Grid_Drop_Below"
+                      helpers:DragDropEvents.DragLeave="Grid_DragLeave"
+                      Height="10" Grid.Row="2" Grid.Column="0"
+                      DragDrop.AllowDrop="True"  Background="Transparent" Name="dropBelowGrid"/>
+                <Grid Margin="0, 0, 0, -2.5"
+                      VerticalAlignment="Bottom"
+                      Height="10" Grid.Row="2"
+                      Grid.Column="1"
+                      Background="{Binding ElementName=dropBelowGrid, Path=Background}"/>
 
-                <Grid Margin="0, 0, 0, -2.5" VerticalAlignment="Bottom" Height="10" Grid.Row="2" Grid.Column="2"
-                      helpers:DragDropEvents.DragEnter="Grid_DragEnter" helpers:DragDropEvents.Drop="Grid_Drop_Bottom" helpers:DragDropEvents.DragLeave="Grid_DragLeave"
-                      DragDrop.AllowDrop="True"  Background="Transparent"/>
+                <Grid Margin="0, 0, 0, -2.5" VerticalAlignment="Bottom"
+                      Height="10" Grid.Row="2" Grid.Column="2"
+                      helpers:DragDropEvents.DragEnter="Grid_DragEnter"
+                      helpers:DragDropEvents.Drop="Grid_Drop_Bottom"
+                      helpers:DragDropEvents.DragLeave="Grid_DragLeave"
+                      DragDrop.AllowDrop="True" Background="Transparent"/>
             </Grid>
         </Grid>
         <Border.ContextMenu>

src/PixiEditor.AvaloniaUI/Views/Layers/LayerControl.axaml.cs

@@ -77,7 +77,11 @@ internal partial class LayerControl : UserControl
     {
         InitializeComponent();
         Loaded += LayerControl_Loaded;
-        highlightColor = (Brush?)App.Current.Resources["SoftSelectedLayerColor"];
+
+        if (App.Current.TryGetResource("SoftSelectedLayerBrush", App.Current.ActualThemeVariant, out var value))
+        {
+            highlightColor = value as IBrush;
+        }
     }
 
     private void LayerControl_Loaded(object sender, RoutedEventArgs e)

src/PixiEditor.AvaloniaUI/Views/Palettes/PaletteViewer.axaml.cs

@@ -260,7 +260,6 @@ internal partial class PaletteViewer : UserControl
                     Colors.Insert(newIndex, paletteColor);
                     int indexOfSource = Colors.IndexOf(paletteColorControl.Color);
                     Colors.Move(indexOfSource, currIndex);
-                    RefreshAllItems();
                 }
             }
         }