移除toolStrip固定宽度限制，使按钮在窗口最大化时能在一行显示

Windows/CS/Framework4.0/Toprie/Toprie/Setting.Designer.cs

@@ -43,6 +43,9 @@ namespace JoyD.Windows.CS
             this.btnBrushSize1 = new System.Windows.Forms.ToolStripButton();
             this.btnBrushSize3 = new System.Windows.Forms.ToolStripButton();
             this.btnBrushSize5 = new System.Windows.Forms.ToolStripButton();
+            this.btnBrushSize10 = new System.Windows.Forms.ToolStripButton();
+            this.btnBrushSize15 = new System.Windows.Forms.ToolStripButton();
+            this.btnBrushSize25 = new System.Windows.Forms.ToolStripButton();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
             this.splitContainer.Panel1.SuspendLayout();
             this.splitContainer.Panel2.SuspendLayout();
@@ -70,7 +73,7 @@ namespace JoyD.Windows.CS
             // 
             this.splitContainer.Panel2.Controls.Add(this.toolStripContainer);
             this.splitContainer.Size = new System.Drawing.Size(793, 450);
-            this.splitContainer.SplitterDistance = 480;
+            this.splitContainer.SplitterDistance = 539;
             this.splitContainer.TabIndex = 1;
             // 
             // groupBoxTempDisplay
@@ -79,7 +82,7 @@ namespace JoyD.Windows.CS
             this.groupBoxTempDisplay.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupBoxTempDisplay.Location = new System.Drawing.Point(0, 0);
             this.groupBoxTempDisplay.Name = "groupBoxTempDisplay";
-            this.groupBoxTempDisplay.Size = new System.Drawing.Size(480, 450);
+            this.groupBoxTempDisplay.Size = new System.Drawing.Size(539, 450);
             this.groupBoxTempDisplay.TabIndex = 1;
             this.groupBoxTempDisplay.TabStop = false;
             this.groupBoxTempDisplay.Text = "实时温度";
@@ -89,7 +92,7 @@ namespace JoyD.Windows.CS
             this.picBoxTemp.Dock = System.Windows.Forms.DockStyle.Fill;
             this.picBoxTemp.Location = new System.Drawing.Point(3, 21);
             this.picBoxTemp.Name = "picBoxTemp";
-            this.picBoxTemp.Size = new System.Drawing.Size(474, 426);
+            this.picBoxTemp.Size = new System.Drawing.Size(533, 426);
             this.picBoxTemp.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.picBoxTemp.TabIndex = 0;
             this.picBoxTemp.TabStop = false;
@@ -107,19 +110,17 @@ namespace JoyD.Windows.CS
             // 
             this.toolStripContainer.ContentPanel.AutoScroll = true;
             this.toolStripContainer.ContentPanel.Controls.Add(this.dataGridViewTempDiff);
-            this.toolStripContainer.ContentPanel.Size = new System.Drawing.Size(309, 425);
+            this.toolStripContainer.ContentPanel.Size = new System.Drawing.Size(250, 420);
             this.toolStripContainer.Dock = System.Windows.Forms.DockStyle.Fill;
             this.toolStripContainer.Location = new System.Drawing.Point(0, 0);
             this.toolStripContainer.Name = "toolStripContainer";
-            this.toolStripContainer.Size = new System.Drawing.Size(309, 450);
+            this.toolStripContainer.Size = new System.Drawing.Size(250, 450);
             this.toolStripContainer.TabIndex = 0;
             this.toolStripContainer.Text = "toolStripContainer";
-            this.toolStripContainer.TopToolStripPanel.AutoScroll = false;
             // 
             // toolStripContainer.TopToolStripPanel
             // 
             this.toolStripContainer.TopToolStripPanel.Controls.Add(this.toolStrip);
-            this.toolStripContainer.TopToolStripPanel.Size = new System.Drawing.Size(309, 150); // 大幅增加TopToolStripPanel的高度，确保能明显看到多行按钮
             // 
             // dataGridViewTempDiff
             // 
@@ -129,93 +130,13 @@ namespace JoyD.Windows.CS
             this.dataGridViewTempDiff.Name = "dataGridViewTempDiff";
             this.dataGridViewTempDiff.RowHeadersWidth = 25;
             this.dataGridViewTempDiff.RowTemplate.Height = 27;
-            this.dataGridViewTempDiff.Size = new System.Drawing.Size(309, 425);
+            this.dataGridViewTempDiff.Size = new System.Drawing.Size(250, 420);
             this.dataGridViewTempDiff.TabIndex = 0;
             // 
