Skip to content

Commit 802717e

Browse files
committed
Merge pull request dotnet#13020 from LeafShi1/Fix_ToolStrip_issues_in_DemoConsole
Fixed operation and display issues related to ToolStrip and ToolStripItemEditorForm in demoConsole
1 parent d920717 commit 802717e

File tree

2 files changed

+20
-16
lines changed

2 files changed

+20
-16
lines changed

src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ToolStripCollectionEditor.ToolStripItemEditorForm.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,7 @@ private void OnListBoxItems_DrawItem(object sender, DrawItemEventArgs e)
802802
private void OnListBoxItems_SelectedIndexChanged(object sender, EventArgs e)
803803
{
804804
// Push the items into the grid.
805-
object[] selectedItems = [_listBoxItems.SelectedItems.Count];
805+
object[] selectedItems = new object[_listBoxItems.SelectedItems.Count];
806806
if (selectedItems.Length > 0)
807807
{
808808
_listBoxItems.SelectedItems.CopyTo(selectedItems, 0);

src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DemoConsole/MainForm.cs

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -289,28 +289,32 @@ private void CreateDesignSurface(int n)
289289
toolStripContainer.Dock = DockStyle.Fill;
290290

291291
ToolStrip toolStrip1 = surface.CreateControl<ToolStrip>(new Size(400, 50), new Point(0, 0));
292-
ToolStripButton toolStripButton1 = new("toolStripButton1");
293-
ToolStripDropDownButton toolStripDropDownButton1 = new("toolStripDropDownButton1");
294-
ToolStripTextBox toolStripTextBox= new("toolStripTextBox");
292+
ToolStripButton toolStripButton1 = surface.CreateComponent<ToolStripButton>();
293+
ToolStripDropDownButton toolStripDropDownButton1 = surface.CreateComponent<ToolStripDropDownButton>();
294+
ToolStripTextBox toolStripTextBox = surface.CreateComponent<ToolStripTextBox>();
295295
toolStrip1.Items.Add(toolStripButton1);
296296
toolStrip1.Items.Add(toolStripDropDownButton1);
297297
toolStrip1.Items.Add(toolStripTextBox);
298298

299299
MenuStrip menuStrip1 = surface.CreateControl<MenuStrip>(new Size(400, 50), new Point(0, 60));
300300
MenuStrip menuStrip2 = surface.CreateControl<MenuStrip>(new Size(400, 50), new Point(0, 150));
301301

302-
ToolStripMenuItem toolStripMenuItem1 = new("TopMenuItem1");
303-
ToolStripMenuItem toolStripMenuItem2 = new("TopMenuItem2");
304-
ToolStripMenuItem menu1 = new("BottomMenuItem1");
305-
ToolStripMenuItem menuNew1 = new("BottomMenuItem2");
306-
307-
menuStrip1.Items.Add(toolStripMenuItem1);
308-
menuStrip1.Items.Add(toolStripMenuItem2);
309-
menuStrip2.Items.Add(menu1);
310-
menuStrip2.Items.Add(menuNew1);
311-
312-
toolStripMenuItem1.DropDownItems.Add("DropDownItem1");
313-
toolStripMenuItem2.DropDownItems.Add("DropDownItem12");
302+
ToolStripMenuItem topMenuItem1 = surface.CreateComponent<ToolStripMenuItem>();
303+
topMenuItem1.Text = "TopMenuItem1";
304+
ToolStripMenuItem topMenuItem2 = surface.CreateComponent<ToolStripMenuItem>();
305+
topMenuItem2.Text = "TopMenuItem2";
306+
ToolStripMenuItem bottomMenuItem1 = surface.CreateComponent<ToolStripMenuItem>();
307+
bottomMenuItem1.Text = "BottomMenuItem1";
308+
ToolStripMenuItem bottomMenuItem2 = surface.CreateComponent<ToolStripMenuItem>();
309+
bottomMenuItem2.Text = "BottomMenuItem2";
310+
311+
menuStrip1.Items.Add(topMenuItem1);
312+
menuStrip1.Items.Add(topMenuItem2);
313+
menuStrip2.Items.Add(bottomMenuItem1);
314+
menuStrip2.Items.Add(bottomMenuItem2);
315+
316+
topMenuItem1.DropDownItems.Add("DropDownItem1");
317+
topMenuItem2.DropDownItems.Add("DropDownItem12");
314318

315319
ToolStripPanel topToolStripPanel = surface.CreateControl<ToolStripPanel>(new(50, 50), new(0, 0));
316320
topToolStripPanel = toolStripContainer.TopToolStripPanel;

0 commit comments

Comments
 (0)