From 65c3f32835af86c469cc51f3389bbac6780fe0bb Mon Sep 17 00:00:00 2001 From: zqm Date: Tue, 11 Nov 2025 16:05:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=98=E5=88=B6=E6=B5=8B?= =?UTF-8?q?=E6=B8=A9=E5=8C=BA=E7=8A=B6=E6=80=81=E4=B8=8BtxtRegionNumber?= =?UTF-8?q?=E5=90=8E=E9=9D=A2=E5=88=86=E9=9A=94=E6=9D=A1=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9A=E6=B7=BB=E5=8A=A0=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E4=B8=AA=E5=88=86=E9=9A=94=E6=9D=A1=E7=9A=84=E6=9F=A5=E6=89=BE?= =?UTF-8?q?=E5=92=8C=E5=8F=AF=E8=A7=81=E6=80=A7=E6=8E=A7=E5=88=B6=EF=BC=8C?= =?UTF-8?q?=E7=A1=AE=E4=BF=9D=E5=9C=A8=E6=89=80=E6=9C=89=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=8B=E5=88=86=E9=9A=94=E6=9D=A1=E9=83=BD=E8=83=BD=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E6=98=BE=E7=A4=BA=E6=88=96=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CS/Framework4.0/Toprie/Toprie/Setting.cs | 36 +++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs b/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs index eca186e..8e288f2 100644 --- a/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs +++ b/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs @@ -718,7 +718,8 @@ namespace JoyD.Windows.CS { // 获取工具栏分隔条引用 ToolStripSeparator firstSeparator = null; // 删除温差图例按钮和画笔大小按钮之间的分隔条 - ToolStripSeparator secondSeparator = null; // 画笔大小按钮和新按钮组之间的分隔条 + ToolStripSeparator secondSeparator = null; // 画笔大小按钮和txtRegionNumber之间的分隔条 + ToolStripSeparator thirdSeparator = null; // txtRegionNumber后面的分隔条 // 查找分隔条 for (int i = 0; i < toolStrip.Items.Count - 1; i++) @@ -728,11 +729,16 @@ namespace JoyD.Windows.CS { firstSeparator = toolStrip.Items[i + 1] as ToolStripSeparator; } - // 查找第二个分隔条（在画笔大小按钮和新按钮组之间） + // 查找第二个分隔条（在画笔大小按钮和txtRegionNumber之间） else if (toolStrip.Items[i] == btnBrushSize25 && toolStrip.Items[i + 1] is ToolStripSeparator) { secondSeparator = toolStrip.Items[i + 1] as ToolStripSeparator; } + // 查找第三个分隔条（在txtRegionNumber后面） + else if (toolStrip.Items[i] == txtRegionNumber && toolStrip.Items[i + 1] is ToolStripSeparator) + { + thirdSeparator = toolStrip.Items[i + 1] as ToolStripSeparator; + } } @@ -1004,6 +1010,7 @@ namespace JoyD.Windows.CS // 获取工具栏分隔条引用 ToolStripSeparator firstSeparator = null; // 删除温差图例按钮和画笔大小按钮之间的分隔条 ToolStripSeparator secondSeparator = null; // 画笔大小按钮和新按钮组之间的分隔条 + ToolStripSeparator thirdSeparator = null; // txtRegionNumber后面的分隔条 // 查找分隔条 for (int i = 0; i < toolStrip.Items.Count - 1; i++) @@ -1018,6 +1025,11 @@ namespace JoyD.Windows.CS { secondSeparator = toolStrip.Items[i + 1] as ToolStripSeparator; } + // 查找第三个分隔条（在txtRegionNumber后面） + else if (toolStrip.Items[i] == txtRegionNumber && toolStrip.Items[i + 1] is ToolStripSeparator) + { + thirdSeparator = toolStrip.Items[i + 1] as ToolStripSeparator; + } } // 创建检查是否有画笔按钮可见的辅助方法 @@ -1070,6 +1082,11 @@ namespace JoyD.Windows.CS // 第二个分隔条：前面按钮(所有画笔按钮)不可见，后面按钮组有可见按钮 secondSeparator.Visible = HasVisibleBrushButtons() && HasVisibleNewButtons(); } + if (thirdSeparator != null) + { + // 在初始状态下，txtRegionNumber是隐藏的，所以分隔条也应该隐藏 + thirdSeparator.Visible = false; + } break; case 2: // 绘制状态 @@ -1118,6 +1135,11 @@ namespace JoyD.Windows.CS // 第二个分隔条：前面按钮(所有画笔按钮)和后面按钮(新按钮组)都不可见 secondSeparator.Visible = HasVisibleBrushButtons() && HasVisibleNewButtons(); } + if (thirdSeparator != null) + { + // 在温差图绘制状态下，txtRegionNumber是隐藏的，所以分隔条也应该隐藏 + thirdSeparator.Visible = false; + } break; case 1: // 选中区域状态 btnDrawRegion.Visible = false; // 隐藏绘制区域按钮 @@ -1164,6 +1186,11 @@ namespace JoyD.Windows.CS // 第二个分隔条：前面按钮(所有画笔按钮)和后面按钮(新按钮组)都不可见 secondSeparator.Visible = HasVisibleBrushButtons() && HasVisibleNewButtons(); } + if (thirdSeparator != null) + { + // 在选中区域状态下，txtRegionNumber后面的分隔条应该隐藏 + thirdSeparator.Visible = false; + } break; case 3: // 温差图绘制状态 @@ -1203,6 +1230,11 @@ namespace JoyD.Windows.CS // 第二个分隔条：前面按钮(所有画笔按钮)和后面按钮(新按钮组)都不可见 secondSeparator.Visible = HasVisibleBrushButtons() && HasVisibleNewButtons(); } + if (thirdSeparator != null) + { + // 在绘制状态下，txtRegionNumber后面的分隔条应该隐藏 + thirdSeparator.Visible = false; + } break; } }