diff --git a/Source/GrasscutterTools/Forms/FormMain.Designer.cs b/Source/GrasscutterTools/Forms/FormMain.Designer.cs index 760fcce..c308680 100644 --- a/Source/GrasscutterTools/Forms/FormMain.Designer.cs +++ b/Source/GrasscutterTools/Forms/FormMain.Designer.cs @@ -117,6 +117,7 @@ namespace GrasscutterTools.Forms // // MenuSpawnEntityFilter // + this.MenuSpawnEntityFilter.ImageScalingSize = new System.Drawing.Size(24, 24); this.MenuSpawnEntityFilter.Name = "MenuSpawnEntityFilter"; resources.ApplyResources(this.MenuSpawnEntityFilter, "MenuSpawnEntityFilter"); // diff --git a/Source/GrasscutterTools/Pages/PageAchievement.Designer.cs b/Source/GrasscutterTools/Pages/PageAchievement.Designer.cs index e56b995..dfb5481 100644 --- a/Source/GrasscutterTools/Pages/PageAchievement.Designer.cs +++ b/Source/GrasscutterTools/Pages/PageAchievement.Designer.cs @@ -51,6 +51,7 @@ this.ListAchievements.FormattingEnabled = true; this.ListAchievements.Name = "ListAchievements"; this.ListAchievements.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended; + this.ListAchievements.MeasureItem += new System.Windows.Forms.MeasureItemEventHandler(this.ListAchievements_MeasureItem); // // GrpAchievements // diff --git a/Source/GrasscutterTools/Pages/PageAchievement.cs b/Source/GrasscutterTools/Pages/PageAchievement.cs index 7d77dd8..3511d67 100644 --- a/Source/GrasscutterTools/Pages/PageAchievement.cs +++ b/Source/GrasscutterTools/Pages/PageAchievement.cs @@ -110,5 +110,9 @@ namespace GrasscutterTools.Pages GenSelected("/achievement progress", NUDProgress.Text); } + private void ListAchievements_MeasureItem(object sender, MeasureItemEventArgs e) + { + e.ItemHeight = ListAchievements.Font.Height * 3 / 2; + } } } \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageGiveArtifact.Designer.cs b/Source/GrasscutterTools/Pages/PageGiveArtifact.Designer.cs index da9bb24..b9dae7e 100644 --- a/Source/GrasscutterTools/Pages/PageGiveArtifact.Designer.cs +++ b/Source/GrasscutterTools/Pages/PageGiveArtifact.Designer.cs @@ -154,6 +154,7 @@ resources.ApplyResources(this.ListSubAttributionChecked, "ListSubAttributionChecked"); this.ListSubAttributionChecked.FormattingEnabled = true; this.ListSubAttributionChecked.Name = "ListSubAttributionChecked"; + this.ListSubAttributionChecked.MeasureItem += new System.Windows.Forms.MeasureItemEventHandler(this.ListSubAttributionChecked_MeasureItem); this.ListSubAttributionChecked.SelectedIndexChanged += new System.EventHandler(this.ListSubAttributionChecked_SelectedIndexChanged); // // LblArtifactLevel diff --git a/Source/GrasscutterTools/Pages/PageGiveArtifact.cs b/Source/GrasscutterTools/Pages/PageGiveArtifact.cs index 28a0f5a..44582a9 100644 --- a/Source/GrasscutterTools/Pages/PageGiveArtifact.cs +++ b/Source/GrasscutterTools/Pages/PageGiveArtifact.cs @@ -265,5 +265,10 @@ namespace GrasscutterTools.Pages { UIUtil.OpenURL("https://github.com/Penelopeep/CharacterBuilder"); } + + private void ListSubAttributionChecked_MeasureItem(object sender, MeasureItemEventArgs e) + { + e.ItemHeight = ListSubAttributionChecked.Font.Height * 3 / 2; + } } } \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageGiveItem.Designer.cs b/Source/GrasscutterTools/Pages/PageGiveItem.Designer.cs index cf2a36b..1ef24bd 100644 --- a/Source/GrasscutterTools/Pages/PageGiveItem.Designer.cs +++ b/Source/GrasscutterTools/Pages/PageGiveItem.Designer.cs @@ -104,6 +104,7 @@ resources.ApplyResources(this.ListGameItems, "ListGameItems"); this.ListGameItems.FormattingEnabled = true; this.ListGameItems.Name = "ListGameItems"; + this.ListGameItems.MeasureItem += new System.Windows.Forms.MeasureItemEventHandler(this.ListGameItems_MeasureItem); this.ListGameItems.SelectedIndexChanged += new System.EventHandler(this.GiveItemsInputChanged); // // LblGameItemAmount @@ -172,6 +173,7 @@ // // MenuItemFilter // + this.MenuItemFilter.ImageScalingSize = new System.Drawing.Size(24, 24); this.MenuItemFilter.Name = "MenuSpawnEntityFilter"; resources.ApplyResources(this.MenuItemFilter, "MenuItemFilter"); // diff --git a/Source/GrasscutterTools/Pages/PageGiveItem.cs b/Source/GrasscutterTools/Pages/PageGiveItem.cs index bb22d77..83d0559 100644 --- a/Source/GrasscutterTools/Pages/PageGiveItem.cs +++ b/Source/GrasscutterTools/Pages/PageGiveItem.cs @@ -249,6 +249,10 @@ namespace GrasscutterTools.Pages } #endregion -- 物品记录 -- - + + private void ListGameItems_MeasureItem(object sender, MeasureItemEventArgs e) + { + e.ItemHeight = ListGameItems.Font.Height * 3 / 2; + } } } \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageGiveWeapon.Designer.cs b/Source/GrasscutterTools/Pages/PageGiveWeapon.Designer.cs index 7bd4aba..317a5b9 100644 --- a/Source/GrasscutterTools/Pages/PageGiveWeapon.Designer.cs +++ b/Source/GrasscutterTools/Pages/PageGiveWeapon.Designer.cs @@ -141,6 +141,7 @@ resources.ApplyResources(this.ListWeapons, "ListWeapons"); this.ListWeapons.FormattingEnabled = true; this.ListWeapons.Name = "ListWeapons"; + this.ListWeapons.MeasureItem += new System.Windows.Forms.MeasureItemEventHandler(this.ListWeapons_MeasureItem); this.ListWeapons.SelectedIndexChanged += new System.EventHandler(this.WeaponValueChanged); // // LblClearFilter diff --git a/Source/GrasscutterTools/Pages/PageGiveWeapon.cs b/Source/GrasscutterTools/Pages/PageGiveWeapon.cs index 27bc684..fbc43b5 100644 --- a/Source/GrasscutterTools/Pages/PageGiveWeapon.cs +++ b/Source/GrasscutterTools/Pages/PageGiveWeapon.cs @@ -82,5 +82,10 @@ namespace GrasscutterTools.Pages { SetCommand("/give", $"weapons x{NUDWeaponAmout.Value} lv{NUDWeaponLevel.Value} r{NUDWeaponRefinement.Value}"); } + + private void ListWeapons_MeasureItem(object sender, System.Windows.Forms.MeasureItemEventArgs e) + { + e.ItemHeight = ListWeapons.Font.Height * 3 / 2; + } } } \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageMail.Designer.cs b/Source/GrasscutterTools/Pages/PageMail.Designer.cs index 659623c..4fcaf9a 100644 --- a/Source/GrasscutterTools/Pages/PageMail.Designer.cs +++ b/Source/GrasscutterTools/Pages/PageMail.Designer.cs @@ -34,6 +34,7 @@ this.BtnDeleteMailItem = new System.Windows.Forms.Button(); this.TCMailRight = new System.Windows.Forms.TabControl(); this.TPMailSelectableItemList = new System.Windows.Forms.TabPage(); + this.LblClearFilter = new System.Windows.Forms.Label(); this.ListMailSelectableItems = new System.Windows.Forms.ListBox(); this.TxtMailSelectableItemFilter = new System.Windows.Forms.TextBox(); this.PanelMailItemArgs = new System.Windows.Forms.Panel(); @@ -59,7 +60,6 @@ this.LblMailTitleLabel = new System.Windows.Forms.Label(); this.TxtMailSender = new System.Windows.Forms.TextBox(); this.LblMailSenderLabel = new System.Windows.Forms.Label(); - this.LblClearFilter = new System.Windows.Forms.Label(); this.TCMailRight.SuspendLayout(); this.TPMailSelectableItemList.SuspendLayout(); this.PanelMailItemArgs.SuspendLayout(); @@ -109,6 +109,14 @@ this.TPMailSelectableItemList.Name = "TPMailSelectableItemList"; this.TPMailSelectableItemList.UseVisualStyleBackColor = true; // + // LblClearFilter + // + resources.ApplyResources(this.LblClearFilter, "LblClearFilter"); + this.LblClearFilter.BackColor = System.Drawing.Color.White; + this.LblClearFilter.Cursor = System.Windows.Forms.Cursors.Hand; + this.LblClearFilter.Name = "LblClearFilter"; + this.LblClearFilter.Click += new System.EventHandler(this.LblClearFilter_Click); + // // ListMailSelectableItems // resources.ApplyResources(this.ListMailSelectableItems, "ListMailSelectableItems"); @@ -228,6 +236,7 @@ resources.ApplyResources(this.ListMailItems, "ListMailItems"); this.ListMailItems.FormattingEnabled = true; this.ListMailItems.Name = "ListMailItems"; + this.ListMailItems.MeasureItem += new System.Windows.Forms.MeasureItemEventHandler(this.ListMailItems_MeasureItem); // // LblMailItemsLabel // @@ -298,14 +307,6 @@ resources.ApplyResources(this.LblMailSenderLabel, "LblMailSenderLabel"); this.LblMailSenderLabel.Name = "LblMailSenderLabel"; // - // LblClearFilter - // - resources.ApplyResources(this.LblClearFilter, "LblClearFilter"); - this.LblClearFilter.BackColor = System.Drawing.Color.White; - this.LblClearFilter.Cursor = System.Windows.Forms.Cursors.Hand; - this.LblClearFilter.Name = "LblClearFilter"; - this.LblClearFilter.Click += new System.EventHandler(this.LblClearFilter_Click); - // // PageMail // resources.ApplyResources(this, "$this"); diff --git a/Source/GrasscutterTools/Pages/PageMail.cs b/Source/GrasscutterTools/Pages/PageMail.cs index 11a4a1c..e1dcd20 100644 --- a/Source/GrasscutterTools/Pages/PageMail.cs +++ b/Source/GrasscutterTools/Pages/PageMail.cs @@ -299,5 +299,9 @@ namespace GrasscutterTools.Pages #endregion -- 邮件列表 Mail list -- + private void ListMailItems_MeasureItem(object sender, MeasureItemEventArgs e) + { + e.ItemHeight = ListMailItems.Font.Height * 3 / 2; + } } } \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageQuest.Designer.cs b/Source/GrasscutterTools/Pages/PageQuest.Designer.cs index d2e942b..1a71858 100644 --- a/Source/GrasscutterTools/Pages/PageQuest.Designer.cs +++ b/Source/GrasscutterTools/Pages/PageQuest.Designer.cs @@ -108,6 +108,7 @@ resources.ApplyResources(this.ListQuest, "ListQuest"); this.ListQuest.FormattingEnabled = true; this.ListQuest.Name = "ListQuest"; + this.ListQuest.MeasureItem += new System.Windows.Forms.MeasureItemEventHandler(this.ListQuest_MeasureItem); this.ListQuest.SelectedIndexChanged += new System.EventHandler(this.ListQuest_SelectedIndexChanged); // // LblClearFilter diff --git a/Source/GrasscutterTools/Pages/PageQuest.cs b/Source/GrasscutterTools/Pages/PageQuest.cs index de2e0b0..c9445fc 100644 --- a/Source/GrasscutterTools/Pages/PageQuest.cs +++ b/Source/GrasscutterTools/Pages/PageQuest.cs @@ -98,5 +98,10 @@ namespace GrasscutterTools.Pages var id = ItemMap.ToId(item); SetCommand($"/quest add {id} | /quest finish {id}"); } + + private void ListQuest_MeasureItem(object sender, MeasureItemEventArgs e) + { + e.ItemHeight = ListQuest.Font.Height * 3 / 2; + } } } \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageScene.Designer.cs b/Source/GrasscutterTools/Pages/PageScene.Designer.cs index 843781d..480ebd5 100644 --- a/Source/GrasscutterTools/Pages/PageScene.Designer.cs +++ b/Source/GrasscutterTools/Pages/PageScene.Designer.cs @@ -176,6 +176,7 @@ resources.ApplyResources(this.ListScenes, "ListScenes"); this.ListScenes.FormattingEnabled = true; this.ListScenes.Name = "ListScenes"; + this.ListScenes.MeasureItem += new System.Windows.Forms.MeasureItemEventHandler(this.ListScenes_MeasureItem); this.ListScenes.SelectedIndexChanged += new System.EventHandler(this.ListScenes_SelectedIndexChanged); // // LblTp diff --git a/Source/GrasscutterTools/Pages/PageScene.cs b/Source/GrasscutterTools/Pages/PageScene.cs index ba97d2b..e09aa0a 100644 --- a/Source/GrasscutterTools/Pages/PageScene.cs +++ b/Source/GrasscutterTools/Pages/PageScene.cs @@ -155,5 +155,10 @@ namespace GrasscutterTools.Pages { SetCommand("/prop", "is_game_time_locked on"); } + + private void ListScenes_MeasureItem(object sender, System.Windows.Forms.MeasureItemEventArgs e) + { + e.ItemHeight = ListScenes.Font.Height * 3 / 2; + } } } \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageSettings.cs b/Source/GrasscutterTools/Pages/PageSettings.cs index 7d5caaa..a8b8bcb 100644 --- a/Source/GrasscutterTools/Pages/PageSettings.cs +++ b/Source/GrasscutterTools/Pages/PageSettings.cs @@ -59,6 +59,7 @@ namespace GrasscutterTools.Pages CmbGcVersions.SelectedIndexChanged += (o, e) => CommandVersion.Current = CommandVersion.List[CmbGcVersions.SelectedIndex]; CommandVersion.VersionChanged += (o, e) => Settings.Default.CommandVersion = CommandVersion.Current.ToString(3); + ChkListPages.ItemHeight = ChkListPages.Font.Height * 3 / 2; } ///