diff --git a/Bin/Debug/CommonControls/.NET4 示例/Itrycn_Project.exe b/Bin/Debug/CommonControls/.NET4 示例/Itrycn_Project.exe index 87c4bed..7576e2e 100644 Binary files a/Bin/Debug/CommonControls/.NET4 示例/Itrycn_Project.exe and b/Bin/Debug/CommonControls/.NET4 示例/Itrycn_Project.exe differ diff --git a/Bin/Debug/CommonControls/.NET4 示例/Itrycn_Project2.exe b/Bin/Debug/CommonControls/.NET4 示例/Itrycn_Project2.exe index 2d0fe54..03613f1 100644 Binary files a/Bin/Debug/CommonControls/.NET4 示例/Itrycn_Project2.exe and b/Bin/Debug/CommonControls/.NET4 示例/Itrycn_Project2.exe differ diff --git a/Bin/Debug/CommonControls/.NET4 示例/MyDb.dll b/Bin/Debug/CommonControls/.NET4 示例/MyDb.dll index 20affa9..573be85 100644 Binary files a/Bin/Debug/CommonControls/.NET4 示例/MyDb.dll and b/Bin/Debug/CommonControls/.NET4 示例/MyDb.dll differ diff --git a/Bin/Debug/CommonControls/.NET4 示例/MyDb_SQLite.dll b/Bin/Debug/CommonControls/.NET4 示例/MyDb_SQLite.dll index a99e192..0d39ed8 100644 Binary files a/Bin/Debug/CommonControls/.NET4 示例/MyDb_SQLite.dll and b/Bin/Debug/CommonControls/.NET4 示例/MyDb_SQLite.dll differ diff --git a/Bin/Debug/CommonControls/.NET4 示例/RyPrint.dll b/Bin/Debug/CommonControls/.NET4 示例/RyPrint.dll index 1620912..3b59629 100644 Binary files a/Bin/Debug/CommonControls/.NET4 示例/RyPrint.dll and b/Bin/Debug/CommonControls/.NET4 示例/RyPrint.dll differ diff --git a/Bin/Debug/CommonControls/.NET4 示例/RyWeb.dll b/Bin/Debug/CommonControls/.NET4 示例/RyWeb.dll index f6d810a..1bbfac1 100644 Binary files a/Bin/Debug/CommonControls/.NET4 示例/RyWeb.dll and b/Bin/Debug/CommonControls/.NET4 示例/RyWeb.dll differ diff --git a/Bin/Debug/CommonControls/.NET4 示例/UserDb/Win.dat b/Bin/Debug/CommonControls/.NET4 示例/UserDb/Win.dat index c97611e..45c266f 100644 --- a/Bin/Debug/CommonControls/.NET4 示例/UserDb/Win.dat +++ b/Bin/Debug/CommonControls/.NET4 示例/UserDb/Win.dat @@ -1,2 +1,2 @@ [Money_Op] -hwnd=2562494 +hwnd=397838 diff --git a/Bin/Debug/CommonControls/.NET4 示例/cUpdate.dat b/Bin/Debug/CommonControls/.NET4 示例/cUpdate.dat index b009344..9fe0360 100644 --- a/Bin/Debug/CommonControls/.NET4 示例/cUpdate.dat +++ b/Bin/Debug/CommonControls/.NET4 示例/cUpdate.dat @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/Bin/Debug/CommonControls/.NET4 示例/ryControls.dll b/Bin/Debug/CommonControls/.NET4 示例/ryControls.dll index 4cf6803..12b2ffb 100644 Binary files a/Bin/Debug/CommonControls/.NET4 示例/ryControls.dll and b/Bin/Debug/CommonControls/.NET4 示例/ryControls.dll differ diff --git a/Bin/Debug/CommonControls/.NET4 示例/ryControls.xml b/Bin/Debug/CommonControls/.NET4 示例/ryControls.xml index 6f16ded..2efb282 100644 --- a/Bin/Debug/CommonControls/.NET4 示例/ryControls.xml +++ b/Bin/Debug/CommonControls/.NET4 示例/ryControls.xml @@ -1769,6 +1769,11 @@ 按钮基础背景色 + + + 按钮圆角部分背景颜色 + + @@ -1873,6 +1878,11 @@ 字体颜色 + + + 是否颜色渐变 + + 类说明：帮助类 diff --git a/Bin/Debug/CommonControls/.NET4 示例/ryUpdate.dll b/Bin/Debug/CommonControls/.NET4 示例/ryUpdate.dll index b0c2da2..d74b599 100644 Binary files a/Bin/Debug/CommonControls/.NET4 示例/ryUpdate.dll and b/Bin/Debug/CommonControls/.NET4 示例/ryUpdate.dll differ diff --git a/Bin/Debug/CommonControls/.NET4/MyDb.dll b/Bin/Debug/CommonControls/.NET4/MyDb.dll index 20affa9..573be85 100644 Binary files a/Bin/Debug/CommonControls/.NET4/MyDb.dll and b/Bin/Debug/CommonControls/.NET4/MyDb.dll differ diff --git a/Bin/Debug/CommonControls/.NET4/MyDb_MSSQL.dll b/Bin/Debug/CommonControls/.NET4/MyDb_MSSQL.dll index c0a5756..a82bc6a 100644 Binary files a/Bin/Debug/CommonControls/.NET4/MyDb_MSSQL.dll and b/Bin/Debug/CommonControls/.NET4/MyDb_MSSQL.dll differ diff --git a/Bin/Debug/CommonControls/.NET4/MyDb_MySQL.dll b/Bin/Debug/CommonControls/.NET4/MyDb_MySQL.dll index 6d26184..bcacbaf 100644 Binary files a/Bin/Debug/CommonControls/.NET4/MyDb_MySQL.dll and b/Bin/Debug/CommonControls/.NET4/MyDb_MySQL.dll differ diff --git a/Bin/Debug/CommonControls/.NET4/MyDb_SQLite.dll b/Bin/Debug/CommonControls/.NET4/MyDb_SQLite.dll index a99e192..0d39ed8 100644 Binary files a/Bin/Debug/CommonControls/.NET4/MyDb_SQLite.dll and b/Bin/Debug/CommonControls/.NET4/MyDb_SQLite.dll differ diff --git a/Bin/Debug/CommonControls/.NET4/RyPrint.dll b/Bin/Debug/CommonControls/.NET4/RyPrint.dll index 1620912..3b59629 100644 Binary files a/Bin/Debug/CommonControls/.NET4/RyPrint.dll and b/Bin/Debug/CommonControls/.NET4/RyPrint.dll differ diff --git a/Bin/Debug/CommonControls/.NET4/RyWeb.dll b/Bin/Debug/CommonControls/.NET4/RyWeb.dll index 486873b..6b15bdc 100644 Binary files a/Bin/Debug/CommonControls/.NET4/RyWeb.dll and b/Bin/Debug/CommonControls/.NET4/RyWeb.dll differ diff --git a/Bin/Debug/CommonControls/.NET4/ryControls.dll b/Bin/Debug/CommonControls/.NET4/ryControls.dll index 4cf6803..12b2ffb 100644 Binary files a/Bin/Debug/CommonControls/.NET4/ryControls.dll and b/Bin/Debug/CommonControls/.NET4/ryControls.dll differ diff --git a/Bin/Debug/CommonControls/.NET4/ryControls.xml b/Bin/Debug/CommonControls/.NET4/ryControls.xml index 6f16ded..2efb282 100644 --- a/Bin/Debug/CommonControls/.NET4/ryControls.xml +++ b/Bin/Debug/CommonControls/.NET4/ryControls.xml @@ -1769,6 +1769,11 @@ 按钮基础背景色 + + + 按钮圆角部分背景颜色 + + @@ -1873,6 +1878,11 @@ 字体颜色 + + + 是否颜色渐变 + + 类说明：帮助类 diff --git a/Bin/Debug/CommonControls/.NET4/ryUpdate.dll b/Bin/Debug/CommonControls/.NET4/ryUpdate.dll index b0c2da2..d74b599 100644 Binary files a/Bin/Debug/CommonControls/.NET4/ryUpdate.dll and b/Bin/Debug/CommonControls/.NET4/ryUpdate.dll differ diff --git a/Bin/Release/CommonControls/.NET4 示例/Itrycn_Project.exe b/Bin/Release/CommonControls/.NET4 示例/Itrycn_Project.exe index 0bf19d8..dfd3f66 100644 Binary files a/Bin/Release/CommonControls/.NET4 示例/Itrycn_Project.exe and b/Bin/Release/CommonControls/.NET4 示例/Itrycn_Project.exe differ diff --git a/Bin/Release/CommonControls/.NET4 示例/MyDb.dll b/Bin/Release/CommonControls/.NET4 示例/MyDb.dll index 716755b..63095e1 100644 Binary files a/Bin/Release/CommonControls/.NET4 示例/MyDb.dll and b/Bin/Release/CommonControls/.NET4 示例/MyDb.dll differ diff --git a/Bin/Release/CommonControls/.NET4 示例/MyDb_SQLite.dll b/Bin/Release/CommonControls/.NET4 示例/MyDb_SQLite.dll index 91ab9c9..a4ce395 100644 Binary files a/Bin/Release/CommonControls/.NET4 示例/MyDb_SQLite.dll and b/Bin/Release/CommonControls/.NET4 示例/MyDb_SQLite.dll differ diff --git a/Bin/Release/CommonControls/.NET4 示例/RyPrint.dll b/Bin/Release/CommonControls/.NET4 示例/RyPrint.dll index 70fa08b..f880c28 100644 Binary files a/Bin/Release/CommonControls/.NET4 示例/RyPrint.dll and b/Bin/Release/CommonControls/.NET4 示例/RyPrint.dll differ diff --git a/Bin/Release/CommonControls/.NET4 示例/RyWeb.dll b/Bin/Release/CommonControls/.NET4 示例/RyWeb.dll index f6d810a..1bbfac1 100644 Binary files a/Bin/Release/CommonControls/.NET4 示例/RyWeb.dll and b/Bin/Release/CommonControls/.NET4 示例/RyWeb.dll differ diff --git a/Bin/Release/CommonControls/.NET4 示例/ryControls.dll b/Bin/Release/CommonControls/.NET4 示例/ryControls.dll index a2b8852..fb36f08 100644 Binary files a/Bin/Release/CommonControls/.NET4 示例/ryControls.dll and b/Bin/Release/CommonControls/.NET4 示例/ryControls.dll differ diff --git a/Bin/Release/CommonControls/.NET4 示例/ryControls.xml b/Bin/Release/CommonControls/.NET4 示例/ryControls.xml index 6f16ded..2efb282 100644 --- a/Bin/Release/CommonControls/.NET4 示例/ryControls.xml +++ b/Bin/Release/CommonControls/.NET4 示例/ryControls.xml @@ -1769,6 +1769,11 @@ 按钮基础背景色 + + + 按钮圆角部分背景颜色 + + @@ -1873,6 +1878,11 @@ 字体颜色 + + + 是否颜色渐变 + + 类说明：帮助类 diff --git a/Bin/Release/CommonControls/.NET4 示例/ryUpdate.dll b/Bin/Release/CommonControls/.NET4 示例/ryUpdate.dll index c5773f7..89f9eef 100644 Binary files a/Bin/Release/CommonControls/.NET4 示例/ryUpdate.dll and b/Bin/Release/CommonControls/.NET4 示例/ryUpdate.dll differ diff --git a/Bin/Release/CommonControls/.NET4/MyDb.dll b/Bin/Release/CommonControls/.NET4/MyDb.dll index 716755b..63095e1 100644 Binary files a/Bin/Release/CommonControls/.NET4/MyDb.dll and b/Bin/Release/CommonControls/.NET4/MyDb.dll differ diff --git a/Bin/Release/CommonControls/.NET4/MyDb_MSSQL.dll b/Bin/Release/CommonControls/.NET4/MyDb_MSSQL.dll index b4403d7..7a984fa 100644 Binary files a/Bin/Release/CommonControls/.NET4/MyDb_MSSQL.dll and b/Bin/Release/CommonControls/.NET4/MyDb_MSSQL.dll differ diff --git a/Bin/Release/CommonControls/.NET4/MyDb_MySQL.dll b/Bin/Release/CommonControls/.NET4/MyDb_MySQL.dll index 07c6248..5699718 100644 Binary files a/Bin/Release/CommonControls/.NET4/MyDb_MySQL.dll and b/Bin/Release/CommonControls/.NET4/MyDb_MySQL.dll differ diff --git a/Bin/Release/CommonControls/.NET4/MyDb_SQLite.dll b/Bin/Release/CommonControls/.NET4/MyDb_SQLite.dll index 91ab9c9..a4ce395 100644 Binary files a/Bin/Release/CommonControls/.NET4/MyDb_SQLite.dll and b/Bin/Release/CommonControls/.NET4/MyDb_SQLite.dll differ diff --git a/Bin/Release/CommonControls/.NET4/RyPrint.dll b/Bin/Release/CommonControls/.NET4/RyPrint.dll index 70fa08b..f880c28 100644 Binary files a/Bin/Release/CommonControls/.NET4/RyPrint.dll and b/Bin/Release/CommonControls/.NET4/RyPrint.dll differ diff --git a/Bin/Release/CommonControls/.NET4/RyWeb.dll b/Bin/Release/CommonControls/.NET4/RyWeb.dll index 39ae469..2fb8d07 100644 Binary files a/Bin/Release/CommonControls/.NET4/RyWeb.dll and b/Bin/Release/CommonControls/.NET4/RyWeb.dll differ diff --git a/Bin/Release/CommonControls/.NET4/ryControls.dll b/Bin/Release/CommonControls/.NET4/ryControls.dll index a2b8852..fb36f08 100644 Binary files a/Bin/Release/CommonControls/.NET4/ryControls.dll and b/Bin/Release/CommonControls/.NET4/ryControls.dll differ diff --git a/Bin/Release/CommonControls/.NET4/ryControls.xml b/Bin/Release/CommonControls/.NET4/ryControls.xml index 6f16ded..2efb282 100644 --- a/Bin/Release/CommonControls/.NET4/ryControls.xml +++ b/Bin/Release/CommonControls/.NET4/ryControls.xml @@ -1769,6 +1769,11 @@ 按钮基础背景色 + + + 按钮圆角部分背景颜色 + + @@ -1873,6 +1878,11 @@ 字体颜色 + + + 是否颜色渐变 + + 类说明：帮助类 diff --git a/Bin/Release/CommonControls/.NET4/ryUpdate.dll b/Bin/Release/CommonControls/.NET4/ryUpdate.dll index c5773f7..89f9eef 100644 Binary files a/Bin/Release/CommonControls/.NET4/ryUpdate.dll and b/Bin/Release/CommonControls/.NET4/ryUpdate.dll differ diff --git a/CHANGELOG.md b/CHANGELOG.md index a0f37eb..fb151a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,13 @@ -### 2021-02-22更新 +### 2021-02-27更新 +------ +#### ryControls V2.1.2102.2701 +- *.[新增]按钮的渐变属性支持全局定义。 +- *.[修复]修复Gdu.WinformUI在开发环境中重新编译会导致窗体变大的BUG。 + +### 2021-02-22更新 ------ #### ryControls V2.1.2102.2201 -*.[新增]新加入Gdu.WinformUI控件。 +- *.[新增]新加入Gdu.WinformUI控件。 ### 2021-02-11更新 ------ diff --git a/Source/.vs/公用控件组V4/v16/.suo b/Source/.vs/公用控件组V4/v16/.suo index b78dcb7..1beaa46 100644 Binary files a/Source/.vs/公用控件组V4/v16/.suo and b/Source/.vs/公用控件组V4/v16/.suo differ diff --git a/Source/Itrycn_Project2/FrmStart.Designer.cs b/Source/Itrycn_Project2/FrmStart.Designer.cs index e8c963b..70ee1b8 100644 --- a/Source/Itrycn_Project2/FrmStart.Designer.cs +++ b/Source/Itrycn_Project2/FrmStart.Designer.cs @@ -55,14 +55,17 @@ this.捐助ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.chromeTabControl1 = new ryControls.ChromeTabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); + this.rySearch1 = new ryControls.rySearch(); + this.textBox1 = new System.Windows.Forms.TextBox(); this.button2 = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button(); this.iconViewEx1 = new ryControls.IconViewEx(); - this.textBox1 = new System.Windows.Forms.TextBox(); + this.panel1 = new System.Windows.Forms.Panel(); this.MenuTray.SuspendLayout(); this.menuStrip1.SuspendLayout(); this.chromeTabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); + this.panel1.SuspendLayout(); this.SuspendLayout(); // // notifyIcon1 @@ -149,6 +152,7 @@ // // tabPage1 // + this.tabPage1.Controls.Add(this.panel1); this.tabPage1.Controls.Add(this.textBox1); this.tabPage1.Controls.Add(this.button2); this.tabPage1.Controls.Add(this.button1); @@ -161,6 +165,22 @@ this.tabPage1.Text = "首页"; this.tabPage1.UseVisualStyleBackColor = true; // + // rySearch1 + // + this.rySearch1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(239)))), ((int)(((byte)(244))))); + this.rySearch1.EmptyText = ""; + this.rySearch1.Location = new System.Drawing.Point(25, 61); + this.rySearch1.Name = "rySearch1"; + this.rySearch1.Size = new System.Drawing.Size(261, 41); + this.rySearch1.TabIndex = 4; + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(447, 45); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(275, 21); + this.textBox1.TabIndex = 3; + // // button2 // this.button2.Location = new System.Drawing.Point(276, 31); @@ -203,7 +223,7 @@ listViewItem11, listViewItem12, listViewItem13}); - this.iconViewEx1.Location = new System.Drawing.Point(161, 88); + this.iconViewEx1.Location = new System.Drawing.Point(142, 107); this.iconViewEx1.MultiSelect = false; this.iconViewEx1.Name = "iconViewEx1"; this.iconViewEx1.OwnerDraw = true; @@ -218,12 +238,14 @@ this.iconViewEx1.UseCompatibleStateImageBehavior = false; this.iconViewEx1.View = System.Windows.Forms.View.Tile; // - // textBox1 + // panel1 // - this.textBox1.Location = new System.Drawing.Point(447, 45); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(275, 21); - this.textBox1.TabIndex = 3; + this.panel1.BackColor = System.Drawing.Color.Gainsboro; + this.panel1.Controls.Add(this.rySearch1); + this.panel1.Location = new System.Drawing.Point(73, 163); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(388, 237); + this.panel1.TabIndex = 5; // // FrmStart // @@ -244,6 +266,7 @@ this.chromeTabControl1.ResumeLayout(false); this.tabPage1.ResumeLayout(false); this.tabPage1.PerformLayout(); + this.panel1.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -265,5 +288,7 @@ private System.Windows.Forms.Button button1; private System.Windows.Forms.Button button2; private System.Windows.Forms.TextBox textBox1; + private ryControls.rySearch rySearch1; + private System.Windows.Forms.Panel panel1; } } \ No newline at end of file diff --git a/Source/MyDb/bin/x86/Debug/MyDb.dll b/Source/MyDb/bin/x86/Debug/MyDb.dll index dfdc566..92db6b7 100644 Binary files a/Source/MyDb/bin/x86/Debug/MyDb.dll and b/Source/MyDb/bin/x86/Debug/MyDb.dll differ diff --git a/Source/MyDb/bin/x86/Release/MyDb.dll b/Source/MyDb/bin/x86/Release/MyDb.dll index 0d2b348..abeb075 100644 Binary files a/Source/MyDb/bin/x86/Release/MyDb.dll and b/Source/MyDb/bin/x86/Release/MyDb.dll differ diff --git a/Source/ryControls/Controls/ButtonEX.cs b/Source/ryControls/Controls/ButtonEX.cs index ba3b6d2..66dea90 100644 --- a/Source/ryControls/Controls/ButtonEX.cs +++ b/Source/ryControls/Controls/ButtonEX.cs @@ -240,7 +240,14 @@ namespace ryControls [Description("背景色是否渐变")] public bool ColorGradient { - get { return _ColorGradient; } + get + { + if (SkinCommon.UseDefSkin && UseDefSkin) + { + return SkinCommon.ButtonSkin.ColorGradient; + } + return _ColorGradient; + } set { if (value != _ColorGradient) diff --git a/Source/ryControls/Controls/SkinCommon.cs b/Source/ryControls/Controls/SkinCommon.cs index b59d4d8..bd0b1de 100644 --- a/Source/ryControls/Controls/SkinCommon.cs +++ b/Source/ryControls/Controls/SkinCommon.cs @@ -33,5 +33,9 @@ namespace ryControls.Skin /// 字体颜色 /// public Color ForeColor = Color.White; + /// + /// 是否颜色渐变 + /// + public bool ColorGradient = false; } } diff --git a/Source/ryControls/Controls/rySearch.Designer.cs b/Source/ryControls/Controls/rySearch.Designer.cs index 689b144..8a27a76 100644 --- a/Source/ryControls/Controls/rySearch.Designer.cs +++ b/Source/ryControls/Controls/rySearch.Designer.cs @@ -33,7 +33,9 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(rySearch)); this.txtSearch = new System.Windows.Forms.TextBox(); + this.panel1 = new System.Windows.Forms.Panel(); this.btnSearch = new ryControls.ButtonEx(); + this.panel1.SuspendLayout(); this.SuspendLayout(); // // txtSearch @@ -57,19 +59,28 @@ this.txtSearch.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TxtSearch_KeyDown); this.txtSearch.Leave += new System.EventHandler(this.TxtSearch_Leave); // + // panel1 + // + this.panel1.Controls.Add(this.btnSearch); + this.panel1.Dock = System.Windows.Forms.DockStyle.Right; + this.panel1.Location = new System.Drawing.Point(245, 0); + this.panel1.Margin = new System.Windows.Forms.Padding(0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(37, 30); + this.panel1.TabIndex = 5; + // // btnSearch // - this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Right))); this.btnSearch.BaseColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(76)))), ((int)(((byte)(95))))); + this.btnSearch.Dock = System.Windows.Forms.DockStyle.Fill; this.btnSearch.Image = ((System.Drawing.Image)(resources.GetObject("btnSearch.Image"))); this.btnSearch.ImageHeight = 14; this.btnSearch.ImageWidth = 14; - this.btnSearch.Location = new System.Drawing.Point(246, 4); + this.btnSearch.Location = new System.Drawing.Point(0, 0); this.btnSearch.Name = "btnSearch"; this.btnSearch.Radius = 12; this.btnSearch.RoundStyle = ryControls.RoundStyle.Right; - this.btnSearch.Size = new System.Drawing.Size(36, 23); + this.btnSearch.Size = new System.Drawing.Size(37, 30); this.btnSearch.SpliteButtonWidth = 0; this.btnSearch.TabIndex = 4; this.btnSearch.TabStop = false; @@ -81,7 +92,7 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(239)))), ((int)(((byte)(244))))); - this.Controls.Add(this.btnSearch); + this.Controls.Add(this.panel1); this.Controls.Add(this.txtSearch); this.Name = "rySearch"; this.Size = new System.Drawing.Size(282, 30); @@ -92,6 +103,7 @@ this.Leave += new System.EventHandler(this.RySearch_Leave); this.Resize += new System.EventHandler(this.RySearch_Resize); this.ImeModeChanged += new System.EventHandler(this.RySearch_ImeModeChanged); + this.panel1.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -100,6 +112,7 @@ #endregion private ButtonEx btnSearch; - private System.Windows.Forms.TextBox txtSearch; + private System.Windows.Forms.TextBox txtSearch; + private System.Windows.Forms.Panel panel1; } } diff --git a/Source/ryControls/Controls/rySearch.cs b/Source/ryControls/Controls/rySearch.cs index 46c86e5..678d9f4 100644 --- a/Source/ryControls/Controls/rySearch.cs +++ b/Source/ryControls/Controls/rySearch.cs @@ -8,6 +8,7 @@ using System.Text; using System.Windows.Forms; using ryControls; using ryControls.Skin; +using System.Drawing.Drawing2D; namespace ryControls { @@ -42,8 +43,12 @@ namespace ryControls InitializeComponent(); txtSearch.Font = Font; txtSearch.ImeMode = ImeMode; - base.GotFocus += RySearch_GotFocus; + this.SetStyle( + ControlStyles.AllPaintingInWmPaint | //忽略擦出的消息，减少闪烁。 + ControlStyles.OptimizedDoubleBuffer |//在缓冲区上绘制，不直接绘制到屏幕上，减少闪烁。 + ControlStyles.ResizeRedraw | //控件大小发生变化时，重绘。 + ControlStyles.SupportsTransparentBackColor, true);//支持透明背景颜色 } private void RySearch_GotFocus(object sender, EventArgs e) @@ -191,6 +196,21 @@ namespace ryControls //} } } + /// + ///按钮圆角部分背景颜色 + /// + [Description("按钮圆角部分背景颜色")] + public Color ButtonRoundBackColor + { + get + { + return panel1.BackColor; + } + set + { + panel1.BackColor = value; + } + } private string _text = ""; /// /// @@ -225,10 +245,11 @@ namespace ryControls txtSearch.Location = new Point(3, 1); txtSearch.Top = (Height - txtSearch.Height) / 2; //Height = txtSearch.Height+2; - btnSearch.Height = Height; - btnSearch.Width = Height; - btnSearch.Location = new Point(Width - btnSearch.Width, 0); - txtSearch.Width = Width - btnSearch.Width-3; + //btnSearch.Height = Height; + //btnSearch.Width = Height; + //btnSearch.Location = new Point(Width - btnSearch.Width, 0); + panel1.Width = panel1.Height; + txtSearch.Width = Width - panel1.Width-3; } private void RySearch_Load(object sender, EventArgs e) @@ -257,7 +278,6 @@ namespace ryControls else { txtSearch.Font = Font; } } - private void TxtSearch_TextChanged(object sender, EventArgs e) { if (isProcUse) { return; } diff --git a/Source/ryControls/Gdu.WinFormUI/Forms/GMForm.cs b/Source/ryControls/Gdu.WinFormUI/Forms/GMForm.cs index fa638f9..cfb1ac8 100644 --- a/Source/ryControls/Gdu.WinFormUI/Forms/GMForm.cs +++ b/Source/ryControls/Gdu.WinFormUI/Forms/GMForm.cs @@ -971,8 +971,11 @@ namespace MGdu.WinFormUI if (base.WindowState == FormWindowState.Normal) { var size = base.Size; - size.Width += XTheme.ShadowWidth * 2; - size.Height += XTheme.ShadowWidth * 2; + if (!this.DesignMode) + { + size.Width += XTheme.ShadowWidth * 2; + size.Height += XTheme.ShadowWidth * 2; + } if (_shawdowForm.Size != size) { _shawdowForm.Size = size; @@ -988,7 +991,8 @@ namespace MGdu.WinFormUI if (base.WindowState == FormWindowState.Normal) { Point p = base.Location; - p.Offset(-XTheme.ShadowWidth, -XTheme.ShadowWidth); + if (!this.DesignMode) + { p.Offset(-XTheme.ShadowWidth, -XTheme.ShadowWidth); } if (_shawdowForm.Location != p) { _shawdowForm.Location = p; @@ -1032,6 +1036,7 @@ namespace MGdu.WinFormUI private void SetFormRegion() { + if (this.DesignMode) { return; } if (base.Region != null) base.Region.Dispose(); @@ -1140,6 +1145,7 @@ namespace MGdu.WinFormUI private void DrawFormBorder(Graphics g) { + if (this.DesignMode) { return; } int width = BorderWidth; Rectangle rect = ClientRectangle; @@ -1195,6 +1201,7 @@ namespace MGdu.WinFormUI /// private void DrawInsetClientRect(Graphics g) { + if (this.DesignMode) { return; } int x = BorderWidth; int y = BorderWidth + CaptionHeight; int w = ClientSize.Width - BorderWidth * 2; @@ -1347,6 +1354,7 @@ namespace MGdu.WinFormUI /// protected override void WndProc(ref Message m) { + if (this.DesignMode) { base.WndProc(ref m); return; } bool alreadyHandled = false; switch (m.Msg) @@ -1403,12 +1411,13 @@ namespace MGdu.WinFormUI { //base.OnPaintBackground(e); } - + /// /// 重写该方法解决窗体每次还原都会变大的问题 /// protected override void SetBoundsCore(int x, int y, int width, int height, BoundsSpecified specified) { + if (this.DesignMode) { base.SetBoundsCore(x, y, width, height, specified); return; } if (base.WindowState == FormWindowState.Normal) { if (this.Size == this.ClientSize) @@ -1418,7 +1427,7 @@ namespace MGdu.WinFormUI { width = this.Size.Width; height = this.Size.Height; - + } } } @@ -1510,7 +1519,7 @@ namespace MGdu.WinFormUI { base.OnLocationChanged(e); - if (XTheme.ShowShadow && _shawdowForm != null + if (XTheme.ShowShadow && _shawdowForm != null && !_shawdowForm.IsDisposed && _shawdowForm.Visible) SetShadowFormLocation(); } @@ -1569,7 +1578,7 @@ namespace MGdu.WinFormUI _listClosedMdiChild = new List
(); _mdiBarController = new MdiBarController(this); _mdiBarController.TabCloseButtonClick += new EventHandler(OnMdiTabCloseButtonClick); - _mdiBarController.NewTabButtonClick +=new EventHandler(OnMdiNewTabButtonClick); + _mdiBarController.NewTabButtonClick += new EventHandler(OnMdiNewTabButtonClick); OnMdiBarCreated(this, EventArgs.Empty); } } diff --git a/Source/ryControls/Properties/AssemblyInfo.cs b/Source/ryControls/Properties/AssemblyInfo.cs index 4bee8c5..3b273f2 100644 --- a/Source/ryControls/Properties/AssemblyInfo.cs +++ b/Source/ryControls/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， // 方法是按如下所示使用“*”: : // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.1.2102.2201")] -[assembly: AssemblyFileVersion("2.1.2102.2201")] \ No newline at end of file +[assembly: AssemblyVersion("2.1.2102.2701")] +[assembly: AssemblyFileVersion("2.1.2102.2701")] \ No newline at end of file diff --git a/Source/ryControls/bin/x86/Debug/MyDb.dll b/Source/ryControls/bin/x86/Debug/MyDb.dll index dfdc566..92db6b7 100644 Binary files a/Source/ryControls/bin/x86/Debug/MyDb.dll and b/Source/ryControls/bin/x86/Debug/MyDb.dll differ diff --git a/Source/ryControls/bin/x86/Debug/ryControls.dll b/Source/ryControls/bin/x86/Debug/ryControls.dll index bfdb5cd..258d55a 100644 Binary files a/Source/ryControls/bin/x86/Debug/ryControls.dll and b/Source/ryControls/bin/x86/Debug/ryControls.dll differ diff --git a/Source/ryControls/bin/x86/Release/MyDb.dll b/Source/ryControls/bin/x86/Release/MyDb.dll index 0d2b348..abeb075 100644 Binary files a/Source/ryControls/bin/x86/Release/MyDb.dll and b/Source/ryControls/bin/x86/Release/MyDb.dll differ diff --git a/Source/ryControls/bin/x86/Release/ryControls.dll b/Source/ryControls/bin/x86/Release/ryControls.dll index bffdfda..75c155b 100644 Binary files a/Source/ryControls/bin/x86/Release/ryControls.dll and b/Source/ryControls/bin/x86/Release/ryControls.dll differ