zhaoyushun1999/SunnyUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* ISytle：调整主题切换执行流程

Browse Source
This commit is contained in:
Sunny 2021-07-15 15:35:38 +08:00
parent ebcf461ca9
commit d040187d82
60 changed files with 48 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Bin/net40/SunnyUI.Demo.exe
View File

Binary file not shown.

BIN
Bin/net40/SunnyUI.dll
View File

Binary file not shown.

BIN
Bin/net45/SunnyUI.dll
View File

Binary file not shown.

BIN
Bin/net5.0-windows/SunnyUI.dll
View File

Binary file not shown.

BIN
Bin/net5.0-windows/ref/SunnyUI.dll
View File

Binary file not shown.

BIN
Bin/netcoreapp3.1/SunnyUI.dll
View File

Binary file not shown.

14
SunnyUI.Demo/Controls/FTabControl.Designer.cs generated
View File

@ -163,7 +163,7 @@ namespace Sunny.UI.Demo
this.tabPage2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.tabPage2.Location = new System.Drawing.Point(0, 40);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Size = new System.Drawing.Size(450, 230);
this.tabPage2.Size = new System.Drawing.Size(670, 143);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "tabPage2";
//
@ -172,7 +172,7 @@ namespace Sunny.UI.Demo
this.tabPage3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
this.tabPage3.Location = new System.Drawing.Point(0, 40);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(450, 230);
this.tabPage3.Size = new System.Drawing.Size(670, 143);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "tabPage3";
//
@ -180,7 +180,7 @@ namespace Sunny.UI.Demo
//
this.tabPage9.Location = new System.Drawing.Point(0, 40);
this.tabPage9.Name = "tabPage9";
this.tabPage9.Size = new System.Drawing.Size(450, 230);
this.tabPage9.Size = new System.Drawing.Size(670, 143);
this.tabPage9.TabIndex = 4;
this.tabPage9.Text = "tabPage9";
this.tabPage9.UseVisualStyleBackColor = true;
@ -189,7 +189,7 @@ namespace Sunny.UI.Demo
//
this.tabPage10.Location = new System.Drawing.Point(0, 40);
this.tabPage10.Name = "tabPage10";
this.tabPage10.Size = new System.Drawing.Size(450, 230);
this.tabPage10.Size = new System.Drawing.Size(670, 143);
this.tabPage10.TabIndex = 5;
this.tabPage10.Text = "tabPage10";
this.tabPage10.UseVisualStyleBackColor = true;
@ -198,7 +198,7 @@ namespace Sunny.UI.Demo
//
this.tabPage11.Location = new System.Drawing.Point(0, 40);
this.tabPage11.Name = "tabPage11";
this.tabPage11.Size = new System.Drawing.Size(450, 230);
this.tabPage11.Size = new System.Drawing.Size(670, 143);
this.tabPage11.TabIndex = 6;
this.tabPage11.Text = "tabPage11";
this.tabPage11.UseVisualStyleBackColor = true;
@ -207,7 +207,7 @@ namespace Sunny.UI.Demo
//
this.tabPage12.Location = new System.Drawing.Point(0, 40);
this.tabPage12.Name = "tabPage12";
this.tabPage12.Size = new System.Drawing.Size(450, 230);
this.tabPage12.Size = new System.Drawing.Size(670, 143);
this.tabPage12.TabIndex = 7;
this.tabPage12.Text = "tabPage12";
this.tabPage12.UseVisualStyleBackColor = true;
@ -216,7 +216,7 @@ namespace Sunny.UI.Demo
//
this.tabPage13.Location = new System.Drawing.Point(0, 40);
this.tabPage13.Name = "tabPage13";
this.tabPage13.Size = new System.Drawing.Size(450, 230);
this.tabPage13.Size = new System.Drawing.Size(670, 143);
this.tabPage13.TabIndex = 8;
this.tabPage13.Text = "tabPage13";
this.tabPage13.UseVisualStyleBackColor = true;

2
SunnyUI/Charts/UIChart.cs
View File

@ -190,8 +190,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
fillColor = ChartStyle.BackColor;
foreColor = ChartStyle.ForeColor;
}

4
SunnyUI/Controls/Color/UIColorWheel.cs
View File

@ -283,7 +283,8 @@ namespace Sunny.UI
/// <param name="style">Ö÷ĚâŃůĘ˝</param>
public void SetStyle(UIStyle style)
{
SetStyleColor(UIStyles.GetStyleColor(style));
UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}
@ -293,7 +294,6 @@ namespace Sunny.UI
/// <param name="uiColor"></param>
public void SetStyleColor(UIBaseStyle uiColor)
{
if (uiColor.IsCustom()) return;
FrameColor = uiColor.RectColor;
BackColor = uiColor.PlainColor;
Invalidate();

4
SunnyUI/Controls/Color/UILabelRotate.cs
View File

@ -203,7 +203,8 @@ namespace Sunny.UI
/// <param name="style">Ö÷ĚâŃůĘ˝</param>
public void SetStyle(UIStyle style)
{
SetStyleColor(UIStyles.GetStyleColor(style));
UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}
@ -213,7 +214,6 @@ namespace Sunny.UI
/// <param name="uiColor"></param>
public virtual void SetStyleColor(UIBaseStyle uiColor)
{
if (uiColor.IsCustom()) return;
FrameColor = uiColor.RectColor;
ForeColor = uiColor.PanelForeColor;
Invalidate();

2
SunnyUI/Controls/DropItem/UIDropControl.cs
View File

@ -377,8 +377,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
foreColor = uiColor.DropDownControlColor;
edit.BackColor = fillColor = Color.White;
Invalidate();

2
SunnyUI/Controls/UIAvatar.cs
View File

@ -113,8 +113,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
fillColor = uiColor.AvatarFillColor;
foreColor = uiColor.AvatarForeColor;
Invalidate();

2
SunnyUI/Controls/UIBattery.cs
View File

@ -145,8 +145,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
fillColor = uiColor.PlainColor;
}

2
SunnyUI/Controls/UIBreadcrumb.cs
View File

@ -239,8 +239,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
fillColor = uiColor.PrimaryColor;
foreColor = uiColor.ButtonForeColor;
rectColor = uiColor.GridSelectedColor;

2
SunnyUI/Controls/UIButton.cs
View File

@ -212,8 +212,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
fillHoverColor = uiColor.ButtonFillHoverColor;
rectHoverColor = uiColor.RectHoverColor;
foreHoverColor = uiColor.ButtonForeHoverColor;

2
SunnyUI/Controls/UICheckBox.cs
View File

@ -197,8 +197,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
fillColor = uiColor.CheckBoxColor;
foreColor = uiColor.CheckBoxForeColor;
Invalidate();

2
SunnyUI/Controls/UIComboBox.cs
View File

@ -148,8 +148,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
ListBox.SetStyleColor(uiColor);
}

5
SunnyUI/Controls/UIComboboxEx.cs
View File

@ -139,7 +139,8 @@ namespace Sunny.UI
/// <param name="style">主题样式</param>
public void SetStyle(UIStyle style)
{
SetStyleColor(UIStyles.GetStyleColor(style));
UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}
@ -149,8 +150,6 @@ namespace Sunny.UI
/// <param name="uiColor"></param>
public virtual void SetStyleColor(UIBaseStyle uiColor)
{
if (uiColor.IsCustom()) return;
rectColor = uiColor.RectColor;
foreColor = UIFontColor.Primary;
_itemSelectBackColor = uiColor.ListItemSelectBackColor;

5
SunnyUI/Controls/UIContextMenuStrip.cs
View File

@ -54,14 +54,13 @@ namespace Sunny.UI
public void SetStyle(UIStyle style)
{
SetStyleColor(UIStyles.GetStyleColor(style));
UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}
public void SetStyleColor(UIBaseStyle uiColor)
{
if (uiColor.IsCustom()) return;
ColorTable.SetStyleColor(uiColor);
BackColor = uiColor.ContextMenuColor;
Invalidate();

5
SunnyUI/Controls/UIControl.cs
View File

@ -227,7 +227,8 @@ namespace Sunny.UI
/// <param name="style">主题样式</param>
public void SetStyle(UIStyle style)
{
SetStyleColor(UIStyles.GetStyleColor(style));
UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}
@ -237,8 +238,6 @@ namespace Sunny.UI
/// <param name="uiColor"></param>
public virtual void SetStyleColor(UIBaseStyle uiColor)
{
if (uiColor.IsCustom()) return;
fillColor = uiColor.ButtonFillColor;
rectColor = uiColor.RectColor;
foreColor = uiColor.ButtonForeColor;

7
SunnyUI/Controls/UIDataGridView.cs
View File

@ -481,11 +481,8 @@ namespace Sunny.UI
public void SetStyle(UIStyle style)
{
if (!style.Equals(UIStyle.Custom))
{
SetStyleColor(UIStyles.GetStyleColor(style));
}
UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}

2
SunnyUI/Controls/UIDataGridViewFooter.cs
View File

@ -134,8 +134,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
foreColor = UIFontColor.Primary;
fillColor = uiColor.PlainColor;

2
SunnyUI/Controls/UIFlowLayoutPanel.cs
View File

@ -105,8 +105,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
Panel.BackColor = uiColor.PlainColor;
}

2
SunnyUI/Controls/UIHeaderButton.cs
View File

@ -131,8 +131,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
fillHoverColor = uiColor.ButtonFillHoverColor;
foreHoverColor = uiColor.ButtonForeHoverColor;

2
SunnyUI/Controls/UIHorScrollBar.cs
View File

@ -426,8 +426,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
fillColor = uiColor.PlainColor;
foreColor = uiColor.ScrollBarForeColor;
fillHoverColor = uiColor.ButtonFillHoverColor;

2
SunnyUI/Controls/UIHorScrollBarEx.cs
View File

@ -227,8 +227,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
fillColor = uiColor.PlainColor;
foreColor = uiColor.ScrollBarForeColor;
fillHoverColor = uiColor.ButtonFillHoverColor;

8
SunnyUI/Controls/UIImageListBox.cs
View File

@ -187,8 +187,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
if (bar != null)
{
bar.ForeColor = uiColor.PrimaryColor;
@ -495,17 +493,15 @@ namespace Sunny.UI
public void SetStyle(UIStyle style)
{
SetStyleColor(UIStyles.GetStyleColor(style));
UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}
public void SetStyleColor(UIBaseStyle uiColor)
{
if (uiColor.IsCustom()) return;
ItemSelectBackColor = uiColor.ListItemSelectBackColor;
ItemSelectForeColor = uiColor.ListItemSelectForeColor;
Invalidate();
}

9
SunnyUI/Controls/UILabel.cs
View File

@ -75,7 +75,8 @@ namespace Sunny.UI
public void SetStyle(UIStyle style)
{
SetStyleColor(UIStyles.GetStyleColor(style));
UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}
@ -88,7 +89,6 @@ namespace Sunny.UI
public virtual void SetStyleColor(UIBaseStyle uiColor)
{
if (uiColor.IsCustom()) return;
ForeColor = uiColor.LabelForeColor;
Invalidate();
}
@ -146,14 +146,13 @@ namespace Sunny.UI
public void SetStyle(UIStyle style)
{
SetStyleColor(UIStyles.GetStyleColor(style));
UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}
public void SetStyleColor(UIBaseStyle uiColor)
{
if (uiColor.IsCustom()) return;
ForeColor = uiColor.LabelForeColor;
LinkColor = uiColor.LabelForeColor;
Invalidate();

2
SunnyUI/Controls/UILedLabel.cs
View File

@ -179,8 +179,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
foreColor = uiColor.RectColor;
Invalidate();
}

2
SunnyUI/Controls/UILine.cs
View File

@ -82,8 +82,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
fillColor = uiColor.PlainColor;
rectColor = uiColor.RectColor;
foreColor = uiColor.LineForeColor;

7
SunnyUI/Controls/UIListBox.cs
View File

@ -194,8 +194,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
if (bar != null)
{
bar.ForeColor = uiColor.PrimaryColor;
@ -538,14 +536,13 @@ namespace Sunny.UI
public void SetStyle(UIStyle style)
{
SetStyleColor(UIStyles.GetStyleColor(style));
UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}
public void SetStyleColor(UIBaseStyle uiColor)
{
if (uiColor.IsCustom()) return;
ItemSelectBackColor = uiColor.ListItemSelectBackColor;
ItemSelectForeColor = uiColor.ListItemSelectForeColor;
Invalidate();

2
SunnyUI/Controls/UILogo.cs
View File

@ -120,8 +120,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
foreColor = UIFontColor.Primary;
fillColor = uiColor.MenuSelectedColor;
Invalidate();

2
SunnyUI/Controls/UIMarkLabel.cs
View File

@ -110,8 +110,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
markColor = uiColor.RectColor;
Invalidate();
}

5
SunnyUI/Controls/UINavBar.cs
View File

@ -618,14 +618,13 @@ namespace Sunny.UI
public void SetStyle(UIStyle style)
{
SetStyleColor(UIStyles.GetStyleColor(style));
UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}
public void SetStyleColor(UIBaseStyle uiColor)
{
if (uiColor.IsCustom()) return;
selectedForeColor = selectedHighColor = uiColor.MenuSelectedColor;
Invalidate();
}

5
SunnyUI/Controls/UINavMenu.cs
View File

@ -303,14 +303,13 @@ namespace Sunny.UI
public void SetStyle(UIStyle style)
{
SetStyleColor(UIStyles.GetStyleColor(style));
UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}
public void SetStyleColor(UIBaseStyle uiColor)
{
if (uiColor.IsCustom()) return;
selectedForeColor = selectedHighColor = uiColor.MenuSelectedColor;
Invalidate();
}

2
SunnyUI/Controls/UIPagination.cs
View File

@ -792,8 +792,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
foreach (var button in buttons.Values)
{
button.FillColor = uiColor.PlainColor;

5
SunnyUI/Controls/UIPanel.cs
View File

@ -504,14 +504,13 @@ namespace Sunny.UI
{
this.SetChildUIStyle(style);
SetStyleColor(UIStyles.GetStyleColor(style));
UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}
public virtual void SetStyleColor(UIBaseStyle uiColor)
{
if (uiColor.IsCustom()) return;
fillColor = uiColor.PlainColor;
rectColor = uiColor.RectColor;
foreColor = uiColor.PanelForeColor;

2
SunnyUI/Controls/UIProcessBar.cs
View File

@ -172,8 +172,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
fillColor = uiColor.ProcessBarFillColor;
foreColor = uiColor.ProcessBarForeColor;
Invalidate();

2
SunnyUI/Controls/UIProgressIndicator.cs
View File

@ -57,8 +57,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
foreColor = uiColor.ProgressIndicatorColor;
ClearImage();
Invalidate();

2
SunnyUI/Controls/UIRadioButton.cs
View File

@ -221,8 +221,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
fillColor = uiColor.CheckBoxColor;
foreColor = uiColor.CheckBoxForeColor;
Invalidate();

2
SunnyUI/Controls/UIRichTextBox.cs
View File

@ -137,8 +137,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
edit.BackColor = fillColor = Color.White;
edit.ForeColor = foreColor = UIFontColor.Primary;

2
SunnyUI/Controls/UIRoundProcess.cs
View File

@ -167,8 +167,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
fillColor = uiColor.RectColor;
foreColor = uiColor.RectColor;
rectColor = uiColor.GridSelectedColor;

2
SunnyUI/Controls/UIScrollBar.cs
View File

@ -431,8 +431,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
fillColor = uiColor.PlainColor;
foreColor = uiColor.ScrollBarForeColor;
fillHoverColor = uiColor.ButtonFillHoverColor;

2
SunnyUI/Controls/UIScrollingText.cs
View File

@ -224,8 +224,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
fillColor = uiColor.PlainColor;
foreColor = uiColor.RectColor;
Invalidate();

2
SunnyUI/Controls/UISwitch.cs
View File

@ -191,8 +191,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
rectColor = uiColor.SwitchActiveColor;
fillColor = uiColor.SwitchFillColor;
inActiveColor = uiColor.SwitchInActiveColor;

2
SunnyUI/Controls/UISymbolLabel.cs
View File

@ -206,8 +206,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
symbolColor = foreColor = uiColor.LabelForeColor;
}

9
SunnyUI/Controls/UITabControl.cs
View File

@ -351,14 +351,13 @@ namespace Sunny.UI
public void SetStyle(UIStyle style)
{
SetStyleColor(UIStyles.GetStyleColor(style));
UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}
public void SetStyleColor(UIBaseStyle uiColor)
{
if (uiColor.IsCustom()) return;
tabSelectedForeColor = tabSelectedHighColor = uiColor.MenuSelectedColor;
_fillColor = uiColor.PlainColor;
Invalidate();
@ -463,7 +462,7 @@ namespace Sunny.UI
if (TabSelectedHighColorSize > 0)
g.FillRectangle(TabSelectedHighColor, 0, bmp.Height - TabSelectedHighColorSize, bmp.Width, TabSelectedHighColorSize);
}
g.DrawString(TabPages[index].Text, Font, index == SelectedIndex ? tabSelectedForeColor : TabUnSelectedForeColor, textLeft, 2 + (TabRect.Height - sf.Height - 4) / 2.0f);
var menuItem = Helper[index];
@ -841,7 +840,7 @@ namespace Sunny.UI
if (!_bPainting)
{
int itemTop = 0;
if(_owner.Alignment ==TabAlignment.Top )
if (_owner.Alignment == TabAlignment.Top)
{
itemTop = 0;
}

5
SunnyUI/Controls/UITabControlMenu.cs
View File

@ -216,14 +216,13 @@ namespace Sunny.UI
public void SetStyle(UIStyle style)
{
SetStyleColor(UIStyles.GetStyleColor(style));
UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}
public void SetStyleColor(UIBaseStyle uiColor)
{
if (uiColor.IsCustom()) return;
tabSelectedForeColor = tabSelectedHighColor = uiColor.MenuSelectedColor;
_fillColor = uiColor.PlainColor;
Invalidate();

2
SunnyUI/Controls/UITextBox.cs
View File

@ -588,8 +588,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
edit.BackColor = fillColor = Enabled ? Color.White : FillDisableColor;
edit.ForeColor = foreColor = UIFontColor.Primary;

2
SunnyUI/Controls/UITitlePanel.cs
View File

@ -70,8 +70,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
titleColor = uiColor.TitleColor;
foreColor = uiColor.TitleForeColor;
Invalidate();

2
SunnyUI/Controls/UITrackBar.cs
View File

@ -135,8 +135,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
rectDisableColor = uiColor.TrackDisableColor;
rectColor = uiColor.TrackBarRectColor;
fillColor = uiColor.TrackBarFillColor;

2
SunnyUI/Controls/UITransfer.cs
View File

@ -201,8 +201,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
if (l1 == null || l2 == null) return;
if (b1 == null || b2 == null || b3 == null || b4 == null) return;

3
SunnyUI/Controls/UITreeView.cs
View File

@ -65,8 +65,7 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
if (uiColor.IsCustom()) return;
base.SetStyleColor(uiColor);
if (view != null)
{
view.SelectedForeColor = UIColor.White;

2
SunnyUI/Controls/UIVerScrollBarEx.cs
View File

@ -226,8 +226,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
fillColor = uiColor.PlainColor;
foreColor = uiColor.ScrollBarForeColor;
fillHoverColor = uiColor.ButtonFillHoverColor;

2
SunnyUI/Controls/UIWaitingBar.cs
View File

@ -128,8 +128,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
fillColor = uiColor.ProcessBarFillColor;
foreColor = uiColor.ProcessBarForeColor;
Invalidate();

5
SunnyUI/Forms/UIForm.cs
View File

@ -1072,7 +1072,8 @@ namespace Sunny.UI
this.SetChildUIStyle(style);
btn.SetStyle(style);
SetStyleColor(UIStyles.GetStyleColor(style));
UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
UIStyleChanged?.Invoke(this, new EventArgs());
}
@ -1081,8 +1082,6 @@ namespace Sunny.UI
public virtual void SetStyleColor(UIBaseStyle uiColor)
{
if (uiColor.IsCustom()) return;
rectColor = uiColor.RectColor;
foreColor = UIFontColor.Primary;
BackColor = uiColor.PlainColor;

2
SunnyUI/Forms/UIMessageForm.cs
View File

@ -98,8 +98,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
if (btnOK != null)
{
btnOK.FillColor = BackColor;

5
SunnyUI/Pages/UIPage.cs
View File

@ -281,7 +281,8 @@ namespace Sunny.UI
{
this.SetChildUIStyle(style);
SetStyleColor(UIStyles.GetStyleColor(style));
UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
UIStyleChanged?.Invoke(this, new EventArgs());
}
@ -290,8 +291,6 @@ namespace Sunny.UI
public virtual void SetStyleColor(UIBaseStyle uiColor)
{
if (uiColor.IsCustom()) return;
BackColor = uiColor.PlainColor;
RectColor = uiColor.RectColor;
ForeColor = UIFontColor.Primary;

2
SunnyUI/Pages/UITitlePage.cs
View File

@ -133,8 +133,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
FillColor = uiColor.PageTitleFillColor;
ForeColor = uiColor.PageTitleForeColor;
}

4
SunnyUI/Style/UIStyle.cs
View File

@ -37,6 +37,10 @@ namespace Sunny.UI
string Version { get; }
string TagString { get; set; }
void SetStyleColor(UIBaseStyle uiColor);
void SetStyle(UIStyle style);
}
/// <summary>