Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-26 22:10:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Skip move combobox repop if no changes

Browse source 
cache a hashset to determine if the legally allowed moves are the same.
reuse cache in paint method

previously, was noticeable if you load the Moves tab then check
legality; the legality message was delayed by a couple hundred
milliseconds due to repopulating 4 comboboxes (Combobox.NativeAdd
hotspot triggered by RefreshItems, which happens when we set the
datasource). By skipping unnecessary repopulations, gui lag is lessened.
would be preferred if I can just reorder the list inside, but noo.
This commit is contained in:
Kurt 2018-08-01 21:22:49 -07:00
parent 19a897923d
commit 0ee9b04bf7
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs
View file

@ -80,6 +80,7 @@ namespace PKHeX.WinForms.Controls
private LegalityAnalysis Legality;
private string[] gendersymbols = { "♂", "♀", "-" };
private readonly Image mixedHighlight = ImageUtil.ChangeOpacity(Resources.slotSet, 0.5);
private HashSet<int> AllowedMoves = new HashSet<int>();
public event EventHandler LegalityChanged;
public event EventHandler UpdatePreviewSprite;
@ -261,8 +262,19 @@ namespace PKHeX.WinForms.Controls
// Resort moves
bool tmp = FieldsLoaded;
FieldsLoaded = false;
var moves = Legality.AllSuggestedMovesAndRelearn;
var moveList = GameInfo.Strings.MoveDataSource.OrderByDescending(m => moves.Contains(m.Value)).ToList();
ReloadMoves(Legality.AllSuggestedMovesAndRelearn);
FieldsLoaded |= tmp;
LegalityChanged?.Invoke(Legality.Valid, null);
}
private void ReloadMoves(IReadOnlyCollection<int> moves)
{
// check prior movepool to not needlessly refresh the dataset
if (AllowedMoves.Count <= moves.Count && moves.All(AllowedMoves.Contains))
return;
AllowedMoves = new HashSet<int>(moves);
var moveList = GameInfo.Strings.MoveDataSource.OrderByDescending(m => AllowedMoves.Contains(m.Value)).ToList();
foreach (var c in Moves)
{
var index = WinFormsUtil.GetIndex(c);
@ -271,8 +283,6 @@ namespace PKHeX.WinForms.Controls
if (c.Visible)
c.SelectionLength = 0; // flicker hack
}
FieldsLoaded |= tmp;
LegalityChanged?.Invoke(Legality.Valid, null);
}
public void UpdateUnicode(string[] symbols)
@ -1481,8 +1491,7 @@ namespace PKHeX.WinForms.Controls
if (e.Index < 0) return;
var i = (ComboItem)((ComboBox)sender).Items[e.Index];
var moves = Legality.AllSuggestedMovesAndRelearn;
bool valid = moves?.Contains(i.Value) == true && !HaX;
bool valid = AllowedMoves.Contains(i.Value) && !HaX;
bool current = (e.State & DrawItemState.Selected) == DrawItemState.Selected;
Brush tBrush = current ? SystemBrushes.HighlightText : TextBrush;