From 70f5b7779af1540322fe442f2d439e80419b0261 Mon Sep 17 00:00:00 2001
From: zqm <zqm@example.com>
Date: Tue, 11 Nov 2025 13:50:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96Setting.cs=E4=B8=ADAdjustTool?=
 =?UTF-8?q?StripDimensions=E6=96=B9=E6=B3=95=E7=9A=84=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E6=97=B6=E6=9C=BA=EF=BC=8C=E7=A7=BB=E9=99=A4=E6=9E=84=E9=80=A0?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0=E4=B8=AD=E5=A4=9A=E4=BD=99=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=85=E4=BF=9D=E7=95=99Setting=5FShown=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=AD=E7=9A=84=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs b/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs
index 40920a2..37e3c7d 100644
--- a/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs
+++ b/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs
@@ -76,8 +76,7 @@ namespace JoyD.Windows.CS
             // 添加窗体大小变化事件处理
             this.Resize += new EventHandler(Setting_Resize);
             
-            // 初始调整一次toolStrip尺寸
-            AdjustToolStripDimensions();
+            // 初始调整在Setting_Shown中进行，此处不需要
             
             // 初始隐藏颜色选择按钮
             btnSelectColor.Visible = false;
@@ -110,6 +109,8 @@ namespace JoyD.Windows.CS
             
             // 在初始化完成后调用UpdateButtonsVisibility设置初始状态，确保所有按钮按照状态要求显示/隐藏
             UpdateButtonsVisibility(0);
+            
+            // 调整在Setting_Shown中进行，此处不需要
         }
         
         /// <summary>
@@ -2971,6 +2972,9 @@ namespace JoyD.Windows.CS
                 
                 // 立即执行一次定时器事件，避免首次显示时的延迟
                 Timer_Tick(sender, e);
+                
+                // 在窗口完全显示后重新计算工具栏尺寸，确保所有按钮都能正确显示在多行中
+                AdjustToolStripDimensions();
             }
         }