-            // btnBrushSize1
-            // 
-            this.btnBrushSize1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            // 注意：CreateBrushSizeImage方法在运行时由Setting.cs中的InitializeComponent后调用的SetButtonIcon方法设置
-            this.btnBrushSize1.Image = null; // 初始设为null，运行时会被SetButtonIcon方法设置
-            this.btnBrushSize1.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.btnBrushSize1.Name = "btnBrushSize1";
-            this.btnBrushSize1.Size = new System.Drawing.Size(23, 22);
-            this.btnBrushSize1.Text = "画笔大小1px";
-            this.btnBrushSize1.ToolTipText = "选择1像素画笔";
-            this.btnBrushSize1.Click += new System.EventHandler(this.BtnBrushSize1_Click);
-            // 
-            // btnBrushSize3
-            // 
-            this.btnBrushSize3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            // 注意：CreateBrushSizeImage方法在运行时由Setting.cs中的InitializeComponent后调用的SetButtonIcon方法设置
-            this.btnBrushSize3.Image = null; // 初始设为null，运行时会被SetButtonIcon方法设置
-            this.btnBrushSize3.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.btnBrushSize3.Name = "btnBrushSize3";
-            this.btnBrushSize3.Size = new System.Drawing.Size(23, 22);
-            this.btnBrushSize3.Text = "画笔大小3px";
-            this.btnBrushSize3.ToolTipText = "选择3像素画笔";
-            this.btnBrushSize3.Click += new System.EventHandler(this.BtnBrushSize3_Click);
-            // 
-            // btnBrushSize5
-            // 
-            this.btnBrushSize5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            // 注意：CreateBrushSizeImage方法在运行时由Setting.cs中的InitializeComponent后调用的SetButtonIcon方法设置
-            this.btnBrushSize5.Image = null; // 初始设为null，运行时会被SetButtonIcon方法设置
-            this.btnBrushSize5.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.btnBrushSize5.Name = "btnBrushSize5";
-            this.btnBrushSize5.Size = new System.Drawing.Size(23, 22);
-            this.btnBrushSize5.Text = "画笔大小5px";
-            this.btnBrushSize5.ToolTipText = "选择5像素画笔";
-            this.btnBrushSize5.Click += new System.EventHandler(this.BtnBrushSize5_Click);
-            // 
-            // btnBrushSize10
-            // 
-            this.btnBrushSize10 = new System.Windows.Forms.ToolStripButton();
-            this.btnBrushSize10.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            // 注意：CreateBrushSizeImage方法在运行时由Setting.cs中的InitializeComponent后调用的SetButtonIcon方法设置
-            this.btnBrushSize10.Image = null; // 初始设为null，运行时会被SetButtonIcon方法设置
-            this.btnBrushSize10.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.btnBrushSize10.Name = "btnBrushSize10";
-            this.btnBrushSize10.Size = new System.Drawing.Size(23, 22);
-            this.btnBrushSize10.Text = "画笔大小10px";
-            this.btnBrushSize10.ToolTipText = "选择10像素画笔";
-            this.btnBrushSize10.Click += new System.EventHandler(this.BtnBrushSize10_Click);
-            // 
-            // btnBrushSize15
-            // 
-            this.btnBrushSize15 = new System.Windows.Forms.ToolStripButton();
-            this.btnBrushSize15.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            // 注意：CreateBrushSizeImage方法在运行时由Setting.cs中的InitializeComponent后调用的SetButtonIcon方法设置
-            this.btnBrushSize15.Image = null; // 初始设为null，运行时会被SetButtonIcon方法设置
-            this.btnBrushSize15.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.btnBrushSize15.Name = "btnBrushSize15";
-            this.btnBrushSize15.Size = new System.Drawing.Size(23, 22);
-            this.btnBrushSize15.Text = "画笔大小15px";
-            this.btnBrushSize15.ToolTipText = "选择15像素画笔";
-            this.btnBrushSize15.Click += new System.EventHandler(this.BtnBrushSize15_Click);
-            // 
-            // btnBrushSize25
-            // 
-            this.btnBrushSize25 = new System.Windows.Forms.ToolStripButton();
-            this.btnBrushSize25.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            // 注意：CreateBrushSizeImage方法在运行时由Setting.cs中的InitializeComponent后调用的SetButtonIcon方法设置
-            this.btnBrushSize25.Image = null; // 初始设为null，运行时会被SetButtonIcon方法设置
-            this.btnBrushSize25.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.btnBrushSize25.Name = "btnBrushSize25";
-            this.btnBrushSize25.Size = new System.Drawing.Size(23, 22);
-            this.btnBrushSize25.Text = "画笔大小25px";
-            this.btnBrushSize25.ToolTipText = "选择25像素画笔";
-            this.btnBrushSize25.Click += new System.EventHandler(this.BtnBrushSize25_Click);
-            // 
             // toolStrip
             // 
             this.toolStrip.AllowDrop = true;
