Skip to content

Feature: Moving inventory items #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Feature: Moving inventory items #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9b02f6d
support moving items in inventory
lazou Jan 22, 2023
7035757
removed line
lazou Jan 22, 2023
99a01f3
fixed not swapping items
lazou Jan 23, 2023
4214c49
formatting
lazou Jan 23, 2023
c9a89c7
fixed issue with TextBox & empty slots
lazou Jan 24, 2023
6b7e28c
Merge branch 'master' into feat/moving-inventory
lazou Jan 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Loki/InventorySlotEditor.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
33 changes: 31 additions & 2 deletions Loki/InventorySlotEditor.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,48 @@ 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)>();
slot.Item = new Item(itemData.ItemName, itemData.MaxStack, (float)itemData.MaxDurability, slot.Position,
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)
{
var targetSlotItem = slot.Item;
slot.Item = sourceSlot.Item;
sourceSlot.Item = targetSlotItem;
}
}
}

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 && slot.Item != null)
{
var data = new DataObject(slot);
DragDrop.DoDragDrop(element, data, DragDropEffects.Move);
}
}
}

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;
Expand Down