Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-08-22 06:57:42 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix dragout-drop of party/battle slots

Browse Source 
BoxView window opened another can of worms.
This commit is contained in:
Kaphotics
2016-08-29 23:15:27 -07:00
parent f108119003
commit 037db77472
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
PKHeX/MainWindow/Main.cs
View File

@@ -3420,7 +3420,7 @@ private void pbBoxSlot_MouseMove(object sender, MouseEventArgs e)
// Prepare Data
DragInfo.slotPkmSource = SAV.getData(offset, SAV.SIZE_STORED);
DragInfo.slotSourceOffset = offset;
DragInfo.slotSourceBoxNumber = CB_BoxSelect.SelectedIndex;
DragInfo.slotSourceBoxNumber = DragInfo.slotSourceSlotNumber >= 30 ? -1 : CB_BoxSelect.SelectedIndex;
// Make a new file name based off the PID
byte[] dragdata = SAV.decryptPKM(DragInfo.slotPkmSource);
@@ -3440,7 +3440,7 @@ private void pbBoxSlot_MouseMove(object sender, MouseEventArgs e)
// Thread Blocks on DoDragDrop
DragInfo.CurrentPath = newfile;
DragDropEffects result = pb.DoDragDrop(new DataObject(DataFormats.FileDrop, new[] { newfile }), DragDropEffects.Move);
if (result != DragDropEffects.Link) // not dropped to another box slot, restore img
if (!DragInfo.SourceValid || result != DragDropEffects.Link) // not dropped to another box slot, restore img
pb.Image = img;
else // refresh image
getQuickFiller(pb, SAV.getStoredSlot(DragInfo.slotSourceOffset));
@@ -3512,7 +3512,8 @@ private void pbBoxSlot_DragDrop(object sender, DragEventArgs e)
else
{
PKM pkz = SAV.getStoredSlot(DragInfo.slotSourceOffset);
if (ModifierKeys == Keys.Alt && DragInfo.slotDestinationSlotNumber > -1) // overwrite delete old slot
if (!DragInfo.SourceValid) { } // not overwritable, do nothing
else if (ModifierKeys == Keys.Alt && DragInfo.DestinationValid) // overwrite delete old slot
{
// Clear from slot
if (DragInfo.SameBox)
@@ -3520,7 +3521,7 @@ private void pbBoxSlot_DragDrop(object sender, DragEventArgs e)
SAV.setStoredSlot(SAV.BlankPKM, DragInfo.slotSourceOffset);
}
else if (ModifierKeys != Keys.Control && DragInfo.slotDestinationSlotNumber > -1)
else if (ModifierKeys != Keys.Control && DragInfo.DestinationValid)
{
// Load data from destination
PKM pk = ((PictureBox) sender).Image != null
@@ -3586,6 +3587,8 @@ public static class DragInfo
public static string CurrentPath;
public static bool SameBox => slotSourceBoxNumber > -1 && slotSourceBoxNumber == slotDestinationBoxNumber;
public static bool SourceValid => slotSourceBoxNumber > -1;
public static bool DestinationValid => slotDestinationBoxNumber > -1;
public static void Reset()
{
slotLeftMouseIsDown = false;

7
PKHeX/Subforms/Save Editors/SAV_BoxViewer.cs
View File

@@ -182,7 +182,7 @@ private void pbBoxSlot_MouseMove(object sender, MouseEventArgs e)
// Thread Blocks on DoDragDrop
DragInfo.CurrentPath = newfile;
DragDropEffects result = pb.DoDragDrop(new DataObject(DataFormats.FileDrop, new[] { newfile }), DragDropEffects.Move);
if (result != DragDropEffects.Link) // not dropped to another box slot, restore img
if (!DragInfo.SourceValid || result != DragDropEffects.Link) // not dropped to another box slot, restore img
pb.Image = img;
else // refresh image
getQuickFiller(pb, SAV.getStoredSlot(DragInfo.slotSourceOffset));
@@ -250,7 +250,8 @@ private void pbBoxSlot_DragDrop(object sender, DragEventArgs e)
else
{
PKM pkz = SAV.getStoredSlot(DragInfo.slotSourceOffset);
if (ModifierKeys == Keys.Alt && DragInfo.slotDestinationSlotNumber > -1) // overwrite
if (!DragInfo.SourceValid) { } // not overwritable, do nothing
else if (ModifierKeys == Keys.Alt && DragInfo.DestinationValid) // overwrite
{
// Clear from slot
if (DragInfo.SameBox)
@@ -258,7 +259,7 @@ private void pbBoxSlot_DragDrop(object sender, DragEventArgs e)
SAV.setStoredSlot(SAV.BlankPKM, DragInfo.slotSourceOffset);
}
else if (ModifierKeys != Keys.Control && DragInfo.slotDestinationSlotNumber > -1) // move
else if (ModifierKeys != Keys.Control && DragInfo.DestinationValid) // move
{
// Load data from destination
PKM pk = ((PictureBox)sender).Image != null