Update filter button UI

This commit is contained in:
2023-08-23 23:34:13 +08:00
parent a989581d59
commit 1d734479d1
6 changed files with 258 additions and 265 deletions

View File

@@ -49,6 +49,7 @@ namespace GrasscutterTools.Pages
MenuItemFilter.SuspendLayout();
MenuItemFilter.Items.Clear();
SelectedItemTypeLines = GameData.Items.Lines;
BtnFilterItem.Text = Resources.All;
var all = new ToolStripMenuItem
{
Text = Resources.All,
@@ -82,6 +83,7 @@ namespace GrasscutterTools.Pages
private void OnItemFilterClick(object sender, EventArgs e)
{
var btn = sender as ToolStripMenuItem;
BtnFilterItem.Text = btn.Text;
SelectedItemTypeLines = btn.Tag as string[];
LoadItemList();
}
@@ -155,7 +157,7 @@ namespace GrasscutterTools.Pages
/// </summary>
private void BtnFilterItem_Click(object sender, EventArgs e)
{
MenuItemFilter.Show(BtnFilterItem, 0, BtnFilterItem.Height);
MenuItemFilter.Show(BtnFilterItem, BtnFilterItem.Width, BtnFilterItem.Height);
}
#region -- --

View File

@@ -301,10 +301,10 @@
<value>Top, Left, Right</value>
</data>
<data name="TxtGameItemFilter.Location" type="System.Drawing.Point, System.Drawing">
<value>343, 3</value>
<value>448, 3</value>
</data>
<data name="TxtGameItemFilter.Size" type="System.Drawing.Size, System.Drawing">
<value>268, 23</value>
<value>195, 23</value>
</data>
<data name="TxtGameItemFilter.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
@@ -493,23 +493,20 @@
<data name="&gt;&gt;LblGiveCommandDescription.ZOrder" xml:space="preserve">
<value>13</value>
</data>
<data name="BtnFilterItem.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Right</value>
</data>
<data name="BtnFilterItem.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="BtnFilterItem.Location" type="System.Drawing.Point, System.Drawing">
<value>617, 3</value>
<value>342, 2</value>
</data>
<data name="BtnFilterItem.Size" type="System.Drawing.Size, System.Drawing">
<value>26, 24</value>
<value>100, 25</value>
</data>
<data name="BtnFilterItem.TabIndex" type="System.Int32, mscorlib">
<value>10</value>
</data>
<data name="BtnFilterItem.Text" xml:space="preserve">
<value></value>
<value>全部</value>
</data>
<data name="&gt;&gt;BtnFilterItem.Name" xml:space="preserve">
<value>BtnFilterItem</value>
@@ -545,6 +542,6 @@
<value>PageGiveItem</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.7.6.0, Culture=neutral, PublicKeyToken=de2b1c089621e923</value>
<value>GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.12.1.0, Culture=neutral, PublicKeyToken=de2b1c089621e923</value>
</data>
</root>

View File

@@ -60,6 +60,7 @@ namespace GrasscutterTools.Pages
// 初始化列表类型过滤器
MenuSpawnEntityFilter.SuspendLayout();
MenuSpawnEntityFilter.Items.Clear();
BtnFilterEntity.Text = Resources.All;
// 默认显示所有
SelectedEntityTypeLines = GameData.Monsters.AllLines.Concat(GameData.Gadgets.AllLines).ToArray();
var all = new ToolStripMenuItem
@@ -103,6 +104,7 @@ namespace GrasscutterTools.Pages
private void OnEntityTypeFilterClick(object sender, EventArgs e)
{
var btn = sender as ToolStripMenuItem;
BtnFilterEntity.Text = btn.Text;
SelectedEntityTypeLines = btn.Tag as string[];
LoadEntityList();
}

View File

@@ -1594,10 +1594,10 @@
<value>Top, Left, Right</value>
</data>
<data name="TxtEntityFilter.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 3</value>
<value>103, 3</value>
</data>
<data name="TxtEntityFilter.Size" type="System.Drawing.Size, System.Drawing">
<value>242, 23</value>
<value>168, 23</value>
</data>
<data name="TxtEntityFilter.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -1614,23 +1614,20 @@
<data name="&gt;&gt;TxtEntityFilter.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="BtnFilterEntity.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Right</value>
</data>
<data name="BtnFilterEntity.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="BtnFilterEntity.Location" type="System.Drawing.Point, System.Drawing">
<value>245, 3</value>
<value>0, 2</value>
</data>
<data name="BtnFilterEntity.Size" type="System.Drawing.Size, System.Drawing">
<value>26, 24</value>
<value>100, 25</value>
</data>
<data name="BtnFilterEntity.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="BtnFilterEntity.Text" xml:space="preserve">
<value></value>
<value>全部</value>
</data>
<data name="&gt;&gt;BtnFilterEntity.Name" xml:space="preserve">
<value>BtnFilterEntity</value>
@@ -1909,6 +1906,6 @@
<value>PageSpawn</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.10.1.0, Culture=neutral, PublicKeyToken=de2b1c089621e923</value>
<value>GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.12.1.0, Culture=neutral, PublicKeyToken=de2b1c089621e923</value>
</data>
</root>