-            this.toolStrip.AutoSize = true;
             this.toolStrip.Dock = System.Windows.Forms.DockStyle.None;
-            // 设置最小和最大大小，帮助控制Flow布局的行为
-            this.toolStrip.MinimumSize = new System.Drawing.Size(150, 25);
-            this.toolStrip.MaximumSize = new System.Drawing.Size(150, 300);
-            this.toolStrip.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow;
             this.toolStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
             this.toolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.btnDrawRegion,
@@ -224,17 +145,19 @@ namespace JoyD.Windows.CS
             this.btnDrawTempDiff,
             this.btnAddTempDiff,
             this.btnDeleteTempDiff,
-            new System.Windows.Forms.ToolStripSeparator(),
             this.btnBrushSize1,
             this.btnBrushSize3,
             this.btnBrushSize5,
             this.btnBrushSize10,
             this.btnBrushSize15,
             this.btnBrushSize25});
+            this.toolStrip.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow;
             this.toolStrip.Location = new System.Drawing.Point(3, 0);
+            this.toolStrip.MaximumSize = new System.Drawing.Size(0, 300); // 宽度设为0表示无限制
+            this.toolStrip.MinimumSize = new System.Drawing.Size(150, 25);
             this.toolStrip.Name = "toolStrip";
-            // 设置一个更小的宽度，更容易触发Flow布局的自动换行
+            // 移除固定宽度设置，让toolStrip能根据容器自动调整宽度
-            this.toolStrip.Width = 150;
+            this.toolStrip.Size = new System.Drawing.Size(0, 30);
             this.toolStrip.TabIndex = 3;
             this.toolStrip.Text = "工具条";
             // 
@@ -244,7 +167,7 @@ namespace JoyD.Windows.CS
             this.btnDrawRegion.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
             this.btnDrawRegion.ImageTransparentColor = System.Drawing.Color.Transparent;
             this.btnDrawRegion.Name = "btnDrawRegion";
-            this.btnDrawRegion.Size = new System.Drawing.Size(23, 22);
+            this.btnDrawRegion.Size = new System.Drawing.Size(23, 4);
             this.btnDrawRegion.Text = "画框";
             this.btnDrawRegion.ToolTipText = "绘制温度检测区域(点击开启/关闭)";
             this.btnDrawRegion.Click += new System.EventHandler(this.BtnDrawRegion_Click);
@@ -254,7 +177,7 @@ namespace JoyD.Windows.CS
             this.btnSelectColor.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
             this.btnSelectColor.ImageTransparentColor = System.Drawing.Color.Transparent;
             this.btnSelectColor.Name = "btnSelectColor";
-            this.btnSelectColor.Size = new System.Drawing.Size(23, 22);
+            this.btnSelectColor.Size = new System.Drawing.Size(23, 4);
             this.btnSelectColor.Text = "选择颜色";
             this.btnSelectColor.ToolTipText = "选择绘制区域的颜色(点击更换颜色)";
             this.btnSelectColor.Click += new System.EventHandler(this.BtnSelectColor_Click);
@@ -264,7 +187,7 @@ namespace JoyD.Windows.CS
             this.btnDeleteRegion.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
             this.btnDeleteRegion.ImageTransparentColor = System.Drawing.Color.Transparent;
             this.btnDeleteRegion.Name = "btnDeleteRegion";
-            this.btnDeleteRegion.Size = new System.Drawing.Size(23, 22);
+            this.btnDeleteRegion.Size = new System.Drawing.Size(23, 4);
             this.btnDeleteRegion.Text = "删除区域";
             this.btnDeleteRegion.ToolTipText = "删除选中的区域";
             this.btnDeleteRegion.Click += new System.EventHandler(this.BtnDeleteRegion_Click);
@@ -274,7 +197,7 @@ namespace JoyD.Windows.CS
             this.btnDrawTempDiff.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
             this.btnDrawTempDiff.ImageTransparentColor = System.Drawing.Color.Transparent;
             this.btnDrawTempDiff.Name = "btnDrawTempDiff";
-            this.btnDrawTempDiff.Size = new System.Drawing.Size(23, 22);
+            this.btnDrawTempDiff.Size = new System.Drawing.Size(23, 4);
             this.btnDrawTempDiff.Text = "绘制温差图";
             this.btnDrawTempDiff.ToolTipText = "绘制温差图";
             this.btnDrawTempDiff.Click += new System.EventHandler(this.BtnDrawTempDiff_Click);
