Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-08-28 15:36:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix party dragdrop same slot deletion

Browse Source 
now just aborts the dragdrop operation if the destination is the same as
the source
This commit is contained in:
Kurt
2016-12-18 23:49:27 -08:00
parent ba5ef5cf06
commit 00bdee5d58
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PKHeX/MainWindow/Main.cs
View File

@@ -4230,11 +4230,14 @@ private void pbBoxSlot_DragDrop(object sender, DragEventArgs e)
DragInfo.slotDestination = this;
DragInfo.slotDestinationSlotNumber = getSlot(sender);
DragInfo.slotDestinationOffset = getPKXOffset(DragInfo.slotDestinationSlotNumber);
DragInfo.slotDestinationBoxNumber = CB_BoxSelect.SelectedIndex;
DragInfo.slotDestinationBoxNumber = DragInfo.DestinationParty ? -1 : CB_BoxSelect.SelectedIndex;
// Check for In-Dropped files (PKX,SAV,ETC)
string[] files = (string[])e.Data.GetData(DataFormats.FileDrop);
if (Directory.Exists(files[0])) { loadBoxesFromDB(files[0]); return; }
if (DragInfo.SameSlot)
return;
if (DragInfo.SameBox)
if (SAV.getIsSlotLocked(DragInfo.slotDestinationBoxNumber, DragInfo.slotDestinationSlotNumber))
{
DragInfo.slotDestinationSlotNumber = -1; // Invalidate
@@ -4359,6 +4362,7 @@ public static class DragInfo
public static string CurrentPath;
public static bool SameBox => slotSourceBoxNumber > -1 && slotSourceBoxNumber == slotDestinationBoxNumber;
public static bool SameSlot => slotSourceSlotNumber == slotDestinationSlotNumber && slotSourceBoxNumber == slotDestinationBoxNumber;
public static bool SourceValid => slotSourceBoxNumber > -1 || SourceParty;
public static bool DestinationValid => slotDestinationBoxNumber > -1 || DestinationParty;
public static bool SourceParty => 30 <= slotSourceSlotNumber && slotSourceSlotNumber < 36;