From f994734c34062e2e2ea714c2669f6697dd09af96 Mon Sep 17 00:00:00 2001 From: Sunny Date: Fri, 17 Nov 2023 23:07:19 +0800 Subject: [PATCH] =?UTF-8?q?*=20=E9=87=8D=E6=9E=84=E4=B8=BB=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SunnyUI/Controls/UIListBoxEx.cs | 15 +++-------- SunnyUI/Controls/UISmoothLabel.cs | 11 +++------ SunnyUI/Controls/UISplitContainer.cs | 8 +----- SunnyUI/Controls/UITabControlMenu.cs | 12 +++------ SunnyUI/Controls/UITextBox.cs | 37 +++++++++++++++++++--------- SunnyUI/Controls/UITitlePanel.cs | 2 -- 6 files changed, 37 insertions(+), 48 deletions(-) diff --git a/SunnyUI/Controls/UIListBoxEx.cs b/SunnyUI/Controls/UIListBoxEx.cs index b9054d67..a6f8d66a 100644 --- a/SunnyUI/Controls/UIListBoxEx.cs +++ b/SunnyUI/Controls/UIListBoxEx.cs @@ -269,9 +269,7 @@ namespace Sunny.UI if (_itemSelectBackColor != value) { _itemSelectBackColor = value; - _style = UIStyle.Custom; - if (DesignMode) - Invalidate(); + if (DesignMode) Invalidate(); } } } @@ -285,9 +283,7 @@ namespace Sunny.UI if (_itemSelectForeColor != value) { _itemSelectForeColor = value; - _style = UIStyle.Custom; - if (DesignMode) - Invalidate(); + if (DesignMode) Invalidate(); } } } @@ -372,11 +368,8 @@ namespace Sunny.UI public Color HoverColor { get => hoverColor; - set - { - hoverColor = value; - _style = UIStyle.Custom; - } + set => hoverColor = value; + } protected override void OnMeasureItem(MeasureItemEventArgs e) diff --git a/SunnyUI/Controls/UISmoothLabel.cs b/SunnyUI/Controls/UISmoothLabel.cs index c9893045..6faf9ac7 100644 --- a/SunnyUI/Controls/UISmoothLabel.cs +++ b/SunnyUI/Controls/UISmoothLabel.cs @@ -18,6 +18,7 @@ * * 2022-01-22: V3.1.0 增加文件说明 * 2022-03-19: V3.1.1 重构主题配色 + * 2023-11-16: V3.5.2 重构主题 ******************************************************************************/ @@ -117,16 +118,10 @@ namespace Sunny.UI { foreColor = value; forecolorBrush.Color = foreColor; - SetStyleCustom(); + Invalidate(); } } - private void SetStyleCustom(bool needRefresh = true) - { - _style = UIStyle.Custom; - if (needRefresh) Invalidate(); - } - public string Version { get; } /// @@ -215,7 +210,7 @@ namespace Sunny.UI rectColor = value; if (rectSize != 0) drawPen.Color = rectColor; RectColorChanged?.Invoke(this, null); - SetStyleCustom(); + Invalidate(); } } } diff --git a/SunnyUI/Controls/UISplitContainer.cs b/SunnyUI/Controls/UISplitContainer.cs index 1fe22967..f6f8f342 100644 --- a/SunnyUI/Controls/UISplitContainer.cs +++ b/SunnyUI/Controls/UISplitContainer.cs @@ -103,12 +103,6 @@ namespace Sunny.UI } - private void SetStyleCustom(bool needRefresh = true) - { - _style = UIStyle.Custom; - if (needRefresh) Invalidate(); - } - private Color barColor = Color.FromArgb(56, 56, 56); [DefaultValue(typeof(Color), "56, 56, 56"), Category("SunnyUI")] @@ -161,7 +155,7 @@ namespace Sunny.UI set { arrowColor = value; - SetStyleCustom(); + Invalidate(); } } diff --git a/SunnyUI/Controls/UITabControlMenu.cs b/SunnyUI/Controls/UITabControlMenu.cs index b9da8228..25375ee9 100644 --- a/SunnyUI/Controls/UITabControlMenu.cs +++ b/SunnyUI/Controls/UITabControlMenu.cs @@ -141,7 +141,7 @@ namespace Sunny.UI { _fillColor = value; AfterSetFillColor(value); - SetStyleCustom(); + Invalidate(); } } } @@ -201,7 +201,7 @@ namespace Sunny.UI if (tabSelectedForeColor != value) { tabSelectedForeColor = value; - SetStyleCustom(); + Invalidate(); } } } @@ -243,7 +243,7 @@ namespace Sunny.UI if (tabSelectedHighColor != value) { tabSelectedHighColor = value; - SetStyleCustom(); + Invalidate(); } } } @@ -305,12 +305,6 @@ namespace Sunny.UI _fillColor = uiColor.TabControlBackColor; } - private void SetStyleCustom(bool needRefresh = true) - { - _style = UIStyle.Custom; - if (needRefresh) Invalidate(); - } - private UIMenuStyle _menuStyle = UIMenuStyle.Black; [DefaultValue(UIMenuStyle.Black)] diff --git a/SunnyUI/Controls/UITextBox.cs b/SunnyUI/Controls/UITextBox.cs index fc7e72cb..eebfb653 100644 --- a/SunnyUI/Controls/UITextBox.cs +++ b/SunnyUI/Controls/UITextBox.cs @@ -279,7 +279,6 @@ namespace Sunny.UI if (fillColor != value) { fillColor = value; - _style = UIStyle.Custom; Invalidate(); } @@ -930,7 +929,7 @@ namespace Sunny.UI scrollBarBackColor = fillColor; } - if (btn != null) + if (btn != null && btn.Style == UIStyle.Inherited) { btn.ForeColor = uiColor.ButtonForeColor; btn.FillColor = uiColor.ButtonFillColor; @@ -1486,7 +1485,7 @@ namespace Sunny.UI set { btn.FillColor = value; - _style = UIStyle.Custom; + btn.Style = UIStyle.Custom; } } @@ -1501,7 +1500,7 @@ namespace Sunny.UI set { btn.SymbolColor = btn.ForeColor = value; - _style = UIStyle.Custom; + btn.Style = UIStyle.Custom; } } @@ -1516,7 +1515,7 @@ namespace Sunny.UI set { btn.RectColor = value; - _style = UIStyle.Custom; + btn.Style = UIStyle.Custom; } } @@ -1528,7 +1527,7 @@ namespace Sunny.UI set { btn.FillHoverColor = value; - _style = UIStyle.Custom; + btn.Style = UIStyle.Custom; } } @@ -1540,7 +1539,7 @@ namespace Sunny.UI set { btn.SymbolHoverColor = btn.ForeHoverColor = value; - _style = UIStyle.Custom; + btn.Style = UIStyle.Custom; } } @@ -1552,7 +1551,7 @@ namespace Sunny.UI set { btn.RectHoverColor = value; - _style = UIStyle.Custom; + btn.Style = UIStyle.Custom; } } @@ -1564,7 +1563,7 @@ namespace Sunny.UI set { btn.FillPressColor = value; - _style = UIStyle.Custom; + btn.Style = UIStyle.Custom; } } @@ -1576,7 +1575,7 @@ namespace Sunny.UI set { btn.SymbolPressColor = btn.ForePressColor = value; - _style = UIStyle.Custom; + btn.Style = UIStyle.Custom; } } @@ -1588,7 +1587,23 @@ namespace Sunny.UI set { btn.RectPressColor = value; - _style = UIStyle.Custom; + btn.Style = UIStyle.Custom; + } + } + + /// + /// 滚动条主题样式 + /// + [DefaultValue(true), Description("滚动条主题样式"), Category("SunnyUI")] + public bool ButtonStyleInherited + { + get => btn != null && btn.Style == UIStyle.Inherited; + set + { + if (value && btn != null) + { + btn.Style = UIStyle.Inherited; + } } } } diff --git a/SunnyUI/Controls/UITitlePanel.cs b/SunnyUI/Controls/UITitlePanel.cs index fcbcf03c..34332b31 100644 --- a/SunnyUI/Controls/UITitlePanel.cs +++ b/SunnyUI/Controls/UITitlePanel.cs @@ -108,7 +108,6 @@ namespace Sunny.UI set { titleForeColor = value; - _style = UIStyle.Custom; Invalidate(); } } @@ -123,7 +122,6 @@ namespace Sunny.UI set { titleColor = value; - _style = UIStyle.Custom; Invalidate(); } }