diff --git a/SunnyUI/Controls/DropItem/UIColorItem.cs b/SunnyUI/Controls/DropItem/UIColorItem.cs index beb65f88..f5f6f003 100644 --- a/SunnyUI/Controls/DropItem/UIColorItem.cs +++ b/SunnyUI/Controls/DropItem/UIColorItem.cs @@ -456,6 +456,7 @@ namespace Sunny.UI btnOK.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0); btnOK.Size = new Size(95, 26); btnOK.Style = UIStyle.Custom; + btnOK.SymbolOffset = new Point(0, 1); btnOK.TabIndex = 12; btnOK.Text = "确定"; btnOK.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); @@ -471,7 +472,8 @@ namespace Sunny.UI btnCancel.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0); btnCancel.Size = new Size(95, 26); btnCancel.Style = UIStyle.Custom; - btnCancel.Symbol = 61453; + btnCancel.Symbol = 361453; + btnCancel.SymbolOffset = new Point(0, 1); btnCancel.TabIndex = 13; btnCancel.Text = "取消"; btnCancel.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); diff --git a/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.cs b/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.cs index a36b31e9..d7d74a32 100644 --- a/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.cs +++ b/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.cs @@ -1,4 +1,4 @@ -/****************************************************************************** +/****************************************************************************** * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。 * CopyRight (C) 2012-2025 ShenYongHua(沈永华). * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com @@ -102,11 +102,11 @@ namespace Sunny.UI private void InitializeComponent() { - DataGridViewCellStyle dataGridViewCellStyle1 = new DataGridViewCellStyle(); - DataGridViewCellStyle dataGridViewCellStyle2 = new DataGridViewCellStyle(); - DataGridViewCellStyle dataGridViewCellStyle3 = new DataGridViewCellStyle(); - DataGridViewCellStyle dataGridViewCellStyle4 = new DataGridViewCellStyle(); - DataGridViewCellStyle dataGridViewCellStyle5 = new DataGridViewCellStyle(); + DataGridViewCellStyle dataGridViewCellStyle11 = new DataGridViewCellStyle(); + DataGridViewCellStyle dataGridViewCellStyle12 = new DataGridViewCellStyle(); + DataGridViewCellStyle dataGridViewCellStyle13 = new DataGridViewCellStyle(); + DataGridViewCellStyle dataGridViewCellStyle14 = new DataGridViewCellStyle(); + DataGridViewCellStyle dataGridViewCellStyle15 = new DataGridViewCellStyle(); panel = new UIPanel(); btnCancel = new UISymbolButton(); btnOK = new UISymbolButton(); @@ -159,9 +159,11 @@ namespace Sunny.UI btnCancel.Size = new System.Drawing.Size(80, 29); btnCancel.Style = UIStyle.Custom; btnCancel.StyleCustomMode = true; - btnCancel.Symbol = 61453; + btnCancel.Symbol = 361453; + btnCancel.SymbolOffset = new System.Drawing.Point(0, 1); btnCancel.TabIndex = 1; btnCancel.Text = "取消"; + btnCancel.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); btnCancel.Click += btnCancel_Click; // // btnOK @@ -173,33 +175,35 @@ namespace Sunny.UI btnOK.MinimumSize = new System.Drawing.Size(1, 1); btnOK.Name = "btnOK"; btnOK.Size = new System.Drawing.Size(80, 29); + btnOK.SymbolOffset = new System.Drawing.Point(0, 1); btnOK.TabIndex = 0; btnOK.Text = "确定"; + btnOK.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); btnOK.Click += btnOK_Click; // // dataGridView // - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(243, 249, 255); - dataGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(243, 249, 255); + dataGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11; dataGridView.BackgroundColor = System.Drawing.Color.FromArgb(243, 249, 255); dataGridView.ColumnHeadersBorderStyle = DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle2.Alignment = DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(80, 160, 255); - 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; - dataGridViewCellStyle2.WrapMode = DataGridViewTriState.True; - dataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle12.Alignment = DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(80, 160, 255); + dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 12F); + dataGridViewCellStyle12.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.FromArgb(80, 160, 255); + dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle12.WrapMode = DataGridViewTriState.True; + dataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle3.Alignment = DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.White; - 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); - dataGridViewCellStyle3.WrapMode = DataGridViewTriState.False; - dataGridView.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle13.Alignment = DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle13.BackColor = System.Drawing.Color.White; + dataGridViewCellStyle13.Font = new System.Drawing.Font("宋体", 12F); + dataGridViewCellStyle13.ForeColor = System.Drawing.Color.FromArgb(48, 48, 48); + dataGridViewCellStyle13.SelectionBackColor = System.Drawing.Color.FromArgb(220, 236, 255); + dataGridViewCellStyle13.SelectionForeColor = System.Drawing.Color.FromArgb(48, 48, 48); + dataGridViewCellStyle13.WrapMode = DataGridViewTriState.False; + dataGridView.DefaultCellStyle = dataGridViewCellStyle13; dataGridView.Dock = DockStyle.Fill; dataGridView.EnableHeadersVisualStyles = false; dataGridView.Font = new System.Drawing.Font("宋体", 12F); @@ -207,19 +211,19 @@ namespace Sunny.UI 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); - 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); - dataGridViewCellStyle4.WrapMode = DataGridViewTriState.True; - dataGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; - dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(48, 48, 48); - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.FromArgb(220, 236, 255); - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(48, 48, 48); - dataGridView.RowsDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle14.Alignment = DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(243, 249, 255); + dataGridViewCellStyle14.Font = new System.Drawing.Font("宋体", 12F); + dataGridViewCellStyle14.ForeColor = System.Drawing.Color.FromArgb(48, 48, 48); + dataGridViewCellStyle14.SelectionBackColor = System.Drawing.Color.FromArgb(80, 160, 255); + dataGridViewCellStyle14.SelectionForeColor = System.Drawing.Color.FromArgb(48, 48, 48); + dataGridViewCellStyle14.WrapMode = DataGridViewTriState.True; + dataGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle14; + dataGridViewCellStyle15.BackColor = System.Drawing.Color.White; + dataGridViewCellStyle15.ForeColor = System.Drawing.Color.FromArgb(48, 48, 48); + dataGridViewCellStyle15.SelectionBackColor = System.Drawing.Color.FromArgb(220, 236, 255); + dataGridViewCellStyle15.SelectionForeColor = System.Drawing.Color.FromArgb(48, 48, 48); + dataGridView.RowsDefaultCellStyle = dataGridViewCellStyle15; dataGridView.SelectedIndex = -1; dataGridView.Size = new System.Drawing.Size(569, 245); dataGridView.TabIndex = 3; @@ -252,10 +256,12 @@ namespace Sunny.UI btnClear.MinimumSize = new System.Drawing.Size(1, 1); btnClear.Name = "btnClear"; btnClear.Size = new System.Drawing.Size(80, 29); - btnClear.Symbol = 61666; + btnClear.Symbol = 361666; + btnClear.SymbolOffset = new System.Drawing.Point(0, 1); btnClear.SymbolSize = 22; btnClear.TabIndex = 2; btnClear.Text = "清除"; + btnClear.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); btnClear.Click += btnClear_Click; // // btnSearch @@ -267,9 +273,11 @@ namespace Sunny.UI btnSearch.MinimumSize = new System.Drawing.Size(1, 1); btnSearch.Name = "btnSearch"; btnSearch.Size = new System.Drawing.Size(80, 29); - btnSearch.Symbol = 61442; + btnSearch.Symbol = 361442; + btnSearch.SymbolOffset = new System.Drawing.Point(0, 1); btnSearch.TabIndex = 1; btnSearch.Text = "搜索"; + btnSearch.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); btnSearch.Click += btnSearch_Click; // // edtFilter diff --git a/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.resx b/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.resx index af32865e..8b2ff64a 100644 --- a/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.resx +++ b/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.resx @@ -1,7 +1,7 @@