From 9b02f6da0bb023ed965a291158bb223410ccae2b Mon Sep 17 00:00:00 2001
From: Jan Scheperski <jan.scheperski@gmail.com>
Date: Sun, 22 Jan 2023 09:44:35 +0100
Subject: [PATCH 1/5] support moving items in inventory

---
 Loki/InventorySlotEditor.xaml    |  3 ++-
 Loki/InventorySlotEditor.xaml.cs | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/Loki/InventorySlotEditor.xaml b/Loki/InventorySlotEditor.xaml
index e418606..ebae117 100644
--- a/Loki/InventorySlotEditor.xaml
+++ b/Loki/InventorySlotEditor.xaml
@@ -167,7 +167,7 @@
     </UserControl.Resources>
 
 
-    <Border CornerRadius="4" x:Name="LayoutRoot" AllowDrop="True" Drop="BorderDrop">
+    <Border CornerRadius="4" x:Name="LayoutRoot" AllowDrop="True" Drop="BorderDrop" MouseMove="BorderMouseMove">
         <Border.Style>
             <Style TargetType="Border">
                 <Setter Property="Background" Value="DarkGray"/>
@@ -226,6 +226,7 @@
                             <Grid.Effect>
                                 <DropShadowEffect ShadowDepth="0" />
                             </Grid.Effect>
+                            <Image Source="{Binding Item.SharedData.Thumbnail}" Width="48" Height="48" Margin="5"  VerticalAlignment="Top"></Image>
                             <TextBlock
                                 TextWrapping="Wrap" TextAlignment="Center"
                                 FontSize="18" FontWeight="DemiBold" Foreground="White"
diff --git a/Loki/InventorySlotEditor.xaml.cs b/Loki/InventorySlotEditor.xaml.cs
index 544c228..14872a1 100644
--- a/Loki/InventorySlotEditor.xaml.cs
+++ b/Loki/InventorySlotEditor.xaml.cs
@@ -22,6 +22,7 @@ private void BorderDrop(object sender, DragEventArgs e)
         {
             if (e.Data.GetData(typeof(SharedItemData)) is SharedItemData itemData)
             {
+                // drop from item picker
                 if (this.DataContext is InventorySlot slot)
                 {
                     var customData = new List<(string, string)>();
@@ -29,6 +30,27 @@ private void BorderDrop(object sender, DragEventArgs e)
                         false, 1, 0, MainWindow.selectedPlayerProfile.PlayerId, MainWindow.selectedPlayerProfile.PlayerName, customData);
                 }
             }
+            else if (e.Data.GetData(typeof(InventorySlot)) is InventorySlot sourceSlot)
+            {
+                // drop from inventory slot
+                if (this.DataContext is InventorySlot slot && sourceSlot != slot)
+                {
+                    slot.Item = sourceSlot.Item;
+                    sourceSlot.Item = null;
+                }
+            }
+        }
+
+        private void BorderMouseMove(object sender, MouseEventArgs e)
+        {
+            if (sender is FrameworkElement element && e.LeftButton == MouseButtonState.Pressed)
+            {
+                if (element.DataContext is InventorySlot slot)
+                {
+                    var data = new DataObject(slot);
+                    DragDrop.DoDragDrop(element, data, DragDropEffects.Move);
+                }
+            }
         }
 
         private void StackEditPreviewMouseDown(object sender, MouseButtonEventArgs e)

From 7035757364985e932c88ecce914c9d16d257aaa6 Mon Sep 17 00:00:00 2001
From: Jan Scheperski <jan.scheperski@gmail.com>
Date: Sun, 22 Jan 2023 09:46:00 +0100
Subject: [PATCH 2/5] removed line

---
 Loki/InventorySlotEditor.xaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Loki/InventorySlotEditor.xaml b/Loki/InventorySlotEditor.xaml
index ebae117..03a699f 100644
--- a/Loki/InventorySlotEditor.xaml
+++ b/Loki/InventorySlotEditor.xaml
@@ -226,7 +226,6 @@
                             <Grid.Effect>
                                 <DropShadowEffect ShadowDepth="0" />
                             </Grid.Effect>
-                            <Image Source="{Binding Item.SharedData.Thumbnail}" Width="48" Height="48" Margin="5"  VerticalAlignment="Top"></Image>
                             <TextBlock
                                 TextWrapping="Wrap" TextAlignment="Center"
                                 FontSize="18" FontWeight="DemiBold" Foreground="White"

