diff --git a/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.cs b/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.cs
index d80d7eaa..2be01c97 100644
--- a/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.cs
+++ b/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.cs
@@ -125,7 +125,7 @@ namespace Sunny.UI
panel.Controls.Add(btnCancel);
panel.Controls.Add(btnOK);
panel.Dock = DockStyle.Bottom;
- panel.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
+ panel.Font = new System.Drawing.Font("宋体", 12F);
panel.Location = new System.Drawing.Point(0, 289);
panel.Margin = new Padding(4, 5, 4, 5);
panel.MinimumSize = new System.Drawing.Size(1, 1);
@@ -147,7 +147,8 @@ namespace Sunny.UI
btnCancel.FillHoverColor = System.Drawing.Color.FromArgb(235, 115, 115);
btnCancel.FillPressColor = System.Drawing.Color.FromArgb(184, 64, 64);
btnCancel.FillSelectedColor = System.Drawing.Color.FromArgb(184, 64, 64);
- btnCancel.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
+ btnCancel.Font = new System.Drawing.Font("宋体", 10.5F);
+ btnCancel.LightColor = System.Drawing.Color.FromArgb(253, 243, 243);
btnCancel.Location = new System.Drawing.Point(478, 8);
btnCancel.MinimumSize = new System.Drawing.Size(1, 1);
btnCancel.Name = "btnCancel";
@@ -156,26 +157,24 @@ namespace Sunny.UI
btnCancel.RectPressColor = System.Drawing.Color.FromArgb(184, 64, 64);
btnCancel.RectSelectedColor = System.Drawing.Color.FromArgb(184, 64, 64);
btnCancel.Size = new System.Drawing.Size(80, 29);
- btnCancel.Style = UIStyle.Red;
+ btnCancel.Style = UIStyle.Custom;
btnCancel.StyleCustomMode = true;
btnCancel.Symbol = 61453;
btnCancel.TabIndex = 1;
btnCancel.Text = "取消";
- btnCancel.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
btnCancel.Click += btnCancel_Click;
//
// btnOK
//
btnOK.Anchor = AnchorStyles.Top | AnchorStyles.Right;
btnOK.Cursor = Cursors.Hand;
- btnOK.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
+ btnOK.Font = new System.Drawing.Font("宋体", 10.5F);
btnOK.Location = new System.Drawing.Point(389, 8);
btnOK.MinimumSize = new System.Drawing.Size(1, 1);
btnOK.Name = "btnOK";
btnOK.Size = new System.Drawing.Size(80, 29);
btnOK.TabIndex = 0;
btnOK.Text = "确定";
- btnOK.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
btnOK.Click += btnOK_Click;
//
// dataGridView
@@ -186,7 +185,7 @@ namespace Sunny.UI
dataGridView.ColumnHeadersBorderStyle = DataGridViewHeaderBorderStyle.Single;
dataGridViewCellStyle2.Alignment = DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(80, 160, 255);
- dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
+ dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 12F);
dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(80, 160, 255);
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
@@ -195,7 +194,7 @@ namespace Sunny.UI
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridViewCellStyle3.Alignment = DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle3.BackColor = System.Drawing.Color.White;
- dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
+ dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 12F);
dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(48, 48, 48);
dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(220, 236, 255);
dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(48, 48, 48);
@@ -203,14 +202,14 @@ namespace Sunny.UI
dataGridView.DefaultCellStyle = dataGridViewCellStyle3;
dataGridView.Dock = DockStyle.Fill;
dataGridView.EnableHeadersVisualStyles = false;
- dataGridView.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
+ dataGridView.Font = new System.Drawing.Font("宋体", 12F);
dataGridView.GridColor = System.Drawing.Color.FromArgb(104, 173, 255);
dataGridView.Location = new System.Drawing.Point(0, 44);
dataGridView.MultiSelect = false;
dataGridView.Name = "dataGridView";
dataGridViewCellStyle4.Alignment = DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(243, 249, 255);
- dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
+ dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 12F);
dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(48, 48, 48);
dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(80, 160, 255);
dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.FromArgb(48, 48, 48);
@@ -221,8 +220,6 @@ namespace Sunny.UI
dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.FromArgb(220, 236, 255);
dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(48, 48, 48);
dataGridView.RowsDefaultCellStyle = dataGridViewCellStyle5;
- dataGridView.RowTemplate.Height = 25;
- dataGridView.ScrollBarRectColor = System.Drawing.Color.FromArgb(80, 160, 255);
dataGridView.SelectedIndex = -1;
dataGridView.Size = new System.Drawing.Size(569, 245);
dataGridView.TabIndex = 3;
@@ -234,7 +231,7 @@ namespace Sunny.UI
pFilter.Controls.Add(btnSearch);
pFilter.Controls.Add(edtFilter);
pFilter.Dock = DockStyle.Top;
- pFilter.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
+ pFilter.Font = new System.Drawing.Font("宋体", 12F);
pFilter.Location = new System.Drawing.Point(0, 0);
pFilter.Margin = new Padding(4, 5, 4, 5);
pFilter.MinimumSize = new System.Drawing.Size(1, 1);
@@ -250,7 +247,7 @@ namespace Sunny.UI
//
btnClear.Anchor = AnchorStyles.Top | AnchorStyles.Right;
btnClear.Cursor = Cursors.Hand;
- btnClear.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
+ btnClear.Font = new System.Drawing.Font("宋体", 10.5F);
btnClear.Location = new System.Drawing.Point(478, 8);
btnClear.MinimumSize = new System.Drawing.Size(1, 1);
btnClear.Name = "btnClear";
@@ -259,14 +256,13 @@ namespace Sunny.UI
btnClear.SymbolSize = 22;
btnClear.TabIndex = 2;
btnClear.Text = "清除";
- btnClear.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
btnClear.Click += btnClear_Click;
//
// btnSearch
//
btnSearch.Anchor = AnchorStyles.Top | AnchorStyles.Right;
btnSearch.Cursor = Cursors.Hand;
- btnSearch.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
+ btnSearch.Font = new System.Drawing.Font("宋体", 10.5F);
btnSearch.Location = new System.Drawing.Point(389, 8);
btnSearch.MinimumSize = new System.Drawing.Size(1, 1);
btnSearch.Name = "btnSearch";
@@ -274,7 +270,6 @@ namespace Sunny.UI
btnSearch.Symbol = 61442;
btnSearch.TabIndex = 1;
btnSearch.Text = "搜索";
- btnSearch.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
btnSearch.Click += btnSearch_Click;
//
// edtFilter
@@ -282,7 +277,7 @@ namespace Sunny.UI
edtFilter.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
edtFilter.ButtonSymbolOffset = new System.Drawing.Point(0, 0);
edtFilter.Cursor = Cursors.IBeam;
- edtFilter.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
+ edtFilter.Font = new System.Drawing.Font("宋体", 10.5F);
edtFilter.Location = new System.Drawing.Point(17, 10);
edtFilter.Margin = new Padding(4, 5, 4, 5);
edtFilter.MinimumSize = new System.Drawing.Size(1, 16);
diff --git a/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.resx b/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.resx
index a395bffc..af32865e 100644
--- a/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.resx
+++ b/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.resx
@@ -18,7 +18,7 @@
System.Resources.ResXResourceReader, System.Windows.Forms, ...
System.Resources.ResXResourceWriter, System.Windows.Forms, ...
this is my long stringthis is a comment
- Blue
+ Blue
[base64 mime encoded serialized .NET Framework object]
diff --git a/SunnyUI/Controls/DropItem/UIComboTreeViewItem.cs b/SunnyUI/Controls/DropItem/UIComboTreeViewItem.cs
index dc3e079e..7477b638 100644
--- a/SunnyUI/Controls/DropItem/UIComboTreeViewItem.cs
+++ b/SunnyUI/Controls/DropItem/UIComboTreeViewItem.cs
@@ -78,7 +78,6 @@ namespace Sunny.UI
treeView.MinimumSize = new System.Drawing.Size(1, 1);
treeView.Name = "treeView";
treeView.RadiusSides = UICornerRadiusSides.None;
- treeView.ScrollBarStyleInherited = false;
treeView.ShowText = false;
treeView.Size = new System.Drawing.Size(250, 176);
treeView.TabIndex = 0;