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

Cache initialization state on language change

Browse Source 
User prompts -> restore after finish

Moved mouseslot right-click abort logic earlier.
This commit is contained in:
Kurt
2015-12-26 10:26:42 -08:00
parent 5325975e76
commit cd962396af
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PKX/f1-Main.cs
View File

@@ -723,14 +723,16 @@ private void openSave(bool oras)
// Language Translation
private void changeMainLanguage(object sender, EventArgs e)
{
byte[] data = pk6.Data;
if (fieldsInitialized) data = preparepkx(); // get data currently in form
byte[] data = fieldsInitialized ? preparepkx() : pk6.Data;
bool alreadyInit = fieldsInitialized;
fieldsInitialized = false;
Menu_Options.DropDown.Close();
InitializeStrings();
InitializeLanguage();
Util.TranslateInterface(this, lang_val[CB_MainLanguage.SelectedIndex], menuStrip1); // Translate the UI to language.
populateFields(data); // put data back in form
if (alreadyInit)
fieldsInitialized = true;
}
private void InitializeStrings()
{
@@ -3281,6 +3283,7 @@ private void clickOpenTempFolder(object sender, EventArgs e)
// Drag & Drop within Box
private void pbBoxSlot_MouseDown(object sender, MouseEventArgs e)
{
if (e.Button != MouseButtons.Left || e.Clicks != 1) return;
if (ModifierKeys == Keys.Control || ModifierKeys == Keys.Alt || ModifierKeys == Keys.Shift || ModifierKeys == (Keys.Control | Keys.Alt))
{ clickSlot(sender, e); return; }
PictureBox pb = (PictureBox)(sender);
@@ -3289,7 +3292,6 @@ private void pbBoxSlot_MouseDown(object sender, MouseEventArgs e)
pkm_from_slot = getSlot(sender);
int offset = getPKXOffset(pkm_from_slot);
if (e.Button != MouseButtons.Left || e.Clicks != 1) return;
// Create Temp File to Drag
Cursor.Current = Cursors.Hand;