From 99a01f3c537111886c84324741b6f1eecbd5ae55 Mon Sep 17 00:00:00 2001
From: Jan Scheperski <jan.scheperski@gmail.com>
Date: Mon, 23 Jan 2023 22:30:26 +0100
Subject: [PATCH 3/5] fixed not swapping items

---
 Loki/InventorySlotEditor.xaml.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Loki/InventorySlotEditor.xaml.cs b/Loki/InventorySlotEditor.xaml.cs
index 14872a1..bb1cbdd 100644
--- a/Loki/InventorySlotEditor.xaml.cs
+++ b/Loki/InventorySlotEditor.xaml.cs
@@ -25,7 +25,7 @@ private void BorderDrop(object sender, DragEventArgs e)
                 // drop from item picker
                 if (this.DataContext is InventorySlot slot)
                 {
-                    var customData = new List<(string, string)>();
+                    var customData = new List<(string, string)>();                    
                     slot.Item = new Item(itemData.ItemName, itemData.MaxStack, (float)itemData.MaxDurability, slot.Position,
                         false, 1, 0, MainWindow.selectedPlayerProfile.PlayerId, MainWindow.selectedPlayerProfile.PlayerName, customData);
                 }
@@ -35,8 +35,9 @@ private void BorderDrop(object sender, DragEventArgs e)
                 // drop from inventory slot
                 if (this.DataContext is InventorySlot slot && sourceSlot != slot)
                 {
+                    var targetSlotItem = slot.Item;
                     slot.Item = sourceSlot.Item;
-                    sourceSlot.Item = null;
+                    sourceSlot.Item = targetSlotItem;
                 }
             }
         }

From 4214c496aaa48b6607b26ac7352beb90db76fc36 Mon Sep 17 00:00:00 2001
From: Jan Scheperski <jan.scheperski@gmail.com>
Date: Mon, 23 Jan 2023 23:21:46 +0100
Subject: [PATCH 4/5] formatting

---
 Loki/InventorySlotEditor.xaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Loki/InventorySlotEditor.xaml.cs b/Loki/InventorySlotEditor.xaml.cs
index bb1cbdd..f688739 100644
--- a/Loki/InventorySlotEditor.xaml.cs
+++ b/Loki/InventorySlotEditor.xaml.cs
@@ -25,7 +25,7 @@ private void BorderDrop(object sender, DragEventArgs e)
                 // drop from item picker
                 if (this.DataContext is InventorySlot slot)
                 {
-                    var customData = new List<(string, string)>();                    
+                    var customData = new List<(string, string)>();
                     slot.Item = new Item(itemData.ItemName, itemData.MaxStack, (float)itemData.MaxDurability, slot.Position,
                         false, 1, 0, MainWindow.selectedPlayerProfile.PlayerId, MainWindow.selectedPlayerProfile.PlayerName, customData);
                 }

From c9a89c7fabc2ee3afba6e26b4ff9ea7cf947bb03 Mon Sep 17 00:00:00 2001
From: Jan Scheperski <jan.scheperski@gmail.com>
Date: Tue, 24 Jan 2023 21:51:47 +0100
Subject: [PATCH 5/5] fixed issue with TextBox & empty slots

---
 Loki/InventorySlotEditor.xaml.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Loki/InventorySlotEditor.xaml.cs b/Loki/InventorySlotEditor.xaml.cs
index f688739..0e20c2a 100644
--- a/Loki/InventorySlotEditor.xaml.cs
+++ b/Loki/InventorySlotEditor.xaml.cs
@@ -44,9 +44,15 @@ private void BorderDrop(object sender, DragEventArgs e)
 
         private void BorderMouseMove(object sender, MouseEventArgs e)
         {
+            if (e.Source is TextBox)
+            {
+                // TextBox has its own Drag&Drop functionality and would raise an InvalidOperationException
+                return;
+            }
+
             if (sender is FrameworkElement element && e.LeftButton == MouseButtonState.Pressed)
             {
-                if (element.DataContext is InventorySlot slot)
+                if (element.DataContext is InventorySlot slot && slot.Item != null)
                 {
                     var data = new DataObject(slot);
                     DragDrop.DoDragDrop(element, data, DragDropEffects.Move);
@@ -56,8 +62,8 @@ private void BorderMouseMove(object sender, MouseEventArgs e)
 
         private void StackEditPreviewMouseDown(object sender, MouseButtonEventArgs e)
         {
-            if (sender is TextBox {IsKeyboardFocusWithin: false} txtStack) 
-            {  
+            if (sender is TextBox { IsKeyboardFocusWithin: false } txtStack)
+            {
                 txtStack.SelectAll();
                 txtStack.Focus();
                 e.Handled = true;