From 3efabfe80d0d058f8471a31dcd192dfa3c2f5e6f Mon Sep 17 00:00:00 2001
From: Sunny <yhuse@163.com>
Date: Tue, 28 Nov 2023 13:41:08 +0800
Subject: [PATCH] =?UTF-8?q?*=20UIUserControl:=20=E4=BF=AE=E5=A4=8DPanel?=
 =?UTF-8?q?=E5=86=85=E6=8E=A7=E4=BB=B6=E9=A2=9C=E8=89=B2=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SunnyUI/Controls/UIUserControl.cs | 13 +------------
 SunnyUI/Font/UISymbolPanel.cs     |  2 +-
 SunnyUI/SunnyUI.csproj            |  2 +-
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/SunnyUI/Controls/UIUserControl.cs b/SunnyUI/Controls/UIUserControl.cs
index ece0b1d9..b974eb8d 100644
--- a/SunnyUI/Controls/UIUserControl.cs
+++ b/SunnyUI/Controls/UIUserControl.cs
@@ -21,6 +21,7 @@
  * 2023-05-12: V3.3.6 重构DrawString函数
  * 2023-07-02: V3.3.9 渐变色增加方向选择
  * 2023-11-05: V3.5.2 重构主题
+ * 2023-11-28: V3.6.0 修复Panel内控件颜色设置问题
 ******************************************************************************/
 
 using System;
@@ -190,18 +191,6 @@ namespace Sunny.UI
         {
         }
 
-        protected override void OnControlAdded(ControlEventArgs e)
-        {
-            base.OnControlAdded(e);
-
-            if (e.Control is IStyleInterface ctrl)
-            {
-                if (!ctrl.StyleCustomMode) ctrl.Style = Style;
-            }
-
-            UIStyleHelper.SetRawControlStyle(e, Style);
-        }
-
         private UICornerRadiusSides _radiusSides = UICornerRadiusSides.All;
 
         [DefaultValue(UICornerRadiusSides.All), Description("圆角显示位置"), Category("SunnyUI")]
diff --git a/SunnyUI/Font/UISymbolPanel.cs b/SunnyUI/Font/UISymbolPanel.cs
index 13b3dce8..1112162a 100644
--- a/SunnyUI/Font/UISymbolPanel.cs
+++ b/SunnyUI/Font/UISymbolPanel.cs
@@ -9,7 +9,7 @@ using System.Windows.Forms;
 
 namespace Sunny.UI
 {
-    [ToolboxItem(true)]
+    [ToolboxItem(false)]
     public class UISymbolPanel : Control
     {
         public UISymbolPanel()
diff --git a/SunnyUI/SunnyUI.csproj b/SunnyUI/SunnyUI.csproj
index 0d43d43d..94570d35 100644
--- a/SunnyUI/SunnyUI.csproj
+++ b/SunnyUI/SunnyUI.csproj
@@ -9,7 +9,7 @@
         <Description>SunnyUI.Net 是基于.Net Framework 4.0~4.8、.Net6、.Net7 框架的 C# WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。</Description>
         <Copyright>CopyRight © SunnyUI.Net 2012-2023</Copyright>
         <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
-        <Version>3.6.0.0</Version>
+        <Version>3.6.1.0</Version>
         <Authors>ShenYonghua</Authors>
         <Company>SunnyUI.Net</Company>
         <PackageId>SunnyUI</PackageId>