From d66486ac294414ac00d6cb1db35e21adb4c2deff Mon Sep 17 00:00:00 2001 From: Kurt Date: Fri, 1 Jan 2021 11:29:20 -0800 Subject: [PATCH] More pkm.form visibility/initialize tweaks Gen7 started up showing a form=-1 marshadow, initialize the combobox with an empty string since we no longer set formlist if it has none label/combobox visibility should be managed by gen2 flowlayout case below --- PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs | 2 ++ PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs index 053c888d1..6554f12c8 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs @@ -795,6 +795,8 @@ this.CB_Form.DropDownWidth = 85; this.CB_Form.Enabled = false; this.CB_Form.FormattingEnabled = true; + this.CB_Form.Items.AddRange(new object[] { + ""}); this.CB_Form.Location = new System.Drawing.Point(0, 0); this.CB_Form.Margin = new System.Windows.Forms.Padding(0); this.CB_Form.Name = "CB_Form"; diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs index ed6289319..81eb53f3e 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs @@ -1784,7 +1784,7 @@ namespace PKHeX.WinForms.Controls PB_Origin.Visible = gen >= 6; FLP_NSparkle.Visible = L_NSparkle.Visible = CHK_NSparkle.Visible = gen == 5; - CB_Form.Visible = Label_Form.Visible = CHK_AsEgg.Visible = GB_EggConditions.Visible = PB_Mark5.Visible = PB_Mark6.Visible = gen >= 4; + CHK_AsEgg.Visible = GB_EggConditions.Visible = PB_Mark5.Visible = PB_Mark6.Visible = gen >= 4; FLP_ShinyLeaf.Visible = L_ShinyLeaf.Visible = ShinyLeaf.Visible = gen == 4; DEV_Ability.Enabled = DEV_Ability.Visible = gen > 3 && HaX;