@@ -284,7 +207,7 @@ namespace JoyD.Windows.CS
             this.btnAddTempDiff.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
             this.btnAddTempDiff.ImageTransparentColor = System.Drawing.Color.Transparent;
             this.btnAddTempDiff.Name = "btnAddTempDiff";
-            this.btnAddTempDiff.Size = new System.Drawing.Size(23, 22);
+            this.btnAddTempDiff.Size = new System.Drawing.Size(23, 4);
             this.btnAddTempDiff.Text = "添加温差图例";
             this.btnAddTempDiff.ToolTipText = "添加温差图例";
             this.btnAddTempDiff.Click += new System.EventHandler(this.BtnAddTempDiff_Click);
@@ -294,11 +217,71 @@ namespace JoyD.Windows.CS
             this.btnDeleteTempDiff.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
             this.btnDeleteTempDiff.ImageTransparentColor = System.Drawing.Color.Transparent;
             this.btnDeleteTempDiff.Name = "btnDeleteTempDiff";
-            this.btnDeleteTempDiff.Size = new System.Drawing.Size(23, 22);
+            this.btnDeleteTempDiff.Size = new System.Drawing.Size(23, 4);
             this.btnDeleteTempDiff.Text = "删除温差图例";
             this.btnDeleteTempDiff.ToolTipText = "删除温差图例";
             this.btnDeleteTempDiff.Click += new System.EventHandler(this.BtnDeleteTempDiff_Click);
             // 
+            // btnBrushSize1
+            // 
+            this.btnBrushSize1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.btnBrushSize1.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.btnBrushSize1.Name = "btnBrushSize1";
+            this.btnBrushSize1.Size = new System.Drawing.Size(23, 4);
+            this.btnBrushSize1.Text = "画笔大小1px";
+            this.btnBrushSize1.ToolTipText = "选择1像素画笔";
+            this.btnBrushSize1.Click += new System.EventHandler(this.BtnBrushSize1_Click);
+            // 
+            // btnBrushSize3
+            // 
+            this.btnBrushSize3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.btnBrushSize3.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.btnBrushSize3.Name = "btnBrushSize3";
+            this.btnBrushSize3.Size = new System.Drawing.Size(23, 4);
+            this.btnBrushSize3.Text = "画笔大小3px";
+            this.btnBrushSize3.ToolTipText = "选择3像素画笔";
+            this.btnBrushSize3.Click += new System.EventHandler(this.BtnBrushSize3_Click);
+            // 
+            // btnBrushSize5
+            // 
+            this.btnBrushSize5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.btnBrushSize5.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.btnBrushSize5.Name = "btnBrushSize5";
+            this.btnBrushSize5.Size = new System.Drawing.Size(23, 4);
+            this.btnBrushSize5.Text = "画笔大小5px";
+            this.btnBrushSize5.ToolTipText = "选择5像素画笔";
+            this.btnBrushSize5.Click += new System.EventHandler(this.BtnBrushSize5_Click);
+            // 
+            // btnBrushSize10
+            // 
+            this.btnBrushSize10.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.btnBrushSize10.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.btnBrushSize10.Name = "btnBrushSize10";
+            this.btnBrushSize10.Size = new System.Drawing.Size(23, 4);
+            this.btnBrushSize10.Text = "画笔大小10px";
+            this.btnBrushSize10.ToolTipText = "选择10像素画笔";
+            this.btnBrushSize10.Click += new System.EventHandler(this.BtnBrushSize10_Click);
+            // 
+            // btnBrushSize15
+            // 
+            this.btnBrushSize15.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.btnBrushSize15.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.btnBrushSize15.Name = "btnBrushSize15";
+            this.btnBrushSize15.Size = new System.Drawing.Size(23, 4);
+            this.btnBrushSize15.Text = "画笔大小15px";
+            this.btnBrushSize15.ToolTipText = "选择15像素画笔";
+            this.btnBrushSize15.Click += new System.EventHandler(this.BtnBrushSize15_Click);
+            // 
+            // btnBrushSize25
+            // 
+            this.btnBrushSize25.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.btnBrushSize25.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.btnBrushSize25.Name = "btnBrushSize25";
+            this.btnBrushSize25.Size = new System.Drawing.Size(23, 4);
+            this.btnBrushSize25.Text = "画笔大小25px";
+            this.btnBrushSize25.ToolTipText = "选择25像素画笔";
+            this.btnBrushSize25.Click += new System.EventHandler(this.BtnBrushSize25_Click);
+            // 
             // Setting
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);