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

* UICombobox: 右侧边框不显示时，去除绘制线

Browse Source
This commit is contained in:
Sunny 2021-10-16 21:46:03 +08:00
parent 4c8d722ce6
commit 7c1ec6d352
4 changed files with 131 additions and 129 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.

258
SunnyUI.Demo/Controls/FCombobox.Designer.cs generated
View File

@ -29,54 +29,54 @@ namespace Sunny.UI.Demo
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
System.Windows.Forms.TreeNode treeNode33 = new System.Windows.Forms.TreeNode("节点0"); System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("节点0");
System.Windows.Forms.TreeNode treeNode34 = new System.Windows.Forms.TreeNode("节点1"); System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("节点1");
System.Windows.Forms.TreeNode treeNode35 = new System.Windows.Forms.TreeNode("节点2"); System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("节点2");
System.Windows.Forms.TreeNode treeNode36 = new System.Windows.Forms.TreeNode("节点3"); System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("节点3");
System.Windows.Forms.TreeNode treeNode37 = new System.Windows.Forms.TreeNode("节点0", new System.Windows.Forms.TreeNode[] { System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("节点0", new System.Windows.Forms.TreeNode[] {
treeNode33, treeNode1,
treeNode34, treeNode2,
treeNode35, treeNode3,
treeNode36}); treeNode4});
System.Windows.Forms.TreeNode treeNode38 = new System.Windows.Forms.TreeNode("节点4"); System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("节点4");
System.Windows.Forms.TreeNode treeNode39 = new System.Windows.Forms.TreeNode("节点5"); System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("节点5");
System.Windows.Forms.TreeNode treeNode40 = new System.Windows.Forms.TreeNode("节点6"); System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("节点6");
System.Windows.Forms.TreeNode treeNode41 = new System.Windows.Forms.TreeNode("节点7"); System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("节点7");
System.Windows.Forms.TreeNode treeNode42 = new System.Windows.Forms.TreeNode("节点1", new System.Windows.Forms.TreeNode[] { System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("节点1", new System.Windows.Forms.TreeNode[] {
treeNode38, treeNode6,
treeNode39, treeNode7,
treeNode40, treeNode8,
treeNode41}); treeNode9});
System.Windows.Forms.TreeNode treeNode43 = new System.Windows.Forms.TreeNode("节点2"); System.Windows.Forms.TreeNode treeNode11 = new System.Windows.Forms.TreeNode("节点2");
System.Windows.Forms.TreeNode treeNode44 = new System.Windows.Forms.TreeNode("节点3"); System.Windows.Forms.TreeNode treeNode12 = new System.Windows.Forms.TreeNode("节点3");
System.Windows.Forms.TreeNode treeNode45 = new System.Windows.Forms.TreeNode("节点00"); System.Windows.Forms.TreeNode treeNode13 = new System.Windows.Forms.TreeNode("节点00");
System.Windows.Forms.TreeNode treeNode46 = new System.Windows.Forms.TreeNode("节点01"); System.Windows.Forms.TreeNode treeNode14 = new System.Windows.Forms.TreeNode("节点01");
System.Windows.Forms.TreeNode treeNode47 = new System.Windows.Forms.TreeNode("节点02"); System.Windows.Forms.TreeNode treeNode15 = new System.Windows.Forms.TreeNode("节点02");
System.Windows.Forms.TreeNode treeNode48 = new System.Windows.Forms.TreeNode("节点03"); System.Windows.Forms.TreeNode treeNode16 = new System.Windows.Forms.TreeNode("节点03");
System.Windows.Forms.TreeNode treeNode49 = new System.Windows.Forms.TreeNode("节点0", new System.Windows.Forms.TreeNode[] { System.Windows.Forms.TreeNode treeNode17 = new System.Windows.Forms.TreeNode("节点0", new System.Windows.Forms.TreeNode[] {
treeNode45, treeNode13,
treeNode46, treeNode14,
treeNode47, treeNode15,
treeNode48}); treeNode16});
System.Windows.Forms.TreeNode treeNode50 = new System.Windows.Forms.TreeNode("节点11"); System.Windows.Forms.TreeNode treeNode18 = new System.Windows.Forms.TreeNode("节点11");
System.Windows.Forms.TreeNode treeNode51 = new System.Windows.Forms.TreeNode("节点12"); System.Windows.Forms.TreeNode treeNode19 = new System.Windows.Forms.TreeNode("节点12");
System.Windows.Forms.TreeNode treeNode52 = new System.Windows.Forms.TreeNode("节点13"); System.Windows.Forms.TreeNode treeNode20 = new System.Windows.Forms.TreeNode("节点13");
System.Windows.Forms.TreeNode treeNode53 = new System.Windows.Forms.TreeNode("节点14"); System.Windows.Forms.TreeNode treeNode21 = new System.Windows.Forms.TreeNode("节点14");
System.Windows.Forms.TreeNode treeNode54 = new System.Windows.Forms.TreeNode("节点1", new System.Windows.Forms.TreeNode[] { System.Windows.Forms.TreeNode treeNode22 = new System.Windows.Forms.TreeNode("节点1", new System.Windows.Forms.TreeNode[] {
treeNode50, treeNode18,
treeNode51, treeNode19,
treeNode52, treeNode20,
treeNode53}); treeNode21});
System.Windows.Forms.TreeNode treeNode55 = new System.Windows.Forms.TreeNode("节点2"); System.Windows.Forms.TreeNode treeNode23 = new System.Windows.Forms.TreeNode("节点2");
System.Windows.Forms.TreeNode treeNode56 = new System.Windows.Forms.TreeNode("节点3"); System.Windows.Forms.TreeNode treeNode24 = new System.Windows.Forms.TreeNode("节点3");
System.Windows.Forms.TreeNode treeNode57 = new System.Windows.Forms.TreeNode("节点0"); System.Windows.Forms.TreeNode treeNode25 = new System.Windows.Forms.TreeNode("节点0");
System.Windows.Forms.TreeNode treeNode58 = new System.Windows.Forms.TreeNode("节点1"); System.Windows.Forms.TreeNode treeNode26 = new System.Windows.Forms.TreeNode("节点1");
System.Windows.Forms.TreeNode treeNode59 = new System.Windows.Forms.TreeNode("节点2"); System.Windows.Forms.TreeNode treeNode27 = new System.Windows.Forms.TreeNode("节点2");
System.Windows.Forms.TreeNode treeNode60 = new System.Windows.Forms.TreeNode("节点3"); System.Windows.Forms.TreeNode treeNode28 = new System.Windows.Forms.TreeNode("节点3");
System.Windows.Forms.TreeNode treeNode61 = new System.Windows.Forms.TreeNode("节点0"); System.Windows.Forms.TreeNode treeNode29 = new System.Windows.Forms.TreeNode("节点0");
System.Windows.Forms.TreeNode treeNode62 = new System.Windows.Forms.TreeNode("节点1"); System.Windows.Forms.TreeNode treeNode30 = new System.Windows.Forms.TreeNode("节点1");
System.Windows.Forms.TreeNode treeNode63 = new System.Windows.Forms.TreeNode("节点2"); System.Windows.Forms.TreeNode treeNode31 = new System.Windows.Forms.TreeNode("节点2");
System.Windows.Forms.TreeNode treeNode64 = new System.Windows.Forms.TreeNode("节点3"); System.Windows.Forms.TreeNode treeNode32 = new System.Windows.Forms.TreeNode("节点3");
this.uiComboTreeView3 = new Sunny.UI.UIComboTreeView(); this.uiComboTreeView3 = new Sunny.UI.UIComboTreeView();
this.uiComboTreeView4 = new Sunny.UI.UIComboTreeView(); this.uiComboTreeView4 = new Sunny.UI.UIComboTreeView();
this.uiComboTreeView2 = new Sunny.UI.UIComboTreeView(); this.uiComboTreeView2 = new Sunny.UI.UIComboTreeView();
@ -109,35 +109,35 @@ namespace Sunny.UI.Demo
this.uiComboTreeView3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiComboTreeView3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiComboTreeView3.MinimumSize = new System.Drawing.Size(63, 0); this.uiComboTreeView3.MinimumSize = new System.Drawing.Size(63, 0);
this.uiComboTreeView3.Name = "uiComboTreeView3"; this.uiComboTreeView3.Name = "uiComboTreeView3";
treeNode33.Name = "节点0"; treeNode1.Name = "节点0";
treeNode33.Text = "节点0"; treeNode1.Text = "节点0";
treeNode34.Name = "节点1"; treeNode2.Name = "节点1";
treeNode34.Text = "节点1"; treeNode2.Text = "节点1";
treeNode35.Name = "节点2"; treeNode3.Name = "节点2";
treeNode35.Text = "节点2"; treeNode3.Text = "节点2";
treeNode36.Name = "节点3"; treeNode4.Name = "节点3";
treeNode36.Text = "节点3"; treeNode4.Text = "节点3";
treeNode37.Name = "节点0"; treeNode5.Name = "节点0";
treeNode37.Text = "节点0"; treeNode5.Text = "节点0";
treeNode38.Name = "节点4"; treeNode6.Name = "节点4";
treeNode38.Text = "节点4"; treeNode6.Text = "节点4";
treeNode39.Name = "节点5"; treeNode7.Name = "节点5";
treeNode39.Text = "节点5"; treeNode7.Text = "节点5";
treeNode40.Name = "节点6"; treeNode8.Name = "节点6";
treeNode40.Text = "节点6"; treeNode8.Text = "节点6";
treeNode41.Name = "节点7"; treeNode9.Name = "节点7";
treeNode41.Text = "节点7"; treeNode9.Text = "节点7";
treeNode42.Name = "节点1"; treeNode10.Name = "节点1";
treeNode42.Text = "节点1"; treeNode10.Text = "节点1";
treeNode43.Name = "节点2"; treeNode11.Name = "节点2";
treeNode43.Text = "节点2"; treeNode11.Text = "节点2";
treeNode44.Name = "节点3"; treeNode12.Name = "节点3";
treeNode44.Text = "节点3"; treeNode12.Text = "节点3";
this.uiComboTreeView3.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { this.uiComboTreeView3.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
treeNode37, treeNode5,
treeNode42, treeNode10,
treeNode43, treeNode11,
treeNode44}); treeNode12});
this.uiComboTreeView3.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.uiComboTreeView3.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
this.uiComboTreeView3.ShowLines = true; this.uiComboTreeView3.ShowLines = true;
this.uiComboTreeView3.Size = new System.Drawing.Size(150, 29); this.uiComboTreeView3.Size = new System.Drawing.Size(150, 29);
@ -154,35 +154,35 @@ namespace Sunny.UI.Demo
this.uiComboTreeView4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiComboTreeView4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiComboTreeView4.MinimumSize = new System.Drawing.Size(63, 0); this.uiComboTreeView4.MinimumSize = new System.Drawing.Size(63, 0);
this.uiComboTreeView4.Name = "uiComboTreeView4"; this.uiComboTreeView4.Name = "uiComboTreeView4";
treeNode45.Name = "节点0"; treeNode13.Name = "节点0";
treeNode45.Text = "节点00"; treeNode13.Text = "节点00";
treeNode46.Name = "节点1"; treeNode14.Name = "节点1";
treeNode46.Text = "节点01"; treeNode14.Text = "节点01";
treeNode47.Name = "节点2"; treeNode15.Name = "节点2";
treeNode47.Text = "节点02"; treeNode15.Text = "节点02";
treeNode48.Name = "节点3"; treeNode16.Name = "节点3";
treeNode48.Text = "节点03"; treeNode16.Text = "节点03";
treeNode49.Name = "节点0"; treeNode17.Name = "节点0";
treeNode49.Text = "节点0"; treeNode17.Text = "节点0";
treeNode50.Name = "节点4"; treeNode18.Name = "节点4";
treeNode50.Text = "节点11"; treeNode18.Text = "节点11";
treeNode51.Name = "节点5"; treeNode19.Name = "节点5";
treeNode51.Text = "节点12"; treeNode19.Text = "节点12";
treeNode52.Name = "节点6"; treeNode20.Name = "节点6";
treeNode52.Text = "节点13"; treeNode20.Text = "节点13";
treeNode53.Name = "节点7"; treeNode21.Name = "节点7";
treeNode53.Text = "节点14"; treeNode21.Text = "节点14";
treeNode54.Name = "节点1"; treeNode22.Name = "节点1";
treeNode54.Text = "节点1"; treeNode22.Text = "节点1";
treeNode55.Name = "节点2"; treeNode23.Name = "节点2";
treeNode55.Text = "节点2"; treeNode23.Text = "节点2";
treeNode56.Name = "节点3"; treeNode24.Name = "节点3";
treeNode56.Text = "节点3"; treeNode24.Text = "节点3";
this.uiComboTreeView4.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { this.uiComboTreeView4.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
treeNode49, treeNode17,
treeNode54, treeNode22,
treeNode55, treeNode23,
treeNode56}); treeNode24});
this.uiComboTreeView4.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.uiComboTreeView4.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
this.uiComboTreeView4.ShowLines = true; this.uiComboTreeView4.ShowLines = true;
this.uiComboTreeView4.Size = new System.Drawing.Size(150, 29); this.uiComboTreeView4.Size = new System.Drawing.Size(150, 29);
@ -199,19 +199,19 @@ namespace Sunny.UI.Demo
this.uiComboTreeView2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiComboTreeView2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiComboTreeView2.MinimumSize = new System.Drawing.Size(63, 0); this.uiComboTreeView2.MinimumSize = new System.Drawing.Size(63, 0);
this.uiComboTreeView2.Name = "uiComboTreeView2"; this.uiComboTreeView2.Name = "uiComboTreeView2";
treeNode57.Name = "节点0"; treeNode25.Name = "节点0";
treeNode57.Text = "节点0"; treeNode25.Text = "节点0";
treeNode58.Name = "节点1"; treeNode26.Name = "节点1";
treeNode58.Text = "节点1"; treeNode26.Text = "节点1";
treeNode59.Name = "节点2"; treeNode27.Name = "节点2";
treeNode59.Text = "节点2"; treeNode27.Text = "节点2";
treeNode60.Name = "节点3"; treeNode28.Name = "节点3";
treeNode60.Text = "节点3"; treeNode28.Text = "节点3";
this.uiComboTreeView2.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { this.uiComboTreeView2.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
treeNode57, treeNode25,
treeNode58, treeNode26,
treeNode59, treeNode27,
treeNode60}); treeNode28});
this.uiComboTreeView2.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.uiComboTreeView2.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
this.uiComboTreeView2.Size = new System.Drawing.Size(150, 29); this.uiComboTreeView2.Size = new System.Drawing.Size(150, 29);
this.uiComboTreeView2.TabIndex = 65; this.uiComboTreeView2.TabIndex = 65;
@ -238,19 +238,19 @@ namespace Sunny.UI.Demo
this.uiComboTreeView1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiComboTreeView1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiComboTreeView1.MinimumSize = new System.Drawing.Size(63, 0); this.uiComboTreeView1.MinimumSize = new System.Drawing.Size(63, 0);
this.uiComboTreeView1.Name = "uiComboTreeView1"; this.uiComboTreeView1.Name = "uiComboTreeView1";
treeNode61.Name = "节点0"; treeNode29.Name = "节点0";
treeNode61.Text = "节点0"; treeNode29.Text = "节点0";
treeNode62.Name = "节点1"; treeNode30.Name = "节点1";
treeNode62.Text = "节点1"; treeNode30.Text = "节点1";
treeNode63.Name = "节点2"; treeNode31.Name = "节点2";
treeNode63.Text = "节点2"; treeNode31.Text = "节点2";
treeNode64.Name = "节点3"; treeNode32.Name = "节点3";
treeNode64.Text = "节点3"; treeNode32.Text = "节点3";
this.uiComboTreeView1.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { this.uiComboTreeView1.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
treeNode61, treeNode29,
treeNode62, treeNode30,
treeNode63, treeNode31,
treeNode64}); treeNode32});
this.uiComboTreeView1.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.uiComboTreeView1.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
this.uiComboTreeView1.Size = new System.Drawing.Size(150, 29); this.uiComboTreeView1.Size = new System.Drawing.Size(150, 29);
this.uiComboTreeView1.TabIndex = 63; this.uiComboTreeView1.TabIndex = 63;
@ -425,6 +425,8 @@ namespace Sunny.UI.Demo
this.uiComboBox1.MinimumSize = new System.Drawing.Size(63, 0); this.uiComboBox1.MinimumSize = new System.Drawing.Size(63, 0);
this.uiComboBox1.Name = "uiComboBox1"; this.uiComboBox1.Name = "uiComboBox1";
this.uiComboBox1.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.uiComboBox1.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
this.uiComboBox1.RadiusSides = Sunny.UI.UICornerRadiusSides.None;
this.uiComboBox1.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom;
this.uiComboBox1.Size = new System.Drawing.Size(150, 29); this.uiComboBox1.Size = new System.Drawing.Size(150, 29);
this.uiComboBox1.TabIndex = 52; this.uiComboBox1.TabIndex = 52;
this.uiComboBox1.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; this.uiComboBox1.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;

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

@ -293,7 +293,7 @@ namespace Sunny.UI
Color color = GetRectColor(); Color color = GetRectColor();
SizeF sf = g.GetFontImageSize(dropSymbol, 24); SizeF sf = g.GetFontImageSize(dropSymbol, 24);
g.DrawFontImage(dropSymbol, 24, color, Width - 28 + (12 - sf.Width / 2.0f), (Height - sf.Height) / 2.0f); g.DrawFontImage(dropSymbol, 24, color, Width - 28 + (12 - sf.Width / 2.0f), (Height - sf.Height) / 2.0f);
g.DrawLine(RectColor, Width - 1, Radius / 2, Width - 1, Height - Radius); //g.DrawLine(RectColor, Width - 1, Radius / 2, Width - 1, Height - Radius);
} }
protected override void OnGotFocus(EventArgs e) protected override void OnGotFocus(EventArgs e)