diff --git a/Bin/net40/Setting.ini b/Bin/net40/Setting.ini deleted file mode 100644 index 75339192..00000000 --- a/Bin/net40/Setting.ini +++ /dev/null @@ -1,8 +0,0 @@ -; - -[Setup] -ImagePath= -TCPPort=0 -APIPort=0 -IP=111.1.1.1 - diff --git a/Bin/net40/SunnyUI.Demo.exe b/Bin/net40/SunnyUI.Demo.exe index afb31860..f90bd28c 100644 Binary files a/Bin/net40/SunnyUI.Demo.exe and b/Bin/net40/SunnyUI.Demo.exe differ diff --git a/Bin/net40/SunnyUI.dll b/Bin/net40/SunnyUI.dll index 31dfc256..022a814d 100644 Binary files a/Bin/net40/SunnyUI.dll and b/Bin/net40/SunnyUI.dll differ diff --git a/Bin/net5.0-windows/SunnyUI.dll b/Bin/net5.0-windows/SunnyUI.dll index 56c31233..a5219c21 100644 Binary files a/Bin/net5.0-windows/SunnyUI.dll and b/Bin/net5.0-windows/SunnyUI.dll differ diff --git a/Bin/net5.0-windows/ref/SunnyUI.dll b/Bin/net5.0-windows/ref/SunnyUI.dll index e99b5985..090e14b4 100644 Binary files a/Bin/net5.0-windows/ref/SunnyUI.dll and b/Bin/net5.0-windows/ref/SunnyUI.dll differ diff --git a/Bin/netcoreapp3.1/SunnyUI.dll b/Bin/netcoreapp3.1/SunnyUI.dll index b86a7d93..16d3f211 100644 Binary files a/Bin/netcoreapp3.1/SunnyUI.dll and b/Bin/netcoreapp3.1/SunnyUI.dll differ diff --git a/SunnyUI.Demo/Controls/FCombobox.Designer.cs b/SunnyUI.Demo/Controls/FCombobox.Designer.cs index 02f1dd9a..03e8c9b7 100644 --- a/SunnyUI.Demo/Controls/FCombobox.Designer.cs +++ b/SunnyUI.Demo/Controls/FCombobox.Designer.cs @@ -28,54 +28,54 @@ /// private void InitializeComponent() { - System.Windows.Forms.TreeNode treeNode61 = new System.Windows.Forms.TreeNode("节点0"); - System.Windows.Forms.TreeNode treeNode62 = new System.Windows.Forms.TreeNode("节点1"); - System.Windows.Forms.TreeNode treeNode63 = new System.Windows.Forms.TreeNode("节点2"); - System.Windows.Forms.TreeNode treeNode64 = new System.Windows.Forms.TreeNode("节点3"); - System.Windows.Forms.TreeNode treeNode57 = new System.Windows.Forms.TreeNode("节点0"); - System.Windows.Forms.TreeNode treeNode58 = new System.Windows.Forms.TreeNode("节点1"); - System.Windows.Forms.TreeNode treeNode59 = new System.Windows.Forms.TreeNode("节点2"); - System.Windows.Forms.TreeNode treeNode60 = new System.Windows.Forms.TreeNode("节点3"); - System.Windows.Forms.TreeNode treeNode33 = new System.Windows.Forms.TreeNode("节点0"); - System.Windows.Forms.TreeNode treeNode34 = new System.Windows.Forms.TreeNode("节点1"); - System.Windows.Forms.TreeNode treeNode35 = new System.Windows.Forms.TreeNode("节点2"); - System.Windows.Forms.TreeNode treeNode36 = new System.Windows.Forms.TreeNode("节点3"); - System.Windows.Forms.TreeNode treeNode37 = new System.Windows.Forms.TreeNode("节点0", new System.Windows.Forms.TreeNode[] { - treeNode33, - treeNode34, - treeNode35, - treeNode36}); - System.Windows.Forms.TreeNode treeNode38 = new System.Windows.Forms.TreeNode("节点4"); - System.Windows.Forms.TreeNode treeNode39 = new System.Windows.Forms.TreeNode("节点5"); - System.Windows.Forms.TreeNode treeNode40 = new System.Windows.Forms.TreeNode("节点6"); - System.Windows.Forms.TreeNode treeNode41 = new System.Windows.Forms.TreeNode("节点7"); - System.Windows.Forms.TreeNode treeNode42 = new System.Windows.Forms.TreeNode("节点1", new System.Windows.Forms.TreeNode[] { - treeNode38, - treeNode39, - treeNode40, - treeNode41}); - System.Windows.Forms.TreeNode treeNode43 = new System.Windows.Forms.TreeNode("节点2"); - System.Windows.Forms.TreeNode treeNode44 = new System.Windows.Forms.TreeNode("节点3"); - System.Windows.Forms.TreeNode treeNode45 = new System.Windows.Forms.TreeNode("节点00"); - System.Windows.Forms.TreeNode treeNode46 = new System.Windows.Forms.TreeNode("节点01"); - System.Windows.Forms.TreeNode treeNode47 = new System.Windows.Forms.TreeNode("节点02"); - System.Windows.Forms.TreeNode treeNode48 = new System.Windows.Forms.TreeNode("节点03"); - System.Windows.Forms.TreeNode treeNode49 = new System.Windows.Forms.TreeNode("节点0", new System.Windows.Forms.TreeNode[] { - treeNode45, - treeNode46, - treeNode47, - treeNode48}); - System.Windows.Forms.TreeNode treeNode50 = new System.Windows.Forms.TreeNode("节点11"); - System.Windows.Forms.TreeNode treeNode51 = new System.Windows.Forms.TreeNode("节点12"); - System.Windows.Forms.TreeNode treeNode52 = new System.Windows.Forms.TreeNode("节点13"); - System.Windows.Forms.TreeNode treeNode53 = new System.Windows.Forms.TreeNode("节点14"); - System.Windows.Forms.TreeNode treeNode54 = new System.Windows.Forms.TreeNode("节点1", new System.Windows.Forms.TreeNode[] { - treeNode50, - treeNode51, - treeNode52, - treeNode53}); - System.Windows.Forms.TreeNode treeNode55 = new System.Windows.Forms.TreeNode("节点2"); - System.Windows.Forms.TreeNode treeNode56 = new System.Windows.Forms.TreeNode("节点3"); + System.Windows.Forms.TreeNode treeNode29 = new System.Windows.Forms.TreeNode("节点0"); + System.Windows.Forms.TreeNode treeNode30 = new System.Windows.Forms.TreeNode("节点1"); + System.Windows.Forms.TreeNode treeNode31 = new System.Windows.Forms.TreeNode("节点2"); + System.Windows.Forms.TreeNode treeNode32 = new System.Windows.Forms.TreeNode("节点3"); + System.Windows.Forms.TreeNode treeNode25 = new System.Windows.Forms.TreeNode("节点0"); + System.Windows.Forms.TreeNode treeNode26 = new System.Windows.Forms.TreeNode("节点1"); + System.Windows.Forms.TreeNode treeNode27 = new System.Windows.Forms.TreeNode("节点2"); + System.Windows.Forms.TreeNode treeNode28 = new System.Windows.Forms.TreeNode("节点3"); + System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("节点0"); + System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("节点1"); + System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("节点2"); + System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("节点3"); + System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("节点0", new System.Windows.Forms.TreeNode[] { + treeNode1, + treeNode2, + treeNode3, + treeNode4}); + System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("节点4"); + System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("节点5"); + System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("节点6"); + System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("节点7"); + System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("节点1", new System.Windows.Forms.TreeNode[] { + treeNode6, + treeNode7, + treeNode8, + treeNode9}); + System.Windows.Forms.TreeNode treeNode11 = new System.Windows.Forms.TreeNode("节点2"); + System.Windows.Forms.TreeNode treeNode12 = new System.Windows.Forms.TreeNode("节点3"); + System.Windows.Forms.TreeNode treeNode13 = new System.Windows.Forms.TreeNode("节点00"); + System.Windows.Forms.TreeNode treeNode14 = new System.Windows.Forms.TreeNode("节点01"); + System.Windows.Forms.TreeNode treeNode15 = new System.Windows.Forms.TreeNode("节点02"); + System.Windows.Forms.TreeNode treeNode16 = new System.Windows.Forms.TreeNode("节点03"); + System.Windows.Forms.TreeNode treeNode17 = new System.Windows.Forms.TreeNode("节点0", new System.Windows.Forms.TreeNode[] { + treeNode13, + treeNode14, + treeNode15, + treeNode16}); + System.Windows.Forms.TreeNode treeNode18 = new System.Windows.Forms.TreeNode("节点11"); + System.Windows.Forms.TreeNode treeNode19 = new System.Windows.Forms.TreeNode("节点12"); + System.Windows.Forms.TreeNode treeNode20 = new System.Windows.Forms.TreeNode("节点13"); + System.Windows.Forms.TreeNode treeNode21 = new System.Windows.Forms.TreeNode("节点14"); + System.Windows.Forms.TreeNode treeNode22 = new System.Windows.Forms.TreeNode("节点1", new System.Windows.Forms.TreeNode[] { + treeNode18, + treeNode19, + treeNode20, + treeNode21}); + System.Windows.Forms.TreeNode treeNode23 = new System.Windows.Forms.TreeNode("节点2"); + System.Windows.Forms.TreeNode treeNode24 = new System.Windows.Forms.TreeNode("节点3"); this.uiLine8 = new Sunny.UI.UILine(); this.uiDatetimePicker1 = new Sunny.UI.UIDatetimePicker(); this.uiColorPicker1 = new Sunny.UI.UIColorPicker(); @@ -95,13 +95,11 @@ this.uiLine4 = new Sunny.UI.UILine(); this.uiComboboxEx1 = new Sunny.UI.UIComboboxEx(); this.uiComboboxEx2 = new Sunny.UI.UIComboboxEx(); - this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker(); this.PagePanel.SuspendLayout(); this.SuspendLayout(); // // PagePanel // - this.PagePanel.Controls.Add(this.dateTimePicker1); this.PagePanel.Controls.Add(this.uiComboboxEx2); this.PagePanel.Controls.Add(this.uiComboboxEx1); this.PagePanel.Controls.Add(this.uiLine4); @@ -304,19 +302,19 @@ this.uiComboTreeView1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiComboTreeView1.MinimumSize = new System.Drawing.Size(63, 0); this.uiComboTreeView1.Name = "uiComboTreeView1"; - treeNode61.Name = "节点0"; - treeNode61.Text = "节点0"; - treeNode62.Name = "节点1"; - treeNode62.Text = "节点1"; - treeNode63.Name = "节点2"; - treeNode63.Text = "节点2"; - treeNode64.Name = "节点3"; - treeNode64.Text = "节点3"; + treeNode29.Name = "节点0"; + treeNode29.Text = "节点0"; + treeNode30.Name = "节点1"; + treeNode30.Text = "节点1"; + treeNode31.Name = "节点2"; + treeNode31.Text = "节点2"; + treeNode32.Name = "节点3"; + treeNode32.Text = "节点3"; this.uiComboTreeView1.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode61, - treeNode62, - treeNode63, - treeNode64}); + treeNode29, + treeNode30, + treeNode31, + treeNode32}); this.uiComboTreeView1.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.uiComboTreeView1.Size = new System.Drawing.Size(150, 29); this.uiComboTreeView1.TabIndex = 43; @@ -344,19 +342,19 @@ this.uiComboTreeView2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiComboTreeView2.MinimumSize = new System.Drawing.Size(63, 0); this.uiComboTreeView2.Name = "uiComboTreeView2"; - treeNode57.Name = "节点0"; - treeNode57.Text = "节点0"; - treeNode58.Name = "节点1"; - treeNode58.Text = "节点1"; - treeNode59.Name = "节点2"; - treeNode59.Text = "节点2"; - treeNode60.Name = "节点3"; - treeNode60.Text = "节点3"; + treeNode25.Name = "节点0"; + treeNode25.Text = "节点0"; + treeNode26.Name = "节点1"; + treeNode26.Text = "节点1"; + treeNode27.Name = "节点2"; + treeNode27.Text = "节点2"; + treeNode28.Name = "节点3"; + treeNode28.Text = "节点3"; this.uiComboTreeView2.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode57, - treeNode58, - treeNode59, - treeNode60}); + treeNode25, + treeNode26, + treeNode27, + treeNode28}); this.uiComboTreeView2.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.uiComboTreeView2.Size = new System.Drawing.Size(150, 29); this.uiComboTreeView2.TabIndex = 46; @@ -373,35 +371,35 @@ this.uiComboTreeView3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiComboTreeView3.MinimumSize = new System.Drawing.Size(63, 0); this.uiComboTreeView3.Name = "uiComboTreeView3"; - treeNode33.Name = "节点0"; - treeNode33.Text = "节点0"; - treeNode34.Name = "节点1"; - treeNode34.Text = "节点1"; - treeNode35.Name = "节点2"; - treeNode35.Text = "节点2"; - treeNode36.Name = "节点3"; - treeNode36.Text = "节点3"; - treeNode37.Name = "节点0"; - treeNode37.Text = "节点0"; - treeNode38.Name = "节点4"; - treeNode38.Text = "节点4"; - treeNode39.Name = "节点5"; - treeNode39.Text = "节点5"; - treeNode40.Name = "节点6"; - treeNode40.Text = "节点6"; - treeNode41.Name = "节点7"; - treeNode41.Text = "节点7"; - treeNode42.Name = "节点1"; - treeNode42.Text = "节点1"; - treeNode43.Name = "节点2"; - treeNode43.Text = "节点2"; - treeNode44.Name = "节点3"; - treeNode44.Text = "节点3"; + treeNode1.Name = "节点0"; + treeNode1.Text = "节点0"; + treeNode2.Name = "节点1"; + treeNode2.Text = "节点1"; + treeNode3.Name = "节点2"; + treeNode3.Text = "节点2"; + treeNode4.Name = "节点3"; + treeNode4.Text = "节点3"; + treeNode5.Name = "节点0"; + treeNode5.Text = "节点0"; + treeNode6.Name = "节点4"; + treeNode6.Text = "节点4"; + treeNode7.Name = "节点5"; + treeNode7.Text = "节点5"; + treeNode8.Name = "节点6"; + treeNode8.Text = "节点6"; + treeNode9.Name = "节点7"; + treeNode9.Text = "节点7"; + treeNode10.Name = "节点1"; + treeNode10.Text = "节点1"; + treeNode11.Name = "节点2"; + treeNode11.Text = "节点2"; + treeNode12.Name = "节点3"; + treeNode12.Text = "节点3"; this.uiComboTreeView3.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode37, - treeNode42, - treeNode43, - treeNode44}); + treeNode5, + treeNode10, + treeNode11, + treeNode12}); this.uiComboTreeView3.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.uiComboTreeView3.ShowLines = true; this.uiComboTreeView3.Size = new System.Drawing.Size(150, 29); @@ -417,35 +415,35 @@ this.uiComboTreeView4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiComboTreeView4.MinimumSize = new System.Drawing.Size(63, 0); this.uiComboTreeView4.Name = "uiComboTreeView4"; - treeNode45.Name = "节点0"; - treeNode45.Text = "节点00"; - treeNode46.Name = "节点1"; - treeNode46.Text = "节点01"; - treeNode47.Name = "节点2"; - treeNode47.Text = "节点02"; - treeNode48.Name = "节点3"; - treeNode48.Text = "节点03"; - treeNode49.Name = "节点0"; - treeNode49.Text = "节点0"; - treeNode50.Name = "节点4"; - treeNode50.Text = "节点11"; - treeNode51.Name = "节点5"; - treeNode51.Text = "节点12"; - treeNode52.Name = "节点6"; - treeNode52.Text = "节点13"; - treeNode53.Name = "节点7"; - treeNode53.Text = "节点14"; - treeNode54.Name = "节点1"; - treeNode54.Text = "节点1"; - treeNode55.Name = "节点2"; - treeNode55.Text = "节点2"; - treeNode56.Name = "节点3"; - treeNode56.Text = "节点3"; + treeNode13.Name = "节点0"; + treeNode13.Text = "节点00"; + treeNode14.Name = "节点1"; + treeNode14.Text = "节点01"; + treeNode15.Name = "节点2"; + treeNode15.Text = "节点02"; + treeNode16.Name = "节点3"; + treeNode16.Text = "节点03"; + treeNode17.Name = "节点0"; + treeNode17.Text = "节点0"; + treeNode18.Name = "节点4"; + treeNode18.Text = "节点11"; + treeNode19.Name = "节点5"; + treeNode19.Text = "节点12"; + treeNode20.Name = "节点6"; + treeNode20.Text = "节点13"; + treeNode21.Name = "节点7"; + treeNode21.Text = "节点14"; + treeNode22.Name = "节点1"; + treeNode22.Text = "节点1"; + treeNode23.Name = "节点2"; + treeNode23.Text = "节点2"; + treeNode24.Name = "节点3"; + treeNode24.Text = "节点3"; this.uiComboTreeView4.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode49, - treeNode54, - treeNode55, - treeNode56}); + treeNode17, + treeNode22, + treeNode23, + treeNode24}); this.uiComboTreeView4.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.uiComboTreeView4.ShowLines = true; this.uiComboTreeView4.Size = new System.Drawing.Size(150, 29); @@ -494,13 +492,6 @@ this.uiComboboxEx2.Size = new System.Drawing.Size(150, 30); this.uiComboboxEx2.TabIndex = 51; // - // dateTimePicker1 - // - this.dateTimePicker1.Location = new System.Drawing.Point(390, 277); - this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 29); - this.dateTimePicker1.TabIndex = 52; - // // FCombobox // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -534,6 +525,5 @@ private UILine uiLine4; private UIComboboxEx uiComboboxEx2; private UIComboboxEx uiComboboxEx1; - private System.Windows.Forms.DateTimePicker dateTimePicker1; } } \ No newline at end of file diff --git a/SunnyUI/Charts/UIChart.cs b/SunnyUI/Charts/UIChart.cs index 6f0d2267..3d252f0e 100644 --- a/SunnyUI/Charts/UIChart.cs +++ b/SunnyUI/Charts/UIChart.cs @@ -32,6 +32,7 @@ namespace Sunny.UI { public UIChart() { + SetStyleFlags(true, false); ShowText = false; fillColor = UIChartStyles.Plain.BackColor; foreColor = UIChartStyles.Plain.ForeColor; diff --git a/SunnyUI/Controls/DropItem/UIDropControl.cs b/SunnyUI/Controls/DropItem/UIDropControl.cs index e9c87260..f738224b 100644 --- a/SunnyUI/Controls/DropItem/UIDropControl.cs +++ b/SunnyUI/Controls/DropItem/UIDropControl.cs @@ -47,14 +47,7 @@ namespace Sunny.UI public UIDropControl() { InitializeComponent(); - - SetStyle(ControlStyles.AllPaintingInWmPaint, true); - SetStyle(ControlStyles.DoubleBuffer, true); - SetStyle(ControlStyles.Selectable, true); - SetStyle(ControlStyles.UserPaint, true); - SetStyle(ControlStyles.OptimizedDoubleBuffer, true); - base.DoubleBuffered = true; - UpdateStyles(); + SetStyleFlags(); edit.Font = UIFontColor.Font; edit.Left = 3; diff --git a/SunnyUI/Controls/DropItem/UIDropDownItem.cs b/SunnyUI/Controls/DropItem/UIDropDownItem.cs index 25547c59..fca26606 100644 --- a/SunnyUI/Controls/DropItem/UIDropDownItem.cs +++ b/SunnyUI/Controls/DropItem/UIDropDownItem.cs @@ -36,6 +36,7 @@ namespace Sunny.UI public UIDropDownItem() { InitializeComponent(); + SetStyleFlags(true, false); } /// diff --git a/SunnyUI/Controls/DropItem/UIDropDownItem.resx b/SunnyUI/Controls/DropItem/UIDropDownItem.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/SunnyUI/Controls/DropItem/UIDropDownItem.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SunnyUI/Controls/UIAnalogMeter.cs b/SunnyUI/Controls/UIAnalogMeter.cs index 9c650c8e..f8ea2eec 100644 --- a/SunnyUI/Controls/UIAnalogMeter.cs +++ b/SunnyUI/Controls/UIAnalogMeter.cs @@ -83,8 +83,7 @@ namespace Sunny.UI public UIAnalogMeter() { - SetStyle(ControlStyles.AllPaintingInWmPaint | ControlStyles.SupportsTransparentBackColor | ControlStyles.UserPaint | ControlStyles.ResizeRedraw | ControlStyles.OptimizedDoubleBuffer | ControlStyles.DoubleBuffer, true); - base.DoubleBuffered = true; + SetStyleFlags(true, false, true); // Properties initialization needleColor = Color.Yellow; diff --git a/SunnyUI/Controls/UIAvatar.cs b/SunnyUI/Controls/UIAvatar.cs index d5c21c27..0fb876a3 100644 --- a/SunnyUI/Controls/UIAvatar.cs +++ b/SunnyUI/Controls/UIAvatar.cs @@ -60,6 +60,7 @@ namespace Sunny.UI /// public UIAvatar() { + SetStyleFlags(true, false); Width = Height = 60; ShowText = false; ShowRect = false; diff --git a/SunnyUI/Controls/UIBattery.cs b/SunnyUI/Controls/UIBattery.cs index 1e41cb70..1b1f90aa 100644 --- a/SunnyUI/Controls/UIBattery.cs +++ b/SunnyUI/Controls/UIBattery.cs @@ -43,6 +43,7 @@ namespace Sunny.UI public UIBattery() { + SetStyleFlags(true, false); ShowRect = false; fillColor = UIStyles.Blue.PlainColor; Width = 48; diff --git a/SunnyUI/Controls/UIBreadcrumb.cs b/SunnyUI/Controls/UIBreadcrumb.cs index a038a85d..0e72b936 100644 --- a/SunnyUI/Controls/UIBreadcrumb.cs +++ b/SunnyUI/Controls/UIBreadcrumb.cs @@ -37,6 +37,7 @@ namespace Sunny.UI { public UIBreadcrumb() { + SetStyleFlags(true, false); ShowText = false; ShowRect = false; Height = 29; diff --git a/SunnyUI/Controls/UIButton.cs b/SunnyUI/Controls/UIButton.cs index 78f59afc..366837a8 100644 --- a/SunnyUI/Controls/UIButton.cs +++ b/SunnyUI/Controls/UIButton.cs @@ -41,6 +41,7 @@ namespace Sunny.UI { public UIButton() { + SetStyleFlags(); TabStop = true; Width = 100; Height = 35; diff --git a/SunnyUI/Controls/UICheckBox.cs b/SunnyUI/Controls/UICheckBox.cs index b23422a6..4fd71b66 100644 --- a/SunnyUI/Controls/UICheckBox.cs +++ b/SunnyUI/Controls/UICheckBox.cs @@ -36,6 +36,7 @@ namespace Sunny.UI { public UICheckBox() { + SetStyleFlags(); Cursor = Cursors.Hand; ShowRect = false; Size = new Size(150, 29); diff --git a/SunnyUI/Controls/UIComboBox.cs b/SunnyUI/Controls/UIComboBox.cs index 9977a16c..5d2f939c 100644 --- a/SunnyUI/Controls/UIComboBox.cs +++ b/SunnyUI/Controls/UIComboBox.cs @@ -38,15 +38,6 @@ namespace Sunny.UI public UIComboBox() { InitializeComponent(); - - SetStyle(ControlStyles.AllPaintingInWmPaint, true); - SetStyle(ControlStyles.DoubleBuffer, true); - SetStyle(ControlStyles.Selectable, true); - SetStyle(ControlStyles.UserPaint, true); - SetStyle(ControlStyles.OptimizedDoubleBuffer, true); - DoubleBuffered = true; - UpdateStyles(); - box.SelectedIndexChanged += Box_SelectedIndexChanged; box.DataSourceChanged += Box_DataSourceChanged; box.DisplayMemberChanged += Box_DisplayMemberChanged; diff --git a/SunnyUI/Controls/UIControl.cs b/SunnyUI/Controls/UIControl.cs index 3666bccd..04326de6 100644 --- a/SunnyUI/Controls/UIControl.cs +++ b/SunnyUI/Controls/UIControl.cs @@ -39,21 +39,25 @@ namespace Sunny.UI /// public UIControl() { - SetStyle(ControlStyles.AllPaintingInWmPaint, true); - SetStyle(ControlStyles.DoubleBuffer, true); - SetStyle(ControlStyles.Selectable, true); - SetStyle(ControlStyles.SupportsTransparentBackColor, true); - SetStyle(ControlStyles.UserPaint, true); - SetStyle(ControlStyles.OptimizedDoubleBuffer, true); - base.DoubleBuffered = true; - UpdateStyles(); - Version = UIGlobal.Version; base.Font = UIFontColor.Font; Size = new Size(100, 35); base.MinimumSize = new Size(1, 1); } + protected void SetStyleFlags(bool supportTransparent = true, bool selectable = true, bool resizeRedraw = false) + { + SetStyle(ControlStyles.AllPaintingInWmPaint, true); + SetStyle(ControlStyles.DoubleBuffer, true); + SetStyle(ControlStyles.UserPaint, true); + SetStyle(ControlStyles.OptimizedDoubleBuffer, true); + if (supportTransparent) SetStyle(ControlStyles.SupportsTransparentBackColor, true); + if (selectable) SetStyle(ControlStyles.Selectable, true); + if (resizeRedraw) SetStyle(ControlStyles.ResizeRedraw, true); + base.DoubleBuffered = true; + UpdateStyles(); + } + protected override void OnSizeChanged(EventArgs e) { base.OnSizeChanged(e); diff --git a/SunnyUI/Controls/UIDoubleUpDown.cs b/SunnyUI/Controls/UIDoubleUpDown.cs index 4e8c4512..5063e2bf 100644 --- a/SunnyUI/Controls/UIDoubleUpDown.cs +++ b/SunnyUI/Controls/UIDoubleUpDown.cs @@ -37,6 +37,9 @@ namespace Sunny.UI public UIDoubleUpDown() { InitializeComponent(); + + SetStyleFlags(); + ShowText = false; edit.Type = UITextBox.UIEditType.Double; edit.Parent = pnlValue; diff --git a/SunnyUI/Controls/UIFlowLayoutPanel.cs b/SunnyUI/Controls/UIFlowLayoutPanel.cs index 511fbc09..4559cf04 100644 --- a/SunnyUI/Controls/UIFlowLayoutPanel.cs +++ b/SunnyUI/Controls/UIFlowLayoutPanel.cs @@ -37,7 +37,7 @@ namespace Sunny.UI public UIFlowLayoutPanel() { InitializeComponent(); - + SetStyleFlags(true, false); ShowText = false; Panel.AutoScroll = true; diff --git a/SunnyUI/Controls/UIGroupBox.cs b/SunnyUI/Controls/UIGroupBox.cs index 44dda017..da943d86 100644 --- a/SunnyUI/Controls/UIGroupBox.cs +++ b/SunnyUI/Controls/UIGroupBox.cs @@ -32,6 +32,7 @@ namespace Sunny.UI public UIGroupBox() { InitializeComponent(); + SetStyleFlags(true, false); } protected override void OnPaintFill(Graphics g, GraphicsPath path) diff --git a/SunnyUI/Controls/UIGroupBox.resx b/SunnyUI/Controls/UIGroupBox.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/SunnyUI/Controls/UIGroupBox.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SunnyUI/Controls/UIHeaderButton.cs b/SunnyUI/Controls/UIHeaderButton.cs index cfbf4db7..c49db5cd 100644 --- a/SunnyUI/Controls/UIHeaderButton.cs +++ b/SunnyUI/Controls/UIHeaderButton.cs @@ -38,6 +38,7 @@ namespace Sunny.UI { public UIHeaderButton() { + SetStyleFlags(); Size = new Size(100, 88); ShowText = false; ShowRect = false; diff --git a/SunnyUI/Controls/UIHorScrollBar.cs b/SunnyUI/Controls/UIHorScrollBar.cs index c4773a00..c381d299 100644 --- a/SunnyUI/Controls/UIHorScrollBar.cs +++ b/SunnyUI/Controls/UIHorScrollBar.cs @@ -33,6 +33,7 @@ namespace Sunny.UI { public UIHorScrollBar() { + SetStyleFlags(true, false); Maximum = 100; left_state = value_state = right_state = DrawItemState.None; timer.Interval = 150; diff --git a/SunnyUI/Controls/UIHorScrollBarEx.cs b/SunnyUI/Controls/UIHorScrollBarEx.cs index 930d96e9..2f978565 100644 --- a/SunnyUI/Controls/UIHorScrollBarEx.cs +++ b/SunnyUI/Controls/UIHorScrollBarEx.cs @@ -32,6 +32,7 @@ namespace Sunny.UI { public UIHorScrollBarEx() { + SetStyleFlags(true, false); ShowText = false; ShowRect = false; Height = ScrollBarInfo.HorizontalScrollBarHeight() + 1; diff --git a/SunnyUI/Controls/UIImageListBox.cs b/SunnyUI/Controls/UIImageListBox.cs index a64e426d..86a804e3 100644 --- a/SunnyUI/Controls/UIImageListBox.cs +++ b/SunnyUI/Controls/UIImageListBox.cs @@ -40,6 +40,7 @@ namespace Sunny.UI public UIImageListBox() { InitializeComponent(); + SetStyleFlags(true, false); ShowText = false; Padding = new Padding(2); diff --git a/SunnyUI/Controls/UIImageListBox.resx b/SunnyUI/Controls/UIImageListBox.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/SunnyUI/Controls/UIImageListBox.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SunnyUI/Controls/UIIntegerUpDown.cs b/SunnyUI/Controls/UIIntegerUpDown.cs index fe83445c..7179fd6f 100644 --- a/SunnyUI/Controls/UIIntegerUpDown.cs +++ b/SunnyUI/Controls/UIIntegerUpDown.cs @@ -37,6 +37,7 @@ namespace Sunny.UI public UIIntegerUpDown() { InitializeComponent(); + SetStyleFlags(); ShowText = false; edit.Type = UITextBox.UIEditType.Integer; edit.Parent = pnlValue; diff --git a/SunnyUI/Controls/UILabel.cs b/SunnyUI/Controls/UILabel.cs index eb70bb21..ea1c7542 100644 --- a/SunnyUI/Controls/UILabel.cs +++ b/SunnyUI/Controls/UILabel.cs @@ -125,6 +125,7 @@ namespace Sunny.UI public UISymbolLabel() { + SetStyleFlags(true, false); ShowRect = false; foreColor = UIFontColor.Primary; symbolColor = UIFontColor.Primary; diff --git a/SunnyUI/Controls/UILedLabel.cs b/SunnyUI/Controls/UILedLabel.cs index d99e1f75..6cd8c635 100644 --- a/SunnyUI/Controls/UILedLabel.cs +++ b/SunnyUI/Controls/UILedLabel.cs @@ -33,6 +33,7 @@ namespace Sunny.UI { public UILedLabel() { + SetStyleFlags(true, false); ShowText = ShowRect = ShowFill = false; foreColor = UIColor.Blue; } diff --git a/SunnyUI/Controls/UILight.cs b/SunnyUI/Controls/UILight.cs index dfdb42b2..8e70d17e 100644 --- a/SunnyUI/Controls/UILight.cs +++ b/SunnyUI/Controls/UILight.cs @@ -41,6 +41,7 @@ namespace Sunny.UI public UILight() { + SetStyleFlags(true, false); ShowRect = false; ShowText = false; Radius = Width = Height = 35; diff --git a/SunnyUI/Controls/UILine.cs b/SunnyUI/Controls/UILine.cs index 71b943cd..8024ffb1 100644 --- a/SunnyUI/Controls/UILine.cs +++ b/SunnyUI/Controls/UILine.cs @@ -31,6 +31,7 @@ namespace Sunny.UI { public UILine() { + SetStyleFlags(true, false); Size = new Size(360, 29); MinimumSize = new Size(2, 2); foreColor = UIStyles.Blue.LineForeColor; diff --git a/SunnyUI/Controls/UIListBox.cs b/SunnyUI/Controls/UIListBox.cs index d9320ccf..6fc61954 100644 --- a/SunnyUI/Controls/UIListBox.cs +++ b/SunnyUI/Controls/UIListBox.cs @@ -41,6 +41,7 @@ namespace Sunny.UI public UIListBox() { InitializeComponent(); + SetStyleFlags(true, false); ShowText = false; Padding = new Padding(2); diff --git a/SunnyUI/Controls/UILogo.cs b/SunnyUI/Controls/UILogo.cs index 3ec56e98..7616f8d9 100644 --- a/SunnyUI/Controls/UILogo.cs +++ b/SunnyUI/Controls/UILogo.cs @@ -34,6 +34,7 @@ namespace Sunny.UI [ToolboxItem(true)] public UILogo() { + SetStyleFlags(true, false); ShowText = ShowRect = false; Width = 300; Height = 80; diff --git a/SunnyUI/Controls/UINavBar.cs b/SunnyUI/Controls/UINavBar.cs index 9b07c41d..521c0c3b 100644 --- a/SunnyUI/Controls/UINavBar.cs +++ b/SunnyUI/Controls/UINavBar.cs @@ -45,7 +45,6 @@ namespace Sunny.UI SetStyle(ControlStyles.SupportsTransparentBackColor, true); SetStyle(ControlStyles.UserPaint, true); SetStyle(ControlStyles.OptimizedDoubleBuffer, true); - SetStyle(ControlStyles.ResizeRedraw, true); DoubleBuffered = true; UpdateStyles(); Font = UIFontColor.Font; diff --git a/SunnyUI/Controls/UIPagination.cs b/SunnyUI/Controls/UIPagination.cs index 11f204a7..1580ea99 100644 --- a/SunnyUI/Controls/UIPagination.cs +++ b/SunnyUI/Controls/UIPagination.cs @@ -84,6 +84,7 @@ namespace Sunny.UI public UIPagination() { InitializeComponent(); + SetStyleFlags(true, false); ShowText = false; buttons.TryAdd(0, b0); diff --git a/SunnyUI/Controls/UIPanel.cs b/SunnyUI/Controls/UIPanel.cs index e2f79942..743db296 100644 --- a/SunnyUI/Controls/UIPanel.cs +++ b/SunnyUI/Controls/UIPanel.cs @@ -60,6 +60,19 @@ namespace Sunny.UI base.MinimumSize = new System.Drawing.Size(1, 1); } + protected void SetStyleFlags(bool supportTransparent = true, bool selectable = true, bool resizeRedraw = false) + { + SetStyle(ControlStyles.AllPaintingInWmPaint, true); + SetStyle(ControlStyles.DoubleBuffer, true); + SetStyle(ControlStyles.UserPaint, true); + SetStyle(ControlStyles.OptimizedDoubleBuffer, true); + if (supportTransparent) SetStyle(ControlStyles.SupportsTransparentBackColor, true); + if (selectable) SetStyle(ControlStyles.Selectable, true); + if (resizeRedraw) SetStyle(ControlStyles.ResizeRedraw, true); + base.DoubleBuffered = true; + UpdateStyles(); + } + protected override void OnSizeChanged(EventArgs e) { base.OnSizeChanged(e); diff --git a/SunnyUI/Controls/UIProcessBar.cs b/SunnyUI/Controls/UIProcessBar.cs index 19eb97fa..e4443ec2 100644 --- a/SunnyUI/Controls/UIProcessBar.cs +++ b/SunnyUI/Controls/UIProcessBar.cs @@ -41,6 +41,7 @@ namespace Sunny.UI public UIProcessBar() { + SetStyleFlags(true, false); MinimumSize = new Size(70, 5); Size = new Size(300, 29); ShowText = false; diff --git a/SunnyUI/Controls/UIProgressIndicator.cs b/SunnyUI/Controls/UIProgressIndicator.cs index 1082a4e3..65f157a7 100644 --- a/SunnyUI/Controls/UIProgressIndicator.cs +++ b/SunnyUI/Controls/UIProgressIndicator.cs @@ -35,6 +35,7 @@ namespace Sunny.UI public UIProgressIndicator() { + SetStyleFlags(true, false); Width = Height = 100; timer.Interval = 200; diff --git a/SunnyUI/Controls/UIRadioButton.cs b/SunnyUI/Controls/UIRadioButton.cs index 2bf95912..2de50ab3 100644 --- a/SunnyUI/Controls/UIRadioButton.cs +++ b/SunnyUI/Controls/UIRadioButton.cs @@ -41,6 +41,7 @@ namespace Sunny.UI public UIRadioButton() { + SetStyleFlags(); Cursor = Cursors.Hand; ShowRect = false; Size = new Size(150, 29); diff --git a/SunnyUI/Controls/UIRichTextBox.cs b/SunnyUI/Controls/UIRichTextBox.cs index e3aa5643..3f3f7f87 100644 --- a/SunnyUI/Controls/UIRichTextBox.cs +++ b/SunnyUI/Controls/UIRichTextBox.cs @@ -17,7 +17,7 @@ namespace Sunny.UI public UIRichTextBox() { InitializeComponent(); - + SetStyleFlags(); ShowText = false; edit.MouseWheel += OnMouseWheel; diff --git a/SunnyUI/Controls/UIRoundMeter.cs b/SunnyUI/Controls/UIRoundMeter.cs index 12ab231a..b60160ea 100644 --- a/SunnyUI/Controls/UIRoundMeter.cs +++ b/SunnyUI/Controls/UIRoundMeter.cs @@ -88,7 +88,7 @@ namespace Sunny.UI public UIRoundMeter() { InitializeComponent(); - + SetStyleFlags(true, false); MeterType = TMeterType.Gps; _runType = TRunType.ClockWise; diff --git a/SunnyUI/Controls/UIRoundProcess.cs b/SunnyUI/Controls/UIRoundProcess.cs index 1a65ce77..5a04278b 100644 --- a/SunnyUI/Controls/UIRoundProcess.cs +++ b/SunnyUI/Controls/UIRoundProcess.cs @@ -36,6 +36,7 @@ namespace Sunny.UI { public UIRoundProcess() { + SetStyleFlags(true, false); Size = new Size(120, 120); Inner = 30; Outer = 50; diff --git a/SunnyUI/Controls/UIScrollBar.cs b/SunnyUI/Controls/UIScrollBar.cs index 060952ca..bd54ad5c 100644 --- a/SunnyUI/Controls/UIScrollBar.cs +++ b/SunnyUI/Controls/UIScrollBar.cs @@ -34,6 +34,7 @@ namespace Sunny.UI { public UIScrollBar() { + SetStyleFlags(true, false); Maximum = 100; up_state = value_state = down_state = DrawItemState.None; timer.Interval = 150; diff --git a/SunnyUI/Controls/UIScrollingText.cs b/SunnyUI/Controls/UIScrollingText.cs index 9f5d6db9..58fc8249 100644 --- a/SunnyUI/Controls/UIScrollingText.cs +++ b/SunnyUI/Controls/UIScrollingText.cs @@ -38,6 +38,7 @@ namespace Sunny.UI public UIScrollingText() { + SetStyleFlags(true, false); fillColor = UIStyles.Blue.PlainColor; foreColor = UIStyles.Blue.RectColor; Reset(); diff --git a/SunnyUI/Controls/UISwitch.cs b/SunnyUI/Controls/UISwitch.cs index 4274530f..b598d82d 100644 --- a/SunnyUI/Controls/UISwitch.cs +++ b/SunnyUI/Controls/UISwitch.cs @@ -47,6 +47,7 @@ namespace Sunny.UI public UISwitch() { + SetStyleFlags(); Height = 29; Width = 75; ShowText = false; diff --git a/SunnyUI/Controls/UITabControlMenu.cs b/SunnyUI/Controls/UITabControlMenu.cs index b2e7d6d8..a698fa61 100644 --- a/SunnyUI/Controls/UITabControlMenu.cs +++ b/SunnyUI/Controls/UITabControlMenu.cs @@ -31,7 +31,12 @@ namespace Sunny.UI { public UITabControlMenu() { - SetStyle(ControlStyles.AllPaintingInWmPaint | ControlStyles.UserPaint | ControlStyles.DoubleBuffer, true); + SetStyle(ControlStyles.AllPaintingInWmPaint, true); + SetStyle(ControlStyles.DoubleBuffer, true); + SetStyle(ControlStyles.UserPaint, true); + SetStyle(ControlStyles.OptimizedDoubleBuffer, true); + DoubleBuffered = true; + UpdateStyles(); ItemSize = new Size(40, 200); DrawMode = TabDrawMode.OwnerDrawFixed; diff --git a/SunnyUI/Controls/UITextBox.cs b/SunnyUI/Controls/UITextBox.cs index 655313f6..0beca324 100644 --- a/SunnyUI/Controls/UITextBox.cs +++ b/SunnyUI/Controls/UITextBox.cs @@ -40,7 +40,7 @@ namespace Sunny.UI public UITextBox() { InitializeComponent(); - + SetStyleFlags(); CalcEditHeight(); Height = MiniHeight; ShowText = false; diff --git a/SunnyUI/Controls/UITitlePanel.cs b/SunnyUI/Controls/UITitlePanel.cs index 9dac8b9f..a7631d3f 100644 --- a/SunnyUI/Controls/UITitlePanel.cs +++ b/SunnyUI/Controls/UITitlePanel.cs @@ -60,6 +60,7 @@ namespace Sunny.UI public UITitlePanel() { InitializeComponent(); + SetStyleFlags(true, false); ShowText = false; foreColor = Color.White; CalcSystemBoxPos(); diff --git a/SunnyUI/Controls/UITrackBar.cs b/SunnyUI/Controls/UITrackBar.cs index 8d0d53a7..f1918f31 100644 --- a/SunnyUI/Controls/UITrackBar.cs +++ b/SunnyUI/Controls/UITrackBar.cs @@ -37,6 +37,7 @@ namespace Sunny.UI public UITrackBar() { + SetStyleFlags(); Width = 150; Height = 29; diff --git a/SunnyUI/Controls/UITransfer.cs b/SunnyUI/Controls/UITransfer.cs index f37a5320..822110a8 100644 --- a/SunnyUI/Controls/UITransfer.cs +++ b/SunnyUI/Controls/UITransfer.cs @@ -40,6 +40,7 @@ namespace Sunny.UI { InitializeComponent(); ShowText = false; + SetStyleFlags(true, false); l1.ItemsCountChange += L1_ItemsCountChange; l2.ItemsCountChange += L2_ItemsCountChange; diff --git a/SunnyUI/Controls/UITransparentPanel.cs b/SunnyUI/Controls/UITransparentPanel.cs index d7c9b1a1..d08965a0 100644 --- a/SunnyUI/Controls/UITransparentPanel.cs +++ b/SunnyUI/Controls/UITransparentPanel.cs @@ -10,6 +10,11 @@ namespace Sunny.UI { private int _opacity = 150; + public UITransparentPanel() + { + SetStyleFlags(true, false); + } + [Bindable(true), Category("Custom"), DefaultValue(150), Description("背景的透明度. 有效值0-255")] public int Opacity { diff --git a/SunnyUI/Controls/UITreeView.cs b/SunnyUI/Controls/UITreeView.cs index 010e29bf..85b89bb8 100644 --- a/SunnyUI/Controls/UITreeView.cs +++ b/SunnyUI/Controls/UITreeView.cs @@ -41,6 +41,7 @@ namespace Sunny.UI public UITreeView() { InitializeComponent(); + SetStyleFlags(true, false); ShowText = false; SetScrollInfo(); diff --git a/SunnyUI/Controls/UIVerScrollBarEx.cs b/SunnyUI/Controls/UIVerScrollBarEx.cs index c40d0b5a..392087df 100644 --- a/SunnyUI/Controls/UIVerScrollBarEx.cs +++ b/SunnyUI/Controls/UIVerScrollBarEx.cs @@ -32,6 +32,7 @@ namespace Sunny.UI { public UIVerScrollBarEx() { + SetStyleFlags(true, false); ShowText = false; ShowRect = false; Width = ScrollBarInfo.VerticalScrollBarWidth() + 1; diff --git a/SunnyUI/Controls/UIWaitingBar.cs b/SunnyUI/Controls/UIWaitingBar.cs index 9b27a480..ac006354 100644 --- a/SunnyUI/Controls/UIWaitingBar.cs +++ b/SunnyUI/Controls/UIWaitingBar.cs @@ -33,6 +33,7 @@ namespace Sunny.UI public UIWaitingBar() { + SetStyleFlags(true, false); MinimumSize = new Size(70, 23); Size = new Size(300, 29); ShowText = false;