Misc pbr ui fixes

remove todo comment
fix exception when refreshing slot coloring
update box when saveslot index changed, not validated.
update boxviewers when saveslot changes
This commit is contained in:
Kurt 2018-05-19 16:33:06 -07:00
parent 047272c2ba
commit 9fd5df6e99
3 changed files with 7 additions and 5 deletions

View file

@ -112,7 +112,7 @@ namespace PKHeX.Core
int ctr = 0;
for (int i = 0; i < 6; i++)
if (Data[GetPartyOffset(i) + 4] != 0) // sanity
ctr += 1;
ctr++;
return ctr;
}
protected set { }
@ -141,7 +141,7 @@ namespace PKHeX.Core
public override GameVersion Version { get => GameVersion.BATREV; protected set { } }
// Storage
public override int GetPartyOffset(int slot) // TODO
public override int GetPartyOffset(int slot)
{
return Party + SIZE_PARTY * slot;
}

View file

@ -148,8 +148,8 @@
this.tabBoxMulti.SelectedIndex = 0;
this.tabBoxMulti.Size = new System.Drawing.Size(310, 225);
this.tabBoxMulti.TabIndex = 101;
this.tabBoxMulti.MouseClick += new System.Windows.Forms.MouseEventHandler(this.ClickBoxSort);
this.tabBoxMulti.DragOver += new System.Windows.Forms.DragEventHandler(this.MultiDragOver);
this.tabBoxMulti.MouseClick += new System.Windows.Forms.MouseEventHandler(this.ClickBoxSort);
this.tabBoxMulti.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.ClickBoxDouble);
//
// Tab_Box
@ -390,6 +390,7 @@
this.SL_Extra.Name = "SL_Extra";
this.SL_Extra.Size = new System.Drawing.Size(75, 199);
this.SL_Extra.TabIndex = 30;
this.SL_Extra.ViewIndex = -1;
//
// GB_Daycare
//
@ -552,7 +553,7 @@
this.CB_SaveSlot.Name = "CB_SaveSlot";
this.CB_SaveSlot.Size = new System.Drawing.Size(121, 21);
this.CB_SaveSlot.TabIndex = 20;
this.CB_SaveSlot.Validated += new System.EventHandler(this.UpdateSaveSlot);
this.CB_SaveSlot.SelectedIndexChanged += new System.EventHandler(this.UpdateSaveSlot);
//
// L_SaveSlot
//

View file

@ -168,7 +168,7 @@ namespace PKHeX.WinForms.Controls
ResetNonBoxSlots();
// Recoloring of a storage box slot (to not show for other storage boxes)
if (M?.ColorizedSlot >= (int)SlotIndex.Party)
if (M?.ColorizedSlot >= (int)SlotIndex.Party && M.ColorizedSlot < SlotPictureBoxes.Count)
SlotPictureBoxes[M.ColorizedSlot].BackgroundImage = M.ColorizedColor;
}
private void ResetNonBoxSlots()
@ -489,6 +489,7 @@ namespace PKHeX.WinForms.Controls
return;
((SAV4BR)SAV).CurrentSlot = WinFormsUtil.GetIndex(CB_SaveSlot);
SetPKMBoxes();
UpdateBoxViewers(all);
}
private void UpdateStringSeed(object sender, EventArgs e)
{