diff --git a/Bin/Debug/CommonControls/.NET4 示例/Itrycn_Project.exe b/Bin/Debug/CommonControls/.NET4 示例/Itrycn_Project.exe index 6dd09de..3519f43 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 30e3b37..0c79aff 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 641e80a..451e03f 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 837f18c..3ed258b 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 8d2a96b..33fbb83 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 ab3ae5d..f6411e9 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 45c266f..e91e82d 100644 --- a/Bin/Debug/CommonControls/.NET4 示例/UserDb/Win.dat +++ b/Bin/Debug/CommonControls/.NET4 示例/UserDb/Win.dat @@ -1,2 +1,2 @@ [Money_Op] -hwnd=397838 +hwnd=1191986 diff --git a/Bin/Debug/CommonControls/.NET4 示例/cUpdate.dat b/Bin/Debug/CommonControls/.NET4 示例/cUpdate.dat index 9fe0360..e5c2375 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 0524222..e7f4ed2 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 c0f7ba4..a89dfb1 100644 --- a/Bin/Debug/CommonControls/.NET4 示例/ryControls.xml +++ b/Bin/Debug/CommonControls/.NET4 示例/ryControls.xml @@ -7902,11 +7902,6 @@ - - - 重写该方法解决窗体每次还原都会变大的问题 - - 重写该方法解决在VS设计器中，每次保存一个新的尺寸，再打开尺寸会变大的问题 diff --git a/Bin/Debug/CommonControls/.NET4 示例/ryUpdate.dll b/Bin/Debug/CommonControls/.NET4 示例/ryUpdate.dll index 74d0f27..2b9396a 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 641e80a..451e03f 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 0050183..3f91aa7 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 d87cfe2..e6c6084 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 837f18c..3ed258b 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 8d2a96b..33fbb83 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 6e7fcfb..279b83a 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 0524222..e7f4ed2 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 c0f7ba4..a89dfb1 100644 --- a/Bin/Debug/CommonControls/.NET4/ryControls.xml +++ b/Bin/Debug/CommonControls/.NET4/ryControls.xml @@ -7902,11 +7902,6 @@ - - - 重写该方法解决窗体每次还原都会变大的问题 - - 重写该方法解决在VS设计器中，每次保存一个新的尺寸，再打开尺寸会变大的问题 diff --git a/Bin/Debug/CommonControls/.NET4/ryUpdate.dll b/Bin/Debug/CommonControls/.NET4/ryUpdate.dll index 74d0f27..2b9396a 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 32c9b5a..685254a 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 e156143..49301ef 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 99e60d9..bdba86a 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 e2997b0..90ec19d 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 ab3ae5d..f6411e9 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 8047de0..5d80369 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 c0f7ba4..a89dfb1 100644 --- a/Bin/Release/CommonControls/.NET4 示例/ryControls.xml +++ b/Bin/Release/CommonControls/.NET4 示例/ryControls.xml @@ -7902,11 +7902,6 @@ - - - 重写该方法解决窗体每次还原都会变大的问题 - - 重写该方法解决在VS设计器中，每次保存一个新的尺寸，再打开尺寸会变大的问题 diff --git a/Bin/Release/CommonControls/.NET4 示例/ryUpdate.dll b/Bin/Release/CommonControls/.NET4 示例/ryUpdate.dll index 312f118..0368922 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 e156143..49301ef 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 a92a7a5..278489c 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 0c427bb..b9ba9b7 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 99e60d9..bdba86a 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 e2997b0..90ec19d 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 2b83128..db76be5 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 8047de0..5d80369 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 c0f7ba4..a89dfb1 100644 --- a/Bin/Release/CommonControls/.NET4/ryControls.xml +++ b/Bin/Release/CommonControls/.NET4/ryControls.xml @@ -7902,11 +7902,6 @@ - - - 重写该方法解决窗体每次还原都会变大的问题 - - 重写该方法解决在VS设计器中，每次保存一个新的尺寸，再打开尺寸会变大的问题 diff --git a/Bin/Release/CommonControls/.NET4/ryUpdate.dll b/Bin/Release/CommonControls/.NET4/ryUpdate.dll index 312f118..0368922 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 6b658cc..e3b9a16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,12 @@ -### 2021-03-13更新 +### 2021-04-03更新 ------ -#### ryControlsV4 V2.1.2103.1301 -*.[改进]改进Gdu.WinformUI在窗体FormBorderStyle为None时最大化会覆盖状态栏的问题。 +#### ryControls V2.1.2104.0201 +- *.[修复]修复在win7上Gdu.WinformUI会报错的BUG。 + +### 2021-03-13更新 +------ +#### ryControls V2.1.2103.1301 +- *.[改进]改进Gdu.WinformUI在窗体FormBorderStyle为None时最大化会覆盖状态栏的问题。 ### 2021-02-28更新 ------ diff --git a/Source/.vs/公用控件组V4/v16/.suo b/Source/.vs/公用控件组V4/v16/.suo index f91361c..1f690af 100644 Binary files a/Source/.vs/公用控件组V4/v16/.suo and b/Source/.vs/公用控件组V4/v16/.suo differ diff --git a/Source/MyDb/bin/x86/Debug/MyDb.dll b/Source/MyDb/bin/x86/Debug/MyDb.dll index 4068c54..8dd8f5f 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 1c0f7f4..855bdf1 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/Gdu.WinFormUI/Forms/GMForm.cs b/Source/ryControls/Gdu.WinFormUI/Forms/GMForm.cs index c526d9c..ab0571b 100644 --- a/Source/ryControls/Gdu.WinFormUI/Forms/GMForm.cs +++ b/Source/ryControls/Gdu.WinFormUI/Forms/GMForm.cs @@ -1,1689 +1,1689 @@ -/* - * 本代码受中华人民共和国著作权法保护，作者仅授权下载代码之人在学习和交流范围内 - * 自由使用与修改代码；欲将代码用于商业用途的，请先与作者联系。 - * 使用本代码请保留此处信息。作者联系方式：ping3108@163.com, 欢迎进行技术交流 - */ - -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Drawing; -using System.Drawing.Drawing2D; -using System.Windows.Forms; -using System.Runtime.InteropServices; - -using MGdu.WinFormUI; -using MGdu.WinFormUI.MyGraphics; -using System.Security.Permissions; - -namespace MGdu.WinFormUI -{ - /// - /// a form that supports custom theme - /// - [PermissionSet(SecurityAction.Demand, Name = "FullTrust")] - [System.Runtime.InteropServices.ComVisibleAttribute(true)] - public partial class GMForm : Form - { - - #region private variable - - ControlBoxManager controlBoxManager; - GMShadow _shawdowForm; - Form _lastClosedMdiChild; - List
_listClosedMdiChild; - MdiBarController _mdiBarController; - - #endregion - - #region mdi event support - - EventHandler _mdiNewTabButtonClick; - EventHandler _mdiTabCloseButtonClick; - EventHandler _mdiBarCreated; - /// - /// 标签新建按钮事件 - /// - [Description("标签新建按钮事件")] - - public event EventHandler MdiNewTabButtonClick - { - add - { - _mdiNewTabButtonClick = value; - } - remove - { - _mdiNewTabButtonClick = null; - } - } - /// - /// 标签关闭按钮事件 - /// - [Description("标签关闭按钮事件")] - - public event EventHandler MdiTabCloseButtonClick - { - add - { - _mdiTabCloseButtonClick = value; - } - remove - { - _mdiTabCloseButtonClick = null; - } - } - /// - ///标签创建时事件 - /// - [Description("标签创建时事件")] - - public event EventHandler MdiBarCreated - { - add { _mdiBarCreated = value; } - remove { _mdiBarCreated = null; } - } - - private void OnMdiNewTabButtonClick(object sender, EventArgs e) - { - _mdiNewTabButtonClick?.Invoke(sender, e); - } - - private void OnMdiTabCloseButtonClick(object sender, EventArgs e) - { - _mdiTabCloseButtonClick?.Invoke(sender, e); - } - /// - /// 在标签栏创建时激发 - /// - /// - /// - protected virtual void OnMdiBarCreated(object sender, EventArgs e) - { - _mdiBarCreated?.Invoke(sender, e); - } - - #endregion - - #region property - - #region property private var - - bool _resizable = true; // not with theme - Padding _padding = new Padding(0); // not with theme - - ThemeFormBase _myTheme; - - #endregion - /// - /// 内边距 - /// - - [DefaultValue(typeof(Padding), "0")] - public new Padding Padding - { - get { return _padding; } - set - { - _padding = value; - base.Padding = new Padding( - BorderWidth + _padding.Left, - CaptionHeight + BorderWidth + _padding.Top, - BorderWidth + _padding.Right, - BorderWidth + _padding.Bottom); - } - } - /// - /// 默认内边距 - /// - protected override Padding DefaultPadding - { - get - { - return new Padding( - BorderWidth, - BorderWidth + CaptionHeight, - BorderWidth, - BorderWidth); - } - } - /// - /// 标题 - /// - public override string Text - { - get - { - return base.Text; - } - set - { - base.Text = value; - Invalidate(TextRect); - } - } - /// - /// 皮肤/主题 - /// - [Browsable(false)] - public ThemeFormBase XTheme - { - get - { - if (_myTheme == null) - _myTheme = new ThemeFormBase(); - return _myTheme; - } - set - { - _myTheme = value; - PrepareForNewTheme(); - Invalidate(); - } - } - - #region editable gmform properties - /// - /// 是否可拖动改变窗体大小 - /// - [Category("GMForm")] - [Description("是否可拖动改变窗体大小")] - [DefaultValue(true)] - public bool Resizable - { - get { return _resizable; } - set - { - _resizable = value; - } - } - /// - /// 窗体边界大小，鼠标移动到该边界将变成指针形状，拖动可改变窗体大小 - /// - [Category("GMForm")] - [Description("窗体边界大小，鼠标移动到该边界将变成指针形状，拖动可改变窗体大小")] - [DefaultValue(6)] - public int SideResizeWidth - { - get { return XTheme.SideResizeWidth; } - set - { - if (value != XTheme.SideResizeWidth) - { - XTheme.SideResizeWidth = value; - } - } - } - /// - /// 窗体边框大小 - /// - [Category("GMForm")] - [Description("窗体边框大小")] - [DefaultValue(6)] - public int BorderWidth - { - get { return XTheme.BorderWidth; } - set - { - if (value != XTheme.BorderWidth) - { - XTheme.BorderWidth = value; - Invalidate(); - } - } - } - /// - /// 标题栏高度 - /// - [Category("GMForm")] - [Description("标题栏高度")] - [DefaultValue(30)] - public int CaptionHeight - { - get { return XTheme.CaptionHeight; } - set - { - if (value != XTheme.CaptionHeight) - { - XTheme.CaptionHeight = value; - Invalidate(); - } - } - } - /// - ///窗体圆角程度 - /// - [Category("GMForm")] - [DefaultValue(8)] - [Description("窗体圆角程度")] - public int Radius - { - get { return XTheme.Radius; } - set - { - if (value != XTheme.Radius) - { - XTheme.Radius = (value < 0 ? 0 : value); - Invalidate(); - } - } - } - /// - /// 窗体圆角样式 - /// - [Category("GMForm")] - [DefaultValue(typeof(RoundStyle), "2")] - [Description("窗体圆角样式")] - public RoundStyle Round - { - get { return XTheme.RoundedStyle; } - set - { - if (value != XTheme.RoundedStyle) - { - XTheme.RoundedStyle = value; - Invalidate(); - } - } - } - /// - /// 控制按钮相对于右上角的偏移量 - /// - [Category("GMForm")] - [Description("控制按钮相对于右上角的偏移量")] - [DefaultValue(typeof(Point), "8, 8")] - public Point ControlBoxOffset - { - get { return XTheme.ControlBoxOffset; } - set - { - XTheme.ControlBoxOffset = value; - Invalidate(); - } - } - /// - /// 关闭/最大化/最小化按钮之间的距离，可以设置成负值使它们重叠 - /// - [Category("GMForm")] - [Description("关闭/最大化/最小化按钮之间的距离，可以设置成负值使它们重叠")] - [DefaultValue(0)] - public int ControlBoxSpace - { - get { return XTheme.ControlBoxSpace; } - set - { - XTheme.ControlBoxSpace = value; - Invalidate(); - } - } - /// - /// 标题栏图标尺寸 - /// - [Category("GMForm")] - [Description("标题栏图标尺寸")] - [DefaultValue(typeof(Size), "16,16")] - public Size IconSize - { - get - { - if (ShowIcon) - return XTheme.IconSize; - else - return System.Drawing.Size.Empty; - } - set - { - XTheme.IconSize = value; - Invalidate(); - } - } - /// - /// 标题栏图标与窗体左边框的距离 - /// - [Category("GMForm")] - [Description("标题栏图标与窗体左边框的距离")] - [DefaultValue(2)] - public int IconLeftMargin - { - get { return (this.ShowIcon ? XTheme.IconLeftMargin : 0); } - set - { - XTheme.IconLeftMargin = value; - Invalidate(); - } - } - /// - /// 标题距离左边的距离 - /// - [Category("GMForm")] - [DefaultValue(2), Description("标题距离左边的距离")] - public int TextLeftMargin - { - get { return XTheme.TextLeftMargin; } - set - { - XTheme.TextLeftMargin = value; - Invalidate(); - } - } - /// - /// 窗体关闭按钮的尺寸 - /// - [Category("GMForm")] - [Description("窗体关闭按钮的尺寸")] - [DefaultValue(typeof(Size), "37, 17")] - public Size CloseBoxSize - { - get { return XTheme.CloseBoxSize; } - set - { - XTheme.CloseBoxSize = value; - Invalidate(); - } - } - /// - /// 窗体最大化/还原按钮的大小 - /// - [Category("GMForm")] - [DefaultValue(typeof(Size), "25, 17")] - [Description("窗体最大化/还原按钮的大小")] - public Size MaxBoxSize - { - get { return XTheme.MaxBoxSize; } - set - { - XTheme.MaxBoxSize = value; - Invalidate(); - } - } - /// - /// 窗体最小化按钮的大小 - /// - [Category("GMForm")] - [DefaultValue(typeof(Size), "25, 17")] - [Description("窗体最小化按钮的大小")] - public Size MinBoxSize - { - get { return XTheme.MinBoxSize; } - set - { - XTheme.MinBoxSize = value; - Invalidate(); - } - } - - #endregion - - #region form shadow about - /// - /// 是否显示阴影 - /// - [Category("Form Shadow"), Description("是否显示阴影")] - public bool ShowShadow - { - get { return XTheme.ShowShadow; } - set - { - if (value != XTheme.ShowShadow) - { - XTheme.ShowShadow = value; - } - } - } - /// - /// 窗体阴影宽度 - /// - [Category("Form Shadow"), Description("窗体阴影宽度")] - public int ShadowWidth - { - get { return XTheme.ShadowWidth; } - set - { - XTheme.ShadowWidth = value; - } - } - /// - /// 使用阴影来缩放 - /// - [Category("Form Shadow"), Description("使用阴影来缩放")] - public bool UseShadowToResize - { - get { return XTheme.UseShadowToResize; } - set - { - XTheme.UseShadowToResize = value; - } - } - /// - /// 窗体阴影颜色 - /// - [Category("Form Shadow")] - [Description("窗体阴影颜色")] - public Color ShadowColor - { - get { return XTheme.ShadowColor; } - set - { - XTheme.ShadowColor = value; - } - } - /// - /// 阴影从里到外是逐渐变浅的，这个值设置深色部分的透明度，ARGB中的A值 - /// - [Category("Form Shadow")] - [Description("阴影从里到外是逐渐变浅的，这个值设置深色部分的透明度，ARGB中的A值")] - public int ShadowAValueDark - { - get { return XTheme.ShadowAValueDark; } - set - { - XTheme.ShadowAValueDark = value; - } - } - /// - /// 阴影从里到外是逐渐变浅的，这个值设置浅色部分的透明度，ARGB中的A值 - /// - [Category("Form Shadow")] - [Description("阴影从里到外是逐渐变浅的，这个值设置浅色部分的透明度，ARGB中的A值")] - public int ShadowAValueLight - { - get { return XTheme.ShadowAValueLight; } - set - { - XTheme.ShadowAValueLight = value; - } - } - - #endregion - - #region form resize region, internal readonly - - internal Rectangle TopLeftRect - { - get - { - return new Rectangle(0, 0, SideResizeWidth, SideResizeWidth); - } - } - - internal Rectangle TopRect - { - get - { - return new Rectangle( - SideResizeWidth, - 0, - this.Size.Width - SideResizeWidth * 2, - SideResizeWidth); - } - } - - internal Rectangle TopRightRect - { - get - { - return new Rectangle( - this.Size.Width - SideResizeWidth, - 0, - SideResizeWidth, - SideResizeWidth); - } - } - - internal Rectangle LeftRect - { - get - { - return new Rectangle( - 0, - SideResizeWidth, - SideResizeWidth, - this.Size.Height - SideResizeWidth * 2); - } - } - - internal Rectangle RightRect - { - get - { - return new Rectangle( - this.Size.Width - SideResizeWidth, - SideResizeWidth, - SideResizeWidth, - this.Size.Height - SideResizeWidth * 2); - } - } - - internal Rectangle BottomLeftRect - { - get - { - return new Rectangle( - 0, - this.Size.Height - SideResizeWidth, - SideResizeWidth, - SideResizeWidth); - } - } - - internal Rectangle BottomRect - { - get - { - return new Rectangle( - SideResizeWidth, - this.Size.Height - SideResizeWidth, - this.Size.Width - SideResizeWidth * 2, - SideResizeWidth); - } - } - - internal Rectangle BottomRightRect - { - get - { - return new Rectangle( - this.Size.Width - SideResizeWidth, - this.Size.Height - SideResizeWidth, - SideResizeWidth, - SideResizeWidth); - } - } - - #endregion - - - #region calculated rect - - internal Rectangle CaptionRect - { - get - { - return new Rectangle( - BorderWidth, - BorderWidth, - this.ClientSize.Width - BorderWidth * 2, - CaptionHeight); - } - } - - internal Rectangle CaptionRectToDraw - { - get - { - return new Rectangle( - 0, - 0, - this.ClientSize.Width, - CaptionHeight + BorderWidth); - } - } - - internal Rectangle CloseBoxRect - { - get - { - if (ControlBox) - { - int x = ClientSize.Width - ControlBoxOffset.X - CloseBoxSize.Width; - return new Rectangle( - new Point(x, ControlBoxOffset.Y), - CloseBoxSize); - } - else - return Rectangle.Empty; - } - } - - internal Rectangle MaxBoxRect - { - get - { - if (ControlBox && MaximizeBox) - { - int x = CloseBoxRect.Left - ControlBoxSpace - MaxBoxSize.Width; - return new Rectangle( - new Point(x, ControlBoxOffset.Y), - MaxBoxSize); - } - else - return Rectangle.Empty; - } - } - - internal Rectangle MinBoxRect - { - get - { - if (ControlBox && MinimizeBox) - { - int x; - if (MaximizeBox) - x = MaxBoxRect.Left - ControlBoxSpace - MinBoxSize.Width; - else - x = CloseBoxRect.Left - ControlBoxSpace - MinBoxSize.Width; - return new Rectangle( - new Point(x, ControlBoxOffset.Y), - MinBoxSize); - } - else - return Rectangle.Empty; - } - } - - internal Rectangle IconRect - { - get - { - if (ControlBox && ShowIcon) - { - int x = BorderWidth + IconLeftMargin; - int y = BorderWidth + (CaptionHeight - IconSize.Height) / 2; - return new Rectangle(new Point(x, y), IconSize); - } - else - return new Rectangle(BorderWidth, BorderWidth, 0, 0); - } - } - - internal Rectangle TextRect - { - get - { - int x = IconRect.Right + TextLeftMargin; - int y = BorderWidth; - int height = CaptionHeight; - int right = this.ClientSize.Width - x; - if (ControlBox) - { - right = CloseBoxRect.Left; - if (MinimizeBox) - { - right = MinBoxRect.Left; - } - else if (MaximizeBox) - { - right = MaxBoxRect.Left; - } - } - int width = right - x; - return new Rectangle(x, y, width, height); - } - } - - #endregion - - /// - /// 表示去掉自画的边框及标题栏后，剩下的可用的客户区区域，坐标相对于窗体左上角 - /// - [Browsable(false)] - public Rectangle UserClientBounds - { - get - { - return new Rectangle( - BorderWidth, - BorderWidth + CaptionHeight, - ClientSize.Width - BorderWidth * 2, - ClientSize.Height - BorderWidth * 2 - CaptionHeight); - } - } - - /// - /// 表示去掉自画的边框及标题栏后，剩下的可用的客户区大小 - /// - [Browsable(false)] - public Size UserClientSize - { - get - { - return new Size( - ClientSize.Width - BorderWidth * 2, - ClientSize.Height - BorderWidth * 2 - CaptionHeight); - } - } - - /// - /// 表示MDI标签栏的区域，包括bottom-region - /// - [Browsable(false)] - public Rectangle MdiBarBounds - { - get - { - if (!IsMdiContainer || _mdiBarController == null) - return Rectangle.Empty; - return _mdiBarController.Bounds; - } - } - - #endregion - - #region constructor & initialize - /// - /// MGdUI皮肤 - /// - public GMForm() - : base() - { - InitializeComponent(); - FormIni(); - //if (!DesignMode) - //{ - // base.ShowInTaskbar = ShowInTaskbar; - //} - // 下面这个条件是永远不为true的，如果不把此类直接设置成mdicontainer - //if (this.IsMdiContainer) - // SetMdiClient(); - } - - private void FormIni() - { - this.SetStyle( - ControlStyles.AllPaintingInWmPaint | - ControlStyles.UserPaint | - ControlStyles.OptimizedDoubleBuffer | - ControlStyles.ResizeRedraw, true); - this.DoubleBuffered = true; - this.UpdateStyles(); - base.Padding = DefaultPadding; - if (ControlBox) - controlBoxManager = new ControlBoxManager(this); - } - - #region MDI-Support - /// - /// 获取子窗体 - /// - /// - public MdiClient GetMdiClient() - { - MdiClient mdiclient = null; - foreach (Control ctl in Controls) - { - if ((mdiclient = ctl as MdiClient) != null) - break; - } - return mdiclient; - } - - /// - /// 通过sendmessage方式激活子窗体以避免闪烁 - /// - /// - public void ActivateMdiChildForm(Form childToActivate) - { - MdiClient mdi = GetMdiClient(); - if (mdi == null) - return; - if (base.ActiveMdiChild == childToActivate) - return; - if (base.MdiChildren.Length < 2) - return; - Control form = null; - bool isNext = false; - int pos = mdi.Controls.IndexOf(childToActivate); - if (pos < 0) - return; - if (pos == 0) - { - form = mdi.Controls[pos + 1]; - isNext = true; - } - else - { - form = mdi.Controls[pos - 1]; - isNext = false; - } - IntPtr next = (isNext ? Win32.WinAPI.TRUE : Win32.WinAPI.FALSE); - Win32.WinAPI.SendMessage(mdi.Handle, - (int)Win32.WinAPI.WindowMessages.WM_MDINEXT, form.Handle, next); - } - - private void SetMdiClient() - { - if (!IsMdiContainer) - return; - - MdiClient mdi = GetMdiClient(); - if (mdi != null) - { - SetMdiStyles(mdi); - UpdateMdiStyles(mdi); - SetMdiClientLocation(mdi); - } - } - - private void SetMdiStyles(MdiClient mdi) - { - // remove the border - - int style = Win32.WinAPI.GetWindowLong(mdi.Handle, (int)Win32.WinAPI.GWLPara.GWL_STYLE); - int exStyle = Win32.WinAPI.GetWindowLong(mdi.Handle, (int)Win32.WinAPI.GWLPara.GWL_EXSTYLE); - - style &= ~(int)Win32.WinAPI.WindowStyle.WS_BORDER; - exStyle &= ~(int)Win32.WinAPI.WindowStyleEx.WS_EX_CLIENTEDGE; - - Win32.WinAPI.SetWindowLong(mdi.Handle, (int)Win32.WinAPI.GWLPara.GWL_STYLE, style); - Win32.WinAPI.SetWindowLong(mdi.Handle, (int)Win32.WinAPI.GWLPara.GWL_EXSTYLE, exStyle); - - Win32.WinAPI.ShowScrollBar(mdi.Handle, (int)Win32.WinAPI.ScrollBar.SB_BOTH, 0 /*false*/); - } - - private void UpdateMdiStyles(MdiClient mdi) - { - // To show style changes, the non-client area must be repainted. Using the - // control's Invalidate method does not affect the non-client area. - // Instead use a Win32 call to signal the style has changed. - - Win32.WinAPI.SetWindowPos(mdi.Handle, IntPtr.Zero, 0, 0, 0, 0, - (uint)Win32.WinAPI.SWPPara.SWP_NOACTIVATE | - (uint)Win32.WinAPI.SWPPara.SWP_NOMOVE | - (uint)Win32.WinAPI.SWPPara.SWP_NOSIZE | - (uint)Win32.WinAPI.SWPPara.SWP_NOZORDER | - (uint)Win32.WinAPI.SWPPara.SWP_NOOWNERZORDER | - (uint)Win32.WinAPI.SWPPara.SWP_FRAMECHANGED); - } - - private void SetMdiClientLocation(MdiClient mdi) - { - mdi.BackColor = Color.White; - //mdi.Margin = new Padding(10); - //mdi.Dock = DockStyle.None; - - //mdi.Location = new Point(30, 40); - //mdi.Size = new Size(400, 260); - - } - - // used for child mdi form to notify its parent form that it's closed - /// - /// 当子窗体关闭时激发 - /// - /// - /// - protected void MdiChildClosed(object sender, FormClosedEventArgs e) - { - Form child = sender as Form; - if (child != null) - { - _lastClosedMdiChild = child; - _listClosedMdiChild.Add(child); - } - } - - // for mdi child form - /// - /// 子窗体可视化变化 - /// - /// - /// - protected void MdiChildVisibleChange(object sender, EventArgs e) - { - base.Invalidate(); - } - /// - /// 获取当前的子窗体列表 - /// - /// - public List GetCurrentMdiChildren() - { - List list = new List(); - if (_listClosedMdiChild != null) - { - foreach (Form f in MdiChildren) - { - if (!_listClosedMdiChild.Contains(f) && f.Visible) - list.Add(f); - } - } - return list; - } - - #endregion - - #endregion - - #region private method - - private void SetFormMinimizeSize() - { - int minW = 160; - int minH = 60; - - int w = BorderWidth * 2 + IconLeftMargin + IconSize.Width - + TextLeftMargin + MinBoxSize.Width + MaxBoxSize.Width - + CloseBoxSize.Width + ControlBoxSpace * 2 - + ControlBoxOffset.X + 12; - if (w < minW) - w = minW; - int h = BorderWidth * 2 + CaptionHeight + 8; - if (h < minH) - h = minH; - base.MinimumSize = new Size(w, h); - } - - private void SetShadowFormSize() - { - if (_shawdowForm == null || _shawdowForm.IsDisposed) - return; - if (base.WindowState == FormWindowState.Normal) - { - var size = base.Size; - if (!this.DesignMode) - { - size.Width += XTheme.ShadowWidth * 2; - size.Height += XTheme.ShadowWidth * 2; - } - if (_shawdowForm.Size != size) - { - _shawdowForm.Size = size; - // update size -- api: movewindow.... - } - } - } - - private void SetShadowFormLocation() - { - if (_shawdowForm == null || _shawdowForm.IsDisposed) - return; - if (base.WindowState == FormWindowState.Normal) - { - Point p = base.Location; - if (!this.DesignMode) - { p.Offset(-XTheme.ShadowWidth, -XTheme.ShadowWidth); } - if (_shawdowForm.Location != p) - { - _shawdowForm.Location = p; - // update location -- api: movewindow.... - } - } - } - - private void PrepareForNewTheme() - { - if (base.Region != null) - base.Region.Dispose(); - base.Region = null; - - if (ControlBox) - { - controlBoxManager.ResetBoxColor(); - controlBoxManager.FormResize(); - } - SetFormRegion(); - //Padding = new Padding(0); - base.BackColor = XTheme.FormBackColor; - base.OnSizeChanged(EventArgs.Empty); - SetFormMinimizeSize(); - if (XTheme.ShowShadow) - { - if (_shawdowForm == null || _shawdowForm.IsDisposed) - { - OnActivated(EventArgs.Empty); - } - } - else - { - if (_shawdowForm != null) - { - _shawdowForm.Close(); - _shawdowForm = null; - } - } - } - - private void SetFormRegion() - { - //if (this.DesignMode) { return; } - if (base.Region != null) - base.Region.Dispose(); - - Rectangle rect = new Rectangle(Point.Empty, base.Size); - GraphicsPath path; - - if (XTheme.UseDefaultTopRoundingFormRegion) - path = GraphicsPathHelper.CreateTopRoundedPathForFormRegion(rect); - else - path = GraphicsPathHelper.CreateRoundedRect(rect, Radius, Round, false); - - this.Region = new Region(path); - } - - //private GraphicsPath CreateRoundedFormRect(bool correction) - //{ - // Rectangle rect = new Rectangle(Point.Empty, this.Size); - // return GraphicsPathHelper.CreateRoundedRect(rect, Radius, Round, correction); - //} - - /// - /// 判断所接收到的 wm_nc-calc-size 消息是否指示窗体即将最小化 - /// - private bool IsAboutToMinimize(Win32.WinAPI.RECT rect) - { - if (rect.Left == -32000 && rect.Top == -32000) - return true; - else - return false; - } - - /// - /// 判断所接收到的 wm_nc-calc-size 消息是否指示窗体即将最大化 - /// - private bool IsAboutToMaximize(Win32.WinAPI.RECT rect) - { - /* - * 判断的方法是，只要窗体的左右、上下都延伸到了屏幕工作区之外， - * 并且左和右、上和下都延伸相同的量，就认为窗体是要进行最大化 - */ - - int left = rect.Left; - int top = rect.Top; - int width = rect.Right - rect.Left; - int height = rect.Bottom - rect.Top; - - if (left < 0 && top < 0) - { - Rectangle workingArea = Screen.GetWorkingArea(this); - if (width == (workingArea.Width + (-left) * 2) - && height == (workingArea.Height + (-top) * 2)) - return true; - } - return false; - } - - private void DrawFormBackground(Graphics g) - { - SmoothingMode oldMode = g.SmoothingMode; - if (Round != RoundStyle.None) - g.SmoothingMode = SmoothingMode.AntiAlias; - - using (SolidBrush sb = new SolidBrush(XTheme.FormBackColor)) - { - using (GraphicsPath path = GraphicsPathHelper.CreateRoundedRect( - ClientRectangle, Radius, Round, false)) - { - g.FillPath(sb, path); - } - } - g.SmoothingMode = oldMode; - } - - private void DrawCaptionBackground(Graphics g) - { - using (LinearGradientBrush lb = new LinearGradientBrush( - CaptionRectToDraw, - XTheme.CaptionBackColorTop, - XTheme.CaptionBackColorBottom, - LinearGradientMode.Vertical)) - { - g.FillRectangle(lb, CaptionRectToDraw); - } - } - - private void DrawFormIconAndText(Graphics g) - { - if (ShowIcon && Icon != null && XTheme.DrawCaptionIcon) - { - g.DrawIcon(this.Icon, IconRect); - } - - if (!string.IsNullOrEmpty(Text) && XTheme.DrawCaptionText) - { - TextRenderer.DrawText( - g, - this.Text, - SystemFonts.CaptionFont, - TextRect, - XTheme.CaptionTextColor, - (XTheme.CaptionTextCenter ? TextFormatFlags.HorizontalCenter : TextFormatFlags.Left) | - TextFormatFlags.VerticalCenter | - TextFormatFlags.EndEllipsis); - } - } - - private void DrawFormBorder(Graphics g) - { - //if (this.DesignMode) { return; } - int width = BorderWidth; - Rectangle rect = ClientRectangle; - - SmoothingMode oldMode = g.SmoothingMode; - if (Round != RoundStyle.None) - g.SmoothingMode = SmoothingMode.AntiAlias; - - // outter border - if (width > 0) - { - using (Pen p = new Pen(XTheme.FormBorderOutterColor)) - { - using (GraphicsPath path = GraphicsPathHelper.CreateRoundedRect( - rect, Radius, Round, true)) - { - g.DrawPath(p, path); - } - } - } - width--; - - // inner border - if (width > 0) - { - using (Pen p = new Pen(XTheme.FormBorderInnerColor)) - { - rect.Inflate(-1, -1); - using (GraphicsPath path = GraphicsPathHelper.CreateRoundedRect( - rect, Radius, Round, true)) - { - g.DrawPath(p, path); - } - } - } - width--; - - g.SmoothingMode = oldMode; - - // other inside border - using (Pen p = new Pen(XTheme.FormBorderInmostColor)) - { - while (width > 0) - { - rect.Inflate(-1, -1); - g.DrawRectangle(p, rect); - width--; - } - } - } - - /// - /// to make the client area to have 3D view - /// - private void DrawInsetClientRect(Graphics g) - { - //if (this.DesignMode) { return; } - int x = BorderWidth; - int y = BorderWidth + CaptionHeight; - int w = ClientSize.Width - BorderWidth * 2; - int h = ClientSize.Height - BorderWidth * 2 - CaptionHeight; - Rectangle clientRect = new Rectangle(x, y, w, h); - clientRect.Width--; - clientRect.Height--; - - Color inner = ColorHelper.GetDarkerColor(this.BackColor, 20); - clientRect.Inflate(1, 1); - using (Pen p1 = new Pen(inner)) - { - g.DrawRectangle(p1, clientRect); - } - - Color outter = Color.FromArgb(80, 255, 255, 255); - clientRect.Inflate(1, 1); - using (Pen p2 = new Pen(outter)) - { - g.DrawRectangle(p2, clientRect); - } - } - - #endregion - - #region your Win-Message handler method - - private bool WmNcActivate(ref Message m) - { - // something here - m.Result = Win32.WinAPI.TRUE; - return true; - } - - private bool WmNcCalcSize(ref Message m) - { - if (m.WParam == new IntPtr(1)) - { - Win32.WinAPI.NCCALCSIZE_PARAMS info = (Win32.WinAPI.NCCALCSIZE_PARAMS) - Marshal.PtrToStructure(m.LParam, typeof(Win32.WinAPI.NCCALCSIZE_PARAMS)); - if (IsAboutToMaximize(info.rectNewForm)) - { - Rectangle workingRect = Screen.GetWorkingArea(this); - info.rectNewForm.Left = workingRect.Left - BorderWidth; - info.rectNewForm.Top = workingRect.Top - BorderWidth; - info.rectNewForm.Right = workingRect.Right + BorderWidth; - info.rectNewForm.Bottom = workingRect.Bottom + BorderWidth; - Marshal.StructureToPtr(info, m.LParam, false); - } - } - return true; - } - - private bool WmNcHitTest(ref Message m) - { - int para = m.LParam.ToInt32(); - //var point = MousePosition; - //int x0 = Win32.WinAPI.LOWORD(para); - //int y0 = Win32.WinAPI.HIWORD(para); - Point p = PointToClient(MousePosition); - - if (Resizable) - { - if (TopLeftRect.Contains(p)) - { - m.Result = new IntPtr((int)Win32.WinAPI.NCHITTEST.HTTOPLEFT); - return true; - } - - if (TopRect.Contains(p)) - { - m.Result = new IntPtr((int)Win32.WinAPI.NCHITTEST.HTTOP); - return true; - } - - if (TopRightRect.Contains(p)) - { - m.Result = new IntPtr((int)Win32.WinAPI.NCHITTEST.HTTOPRIGHT); - return true; - } - - if (LeftRect.Contains(p)) - { - m.Result = new IntPtr((int)Win32.WinAPI.NCHITTEST.HTLEFT); - return true; - } - - if (RightRect.Contains(p)) - { - m.Result = new IntPtr((int)Win32.WinAPI.NCHITTEST.HTRIGHT); - return true; - } - - if (BottomLeftRect.Contains(p)) - { - m.Result = new IntPtr((int)Win32.WinAPI.NCHITTEST.HTBOTTOMLEFT); - return true; - } - - if (BottomRect.Contains(p)) - { - m.Result = new IntPtr((int)Win32.WinAPI.NCHITTEST.HTBOTTOM); - return true; - } - - if (BottomRightRect.Contains(p)) - { - m.Result = new IntPtr((int)Win32.WinAPI.NCHITTEST.HTBOTTOMRIGHT); - return true; - } - } - - if (IconRect.Contains(p)) - { - m.Result = new IntPtr((int)Win32.WinAPI.NCHITTEST.HTSYSMENU); - return true; - } - - if (CloseBoxRect.Contains(p) || MaxBoxRect.Contains(p) || MinBoxRect.Contains(p)) - { - m.Result = new IntPtr((int)Win32.WinAPI.NCHITTEST.HTCLIENT); - return true; - } - - if (IsMdiContainer && _mdiBarController != null) - { - if (_mdiBarController.HitTestBounds.Contains(p)) - { - m.Result = new IntPtr((int)Win32.WinAPI.NCHITTEST.HTCLIENT); - return true; - } - } - - if (CaptionRect.Contains(p)) - { - m.Result = new IntPtr((int)Win32.WinAPI.NCHITTEST.HTCAPTION); - return true; - } - - m.Result = new IntPtr((int)Win32.WinAPI.NCHITTEST.HTCLIENT); - return true; - } - - #endregion - - #region override method - /// - /// 消息 - /// - /// - protected override void WndProc(ref Message m) - { - //if (this.DesignMode) { base.WndProc(ref m); return; } - bool alreadyHandled = false; - switch (m.Msg) - { - case (int)Win32.WinAPI.WindowMessages.WM_NCCALCSIZE: - alreadyHandled = WmNcCalcSize(ref m); - break; - case (int)Win32.WinAPI.WindowMessages.WM_NCHITTEST: - alreadyHandled = WmNcHitTest(ref m); - break; - - case (int)Win32.WinAPI.WindowMessages.WM_NCACTIVATE: - alreadyHandled = WmNcActivate(ref m); - break; - - case (int)Win32.WinAPI.WindowMessages.WM_NCPAINT: - alreadyHandled = true; - break; - - default: - break; - } - - if (!alreadyHandled) - base.WndProc(ref m); - } - /// - /// 画UI - /// - /// - protected override void OnPaint(PaintEventArgs e) - { - base.OnPaint(e); - DrawFormBackground(e.Graphics); - DrawCaptionBackground(e.Graphics); - - DrawFormBorder(e.Graphics); - DrawFormIconAndText(e.Graphics); - - if (XTheme.SetClientInset) - DrawInsetClientRect(e.Graphics); - - if (ControlBox) - controlBoxManager.DrawBoxes(e.Graphics); - - if (IsMdiContainer && _mdiBarController != null) - _mdiBarController.RenderTheBar(e.Graphics); - } - /// - /// 在画背景时激发 - /// - /// - protected override void OnPaintBackground(PaintEventArgs e) - { - //base.OnPaintBackground(e); - } - /// - /// 重写该方法解决窗体每次还原都会变大的问题 - /// - protected override void SetBoundsCore(int x, int y, int width, int height, BoundsSpecified specified) - { - if (base.WindowState == FormWindowState.Normal) - { - if (this.Size == this.ClientSize) - { - //if (width == (this.Size.Width + SystemInformation.FrameBorderSize.Width * 2)) - if (width == (this.Size.Width + 16)) - { - width = this.Size.Width; - height = this.Size.Height; - - } - } - } - base.SetBoundsCore(x, y, width, height, specified); - } - - /// - /// 重写该方法解决在VS设计器中，每次保存一个新的尺寸，再打开尺寸会变大的问题 - /// - protected override void SetClientSizeCore(int x, int y) - { - //MessageBox.Show("before SetClientSizeCore,size:" + - // base.Size.ToString() + ", clisize:" + base.ClientSize.ToString() - // + ", x:" + x.ToString() + ", y:" + y.ToString()); - - if (base.WindowState == FormWindowState.Normal && DesignMode) - { - if (base.Size != base.ClientSize) - { - int diffx = Size.Width - ClientSize.Width; - int diffy = Size.Height - ClientSize.Height; - //MessageBox.Show(diffx+"-"+ diffy); - if (diffx == 16) - { - x -= diffx; - y -= diffy; - } - } - } - base.SetClientSizeCore(x, y); - - //MessageBox.Show(base.SizeFromClientSize(new Size(x,y)).ToString()); - - //MessageBox.Show("after SetClientSizeCore,size:" + - // base.Size.ToString() + ", clisize:" + base.ClientSize.ToString() - // + ", x:" + x.ToString() + ", y:" + y.ToString()); - - } - /// - /// 创建控件时激发 - /// - protected override void OnCreateControl() - { - base.OnCreateControl(); - SetFormRegion(); - } - /// - /// 窗体可见变化时激发 - /// - /// - protected override void OnVisibleChanged(EventArgs e) - { - base.OnVisibleChanged(e); - if (_shawdowForm != null) - _shawdowForm.Visible = base.Visible; - } - - /// - /// 大小改变时激发 - /// - /// - protected override void OnSizeChanged(EventArgs e) - { - base.OnSizeChanged(e); - SetFormRegion(); - - if (ControlBox) - controlBoxManager.FormResize(); - - if (XTheme.ShowShadow && _shawdowForm != null - && !_shawdowForm.IsDisposed) - { - if (base.WindowState == FormWindowState.Normal) - { - _shawdowForm.Visible = true; - SetShadowFormSize(); - } - else - { - _shawdowForm.Visible = false; - } - } - - } - /// - /// 在位置变化时激发 - /// - /// - protected override void OnLocationChanged(EventArgs e) - { - base.OnLocationChanged(e); - - if (XTheme.ShowShadow && _shawdowForm != null - && !_shawdowForm.IsDisposed && _shawdowForm.Visible) - SetShadowFormLocation(); - } - /// - /// 窗体激活 - /// - /// - protected override void OnActivated(EventArgs e) - { - base.OnActivated(e); - if (XTheme.ShowShadow && !base.IsMdiChild) - { - if (_shawdowForm == null) - { - _shawdowForm = new GMShadow(this); - SetShadowFormSize(); - SetShadowFormLocation(); - _shawdowForm.Show(this); - SetShadowFormSize(); - SetShadowFormLocation(); - - _shawdowForm.TopMost = base.TopMost; - - var size = base.MinimumSize; - size.Width += ShadowWidth * 2; - size.Height += ShadowWidth * 2; - _shawdowForm.MinimumSize = size; - - if (XTheme.UseShadowToResize) - _shawdowForm.BeginToResizeOwner(); - } - } - } - /// - /// 窗体关闭后激发 - /// - /// - protected override void OnFormClosed(FormClosedEventArgs e) - { - if (_shawdowForm != null && !_shawdowForm.IsDisposed) - _shawdowForm.Close(); - - base.OnFormClosed(e); - } - /// - /// 加载时 - /// - /// - protected override void OnLoad(EventArgs e) - { - base.OnLoad(e); - - if (base.IsMdiContainer) - { - SetMdiClient(); - _listClosedMdiChild = new List(); - _mdiBarController = new MdiBarController(this); - _mdiBarController.TabCloseButtonClick += new EventHandler(OnMdiTabCloseButtonClick); - _mdiBarController.NewTabButtonClick += new EventHandler(OnMdiNewTabButtonClick); - OnMdiBarCreated(this, EventArgs.Empty); - } - } - /// - /// 在子窗体激活时激发 - /// - /// - protected override void OnMdiChildActivate(EventArgs e) - { - base.OnMdiChildActivate(e); - Invalidate(); - } - /// - /// 标签菜单 - /// - public ContextMenuStrip TabContextMenuStrip { get; set; } = null; - /// - /// 窗体上移动鼠标时激发 - /// - /// - protected override void OnMouseMove(MouseEventArgs e) - { - base.OnMouseMove(e); - if (ControlBox) - controlBoxManager.MouseOperation(e.Location, MouseOperationType.Move); - if (IsMdiContainer && _mdiBarController != null) - _mdiBarController.MouseOperation(e.Location, MouseOperationType.Move); - } - /// - /// 获取当前点击的标签项 - /// - public Form ClickTab { get; set; } = null; - /// - /// 在窗体上按下鼠标时激发 - /// - /// - protected override void OnMouseDown(MouseEventArgs e) - { - base.OnMouseDown(e); - - if (e.Button != System.Windows.Forms.MouseButtons.Left) - { - return; - } - - if (ControlBox) - controlBoxManager.MouseOperation(e.Location, MouseOperationType.Down); - if (IsMdiContainer && _mdiBarController != null) - _mdiBarController.MouseOperation(e.Location, MouseOperationType.Down); - } - /// - /// 在窗体上放开鼠标时激发 - /// - /// - protected override void OnMouseUp(MouseEventArgs e) - { - base.OnMouseUp(e); - - if (e.Button != System.Windows.Forms.MouseButtons.Left) - { - if (e.Button == System.Windows.Forms.MouseButtons.Right) - { - if (TabContextMenuStrip != null) - { - foreach (MdiGMTabItem tab in _mdiBarController._listTabItems) - { - if (!tab.IsHidden) - { - if (tab.Bounds.Contains(e.Location) && !tab.CloseBtnRect.Contains(e.Location)) - { - ClickTab = tab.Form; - TabContextMenuStrip.Show(PointToScreen(e.Location)); - break; - } - } - } - - } - } - return; - } - - if (e.Clicks > 1) - return; - - if (ControlBox) - controlBoxManager.MouseOperation(e.Location, MouseOperationType.Up); - if (IsMdiContainer && _mdiBarController != null) - _mdiBarController.MouseOperation(e.Location, MouseOperationType.Up); - } - /// - /// 在鼠标离开窗体时激发 - /// - /// - protected override void OnMouseLeave(EventArgs e) - { - base.OnMouseLeave(e); - if (ControlBox) - controlBoxManager.MouseOperation(Point.Empty, MouseOperationType.Leave); - if (IsMdiContainer && _mdiBarController != null) - _mdiBarController.MouseOperation(Point.Empty, MouseOperationType.Leave); +/* + * 本代码受中华人民共和国著作权法保护，作者仅授权下载代码之人在学习和交流范围内 + * 自由使用与修改代码；欲将代码用于商业用途的，请先与作者联系。 + * 使用本代码请保留此处信息。作者联系方式：ping3108@163.com, 欢迎进行技术交流 + */ + +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Drawing.Drawing2D; +using System.Windows.Forms; +using System.Runtime.InteropServices; + +using MGdu.WinFormUI; +using MGdu.WinFormUI.MyGraphics; +using System.Security.Permissions; + +namespace MGdu.WinFormUI +{ + /// + /// a form that supports custom theme + /// + [PermissionSet(SecurityAction.Demand, Name = "FullTrust")] + [System.Runtime.InteropServices.ComVisibleAttribute(true)] + public partial class GMForm : Form + { + + #region private variable + + ControlBoxManager controlBoxManager; + GMShadow _shawdowForm; + Form _lastClosedMdiChild; + List _listClosedMdiChild; + MdiBarController _mdiBarController; + + #endregion + + #region mdi event support + + EventHandler _mdiNewTabButtonClick; + EventHandler _mdiTabCloseButtonClick; + EventHandler _mdiBarCreated; + /// + /// 标签新建按钮事件 + /// + [Description("标签新建按钮事件")] + + public event EventHandler MdiNewTabButtonClick + { + add + { + _mdiNewTabButtonClick = value; + } + remove + { + _mdiNewTabButtonClick = null; + } + } + /// + /// 标签关闭按钮事件 + /// + [Description("标签关闭按钮事件")] + + public event EventHandler MdiTabCloseButtonClick + { + add + { + _mdiTabCloseButtonClick = value; + } + remove + { + _mdiTabCloseButtonClick = null; + } + } + /// + ///标签创建时事件 + /// + [Description("标签创建时事件")] + + public event EventHandler MdiBarCreated + { + add { _mdiBarCreated = value; } + remove { _mdiBarCreated = null; } } - #endregion + private void OnMdiNewTabButtonClick(object sender, EventArgs e) + { + _mdiNewTabButtonClick?.Invoke(sender, e); + } + + private void OnMdiTabCloseButtonClick(object sender, EventArgs e) + { + _mdiTabCloseButtonClick?.Invoke(sender, e); + } + /// + /// 在标签栏创建时激发 + /// + /// + /// + protected virtual void OnMdiBarCreated(object sender, EventArgs e) + { + _mdiBarCreated?.Invoke(sender, e); + } + + #endregion + + #region property + + #region property private var + + bool _resizable = true; // not with theme + Padding _padding = new Padding(0); // not with theme + + ThemeFormBase _myTheme; + + #endregion + /// + /// 内边距 + /// + + [DefaultValue(typeof(Padding), "0")] + public new Padding Padding + { + get { return _padding; } + set + { + _padding = value; + base.Padding = new Padding( + BorderWidth + _padding.Left, + CaptionHeight + BorderWidth + _padding.Top, + BorderWidth + _padding.Right, + BorderWidth + _padding.Bottom); + } + } + /// + /// 默认内边距 + /// + protected override Padding DefaultPadding + { + get + { + return new Padding( + BorderWidth, + BorderWidth + CaptionHeight, + BorderWidth, + BorderWidth); + } + } + /// + /// 标题 + /// + public override string Text + { + get + { + return base.Text; + } + set + { + base.Text = value; + Invalidate(TextRect); + } + } + /// + /// 皮肤/主题 + /// + [Browsable(false)] + public ThemeFormBase XTheme + { + get + { + if (_myTheme == null) + _myTheme = new ThemeFormBase(); + return _myTheme; + } + set + { + _myTheme = value; + PrepareForNewTheme(); + Invalidate(); + } + } + + #region editable gmform properties + /// + /// 是否可拖动改变窗体大小 + /// + [Category("GMForm")] + [Description("是否可拖动改变窗体大小")] + [DefaultValue(true)] + public bool Resizable + { + get { return _resizable; } + set + { + _resizable = value; + } + } + /// + /// 窗体边界大小，鼠标移动到该边界将变成指针形状，拖动可改变窗体大小 + /// + [Category("GMForm")] + [Description("窗体边界大小，鼠标移动到该边界将变成指针形状，拖动可改变窗体大小")] + [DefaultValue(6)] + public int SideResizeWidth + { + get { return XTheme.SideResizeWidth; } + set + { + if (value != XTheme.SideResizeWidth) + { + XTheme.SideResizeWidth = value; + } + } + } + /// + /// 窗体边框大小 + /// + [Category("GMForm")] + [Description("窗体边框大小")] + [DefaultValue(6)] + public int BorderWidth + { + get { return XTheme.BorderWidth; } + set + { + if (value != XTheme.BorderWidth) + { + XTheme.BorderWidth = value; + Invalidate(); + } + } + } + /// + /// 标题栏高度 + /// + [Category("GMForm")] + [Description("标题栏高度")] + [DefaultValue(30)] + public int CaptionHeight + { + get { return XTheme.CaptionHeight; } + set + { + if (value != XTheme.CaptionHeight) + { + XTheme.CaptionHeight = value; + Invalidate(); + } + } + } + /// + ///窗体圆角程度 + /// + [Category("GMForm")] + [DefaultValue(8)] + [Description("窗体圆角程度")] + public int Radius + { + get { return XTheme.Radius; } + set + { + if (value != XTheme.Radius) + { + XTheme.Radius = (value < 0 ? 0 : value); + Invalidate(); + } + } + } + /// + /// 窗体圆角样式 + /// + [Category("GMForm")] + [DefaultValue(typeof(RoundStyle), "2")] + [Description("窗体圆角样式")] + public RoundStyle Round + { + get { return XTheme.RoundedStyle; } + set + { + if (value != XTheme.RoundedStyle) + { + XTheme.RoundedStyle = value; + Invalidate(); + } + } + } + /// + /// 控制按钮相对于右上角的偏移量 + /// + [Category("GMForm")] + [Description("控制按钮相对于右上角的偏移量")] + [DefaultValue(typeof(Point), "8, 8")] + public Point ControlBoxOffset + { + get { return XTheme.ControlBoxOffset; } + set + { + XTheme.ControlBoxOffset = value; + Invalidate(); + } + } + /// + /// 关闭/最大化/最小化按钮之间的距离，可以设置成负值使它们重叠 + /// + [Category("GMForm")] + [Description("关闭/最大化/最小化按钮之间的距离，可以设置成负值使它们重叠")] + [DefaultValue(0)] + public int ControlBoxSpace + { + get { return XTheme.ControlBoxSpace; } + set + { + XTheme.ControlBoxSpace = value; + Invalidate(); + } + } + /// + /// 标题栏图标尺寸 + /// + [Category("GMForm")] + [Description("标题栏图标尺寸")] + [DefaultValue(typeof(Size), "16,16")] + public Size IconSize + { + get + { + if (ShowIcon) + return XTheme.IconSize; + else + return System.Drawing.Size.Empty; + } + set + { + XTheme.IconSize = value; + Invalidate(); + } + } + /// + /// 标题栏图标与窗体左边框的距离 + /// + [Category("GMForm")] + [Description("标题栏图标与窗体左边框的距离")] + [DefaultValue(2)] + public int IconLeftMargin + { + get { return (this.ShowIcon ? XTheme.IconLeftMargin : 0); } + set + { + XTheme.IconLeftMargin = value; + Invalidate(); + } + } + /// + /// 标题距离左边的距离 + /// + [Category("GMForm")] + [DefaultValue(2), Description("标题距离左边的距离")] + public int TextLeftMargin + { + get { return XTheme.TextLeftMargin; } + set + { + XTheme.TextLeftMargin = value; + Invalidate(); + } + } + /// + /// 窗体关闭按钮的尺寸 + /// + [Category("GMForm")] + [Description("窗体关闭按钮的尺寸")] + [DefaultValue(typeof(Size), "37, 17")] + public Size CloseBoxSize + { + get { return XTheme.CloseBoxSize; } + set + { + XTheme.CloseBoxSize = value; + Invalidate(); + } + } + /// + /// 窗体最大化/还原按钮的大小 + /// + [Category("GMForm")] + [DefaultValue(typeof(Size), "25, 17")] + [Description("窗体最大化/还原按钮的大小")] + public Size MaxBoxSize + { + get { return XTheme.MaxBoxSize; } + set + { + XTheme.MaxBoxSize = value; + Invalidate(); + } + } + /// + /// 窗体最小化按钮的大小 + /// + [Category("GMForm")] + [DefaultValue(typeof(Size), "25, 17")] + [Description("窗体最小化按钮的大小")] + public Size MinBoxSize + { + get { return XTheme.MinBoxSize; } + set + { + XTheme.MinBoxSize = value; + Invalidate(); + } + } + + #endregion + + #region form shadow about + /// + /// 是否显示阴影 + /// + [Category("Form Shadow"), Description("是否显示阴影")] + public bool ShowShadow + { + get { return XTheme.ShowShadow; } + set + { + if (value != XTheme.ShowShadow) + { + XTheme.ShowShadow = value; + } + } + } + /// + /// 窗体阴影宽度 + /// + [Category("Form Shadow"), Description("窗体阴影宽度")] + public int ShadowWidth + { + get { return XTheme.ShadowWidth; } + set + { + XTheme.ShadowWidth = value; + } + } + /// + /// 使用阴影来缩放 + /// + [Category("Form Shadow"), Description("使用阴影来缩放")] + public bool UseShadowToResize + { + get { return XTheme.UseShadowToResize; } + set + { + XTheme.UseShadowToResize = value; + } + } + /// + /// 窗体阴影颜色 + /// + [Category("Form Shadow")] + [Description("窗体阴影颜色")] + public Color ShadowColor + { + get { return XTheme.ShadowColor; } + set + { + XTheme.ShadowColor = value; + } + } + /// + /// 阴影从里到外是逐渐变浅的，这个值设置深色部分的透明度，ARGB中的A值 + /// + [Category("Form Shadow")] + [Description("阴影从里到外是逐渐变浅的，这个值设置深色部分的透明度，ARGB中的A值")] + public int ShadowAValueDark + { + get { return XTheme.ShadowAValueDark; } + set + { + XTheme.ShadowAValueDark = value; + } + } + /// + /// 阴影从里到外是逐渐变浅的，这个值设置浅色部分的透明度，ARGB中的A值 + /// + [Category("Form Shadow")] + [Description("阴影从里到外是逐渐变浅的，这个值设置浅色部分的透明度，ARGB中的A值")] + public int ShadowAValueLight + { + get { return XTheme.ShadowAValueLight; } + set + { + XTheme.ShadowAValueLight = value; + } + } + + #endregion + + #region form resize region, internal readonly + + internal Rectangle TopLeftRect + { + get + { + return new Rectangle(0, 0, SideResizeWidth, SideResizeWidth); + } + } + + internal Rectangle TopRect + { + get + { + return new Rectangle( + SideResizeWidth, + 0, + this.Size.Width - SideResizeWidth * 2, + SideResizeWidth); + } + } + + internal Rectangle TopRightRect + { + get + { + return new Rectangle( + this.Size.Width - SideResizeWidth, + 0, + SideResizeWidth, + SideResizeWidth); + } + } + + internal Rectangle LeftRect + { + get + { + return new Rectangle( + 0, + SideResizeWidth, + SideResizeWidth, + this.Size.Height - SideResizeWidth * 2); + } + } + + internal Rectangle RightRect + { + get + { + return new Rectangle( + this.Size.Width - SideResizeWidth, + SideResizeWidth, + SideResizeWidth, + this.Size.Height - SideResizeWidth * 2); + } + } + + internal Rectangle BottomLeftRect + { + get + { + return new Rectangle( + 0, + this.Size.Height - SideResizeWidth, + SideResizeWidth, + SideResizeWidth); + } + } + + internal Rectangle BottomRect + { + get + { + return new Rectangle( + SideResizeWidth, + this.Size.Height - SideResizeWidth, + this.Size.Width - SideResizeWidth * 2, + SideResizeWidth); + } + } + + internal Rectangle BottomRightRect + { + get + { + return new Rectangle( + this.Size.Width - SideResizeWidth, + this.Size.Height - SideResizeWidth, + SideResizeWidth, + SideResizeWidth); + } + } + + #endregion + + + #region calculated rect + + internal Rectangle CaptionRect + { + get + { + return new Rectangle( + BorderWidth, + BorderWidth, + this.ClientSize.Width - BorderWidth * 2, + CaptionHeight); + } + } + + internal Rectangle CaptionRectToDraw + { + get + { + return new Rectangle( + 0, + 0, + this.ClientSize.Width, + CaptionHeight + BorderWidth); + } + } + + internal Rectangle CloseBoxRect + { + get + { + if (ControlBox) + { + int x = ClientSize.Width - ControlBoxOffset.X - CloseBoxSize.Width; + return new Rectangle( + new Point(x, ControlBoxOffset.Y), + CloseBoxSize); + } + else + return Rectangle.Empty; + } + } + + internal Rectangle MaxBoxRect + { + get + { + if (ControlBox && MaximizeBox) + { + int x = CloseBoxRect.Left - ControlBoxSpace - MaxBoxSize.Width; + return new Rectangle( + new Point(x, ControlBoxOffset.Y), + MaxBoxSize); + } + else + return Rectangle.Empty; + } + } + + internal Rectangle MinBoxRect + { + get + { + if (ControlBox && MinimizeBox) + { + int x; + if (MaximizeBox) + x = MaxBoxRect.Left - ControlBoxSpace - MinBoxSize.Width; + else + x = CloseBoxRect.Left - ControlBoxSpace - MinBoxSize.Width; + return new Rectangle( + new Point(x, ControlBoxOffset.Y), + MinBoxSize); + } + else + return Rectangle.Empty; + } + } + + internal Rectangle IconRect + { + get + { + if (ControlBox && ShowIcon) + { + int x = BorderWidth + IconLeftMargin; + int y = BorderWidth + (CaptionHeight - IconSize.Height) / 2; + return new Rectangle(new Point(x, y), IconSize); + } + else + return new Rectangle(BorderWidth, BorderWidth, 0, 0); + } + } + + internal Rectangle TextRect + { + get + { + int x = IconRect.Right + TextLeftMargin; + int y = BorderWidth; + int height = CaptionHeight; + int right = this.ClientSize.Width - x; + if (ControlBox) + { + right = CloseBoxRect.Left; + if (MinimizeBox) + { + right = MinBoxRect.Left; + } + else if (MaximizeBox) + { + right = MaxBoxRect.Left; + } + } + int width = right - x; + return new Rectangle(x, y, width, height); + } + } + + #endregion + + /// + /// 表示去掉自画的边框及标题栏后，剩下的可用的客户区区域，坐标相对于窗体左上角 + /// + [Browsable(false)] + public Rectangle UserClientBounds + { + get + { + return new Rectangle( + BorderWidth, + BorderWidth + CaptionHeight, + ClientSize.Width - BorderWidth * 2, + ClientSize.Height - BorderWidth * 2 - CaptionHeight); + } + } + + /// + /// 表示去掉自画的边框及标题栏后，剩下的可用的客户区大小 + /// + [Browsable(false)] + public Size UserClientSize + { + get + { + return new Size( + ClientSize.Width - BorderWidth * 2, + ClientSize.Height - BorderWidth * 2 - CaptionHeight); + } + } + + /// + /// 表示MDI标签栏的区域，包括bottom-region + /// + [Browsable(false)] + public Rectangle MdiBarBounds + { + get + { + if (!IsMdiContainer || _mdiBarController == null) + return Rectangle.Empty; + return _mdiBarController.Bounds; + } + } + + #endregion + + #region constructor & initialize + /// + /// MGdUI皮肤 + /// + public GMForm() + : base() + { + InitializeComponent(); + FormIni(); + //if (!DesignMode) + //{ + // base.ShowInTaskbar = ShowInTaskbar; + //} + // 下面这个条件是永远不为true的，如果不把此类直接设置成mdicontainer + //if (this.IsMdiContainer) + // SetMdiClient(); + } + + private void FormIni() + { + this.SetStyle( + ControlStyles.AllPaintingInWmPaint | + ControlStyles.UserPaint | + ControlStyles.OptimizedDoubleBuffer | + ControlStyles.ResizeRedraw, true); + this.DoubleBuffered = true; + this.UpdateStyles(); + base.Padding = DefaultPadding; + if (ControlBox) + controlBoxManager = new ControlBoxManager(this); + } + + #region MDI-Support + /// + /// 获取子窗体 + /// + /// + public MdiClient GetMdiClient() + { + MdiClient mdiclient = null; + foreach (Control ctl in Controls) + { + if ((mdiclient = ctl as MdiClient) != null) + break; + } + return mdiclient; + } + + /// + /// 通过sendmessage方式激活子窗体以避免闪烁 + /// + /// + public void ActivateMdiChildForm(Form childToActivate) + { + MdiClient mdi = GetMdiClient(); + if (mdi == null) + return; + if (base.ActiveMdiChild == childToActivate) + return; + if (base.MdiChildren.Length < 2) + return; + Control form = null; + bool isNext = false; + int pos = mdi.Controls.IndexOf(childToActivate); + if (pos < 0) + return; + if (pos == 0) + { + form = mdi.Controls[pos + 1]; + isNext = true; + } + else + { + form = mdi.Controls[pos - 1]; + isNext = false; + } + IntPtr next = (isNext ? Win32.WinAPI.TRUE : Win32.WinAPI.FALSE); + Win32.WinAPI.SendMessage(mdi.Handle, + (int)Win32.WinAPI.WindowMessages.WM_MDINEXT, form.Handle, next); + } + + private void SetMdiClient() + { + if (!IsMdiContainer) + return; + + MdiClient mdi = GetMdiClient(); + if (mdi != null) + { + SetMdiStyles(mdi); + UpdateMdiStyles(mdi); + SetMdiClientLocation(mdi); + } + } + + private void SetMdiStyles(MdiClient mdi) + { + // remove the border + + int style = Win32.WinAPI.GetWindowLong(mdi.Handle, (int)Win32.WinAPI.GWLPara.GWL_STYLE); + int exStyle = Win32.WinAPI.GetWindowLong(mdi.Handle, (int)Win32.WinAPI.GWLPara.GWL_EXSTYLE); + + style &= ~(int)Win32.WinAPI.WindowStyle.WS_BORDER; + exStyle &= ~(int)Win32.WinAPI.WindowStyleEx.WS_EX_CLIENTEDGE; + + Win32.WinAPI.SetWindowLong(mdi.Handle, (int)Win32.WinAPI.GWLPara.GWL_STYLE, style); + Win32.WinAPI.SetWindowLong(mdi.Handle, (int)Win32.WinAPI.GWLPara.GWL_EXSTYLE, exStyle); + + Win32.WinAPI.ShowScrollBar(mdi.Handle, (int)Win32.WinAPI.ScrollBar.SB_BOTH, 0 /*false*/); + } + + private void UpdateMdiStyles(MdiClient mdi) + { + // To show style changes, the non-client area must be repainted. Using the + // control's Invalidate method does not affect the non-client area. + // Instead use a Win32 call to signal the style has changed. + + Win32.WinAPI.SetWindowPos(mdi.Handle, IntPtr.Zero, 0, 0, 0, 0, + (uint)Win32.WinAPI.SWPPara.SWP_NOACTIVATE | + (uint)Win32.WinAPI.SWPPara.SWP_NOMOVE | + (uint)Win32.WinAPI.SWPPara.SWP_NOSIZE | + (uint)Win32.WinAPI.SWPPara.SWP_NOZORDER | + (uint)Win32.WinAPI.SWPPara.SWP_NOOWNERZORDER | + (uint)Win32.WinAPI.SWPPara.SWP_FRAMECHANGED); + } + + private void SetMdiClientLocation(MdiClient mdi) + { + mdi.BackColor = Color.White; + //mdi.Margin = new Padding(10); + //mdi.Dock = DockStyle.None; + + //mdi.Location = new Point(30, 40); + //mdi.Size = new Size(400, 260); + + } + + // used for child mdi form to notify its parent form that it's closed + /// + /// 当子窗体关闭时激发 + /// + /// + /// + protected void MdiChildClosed(object sender, FormClosedEventArgs e) + { + Form child = sender as Form; + if (child != null) + { + _lastClosedMdiChild = child; + _listClosedMdiChild.Add(child); + } + } + + // for mdi child form + /// + /// 子窗体可视化变化 + /// + /// + /// + protected void MdiChildVisibleChange(object sender, EventArgs e) + { + base.Invalidate(); + } + /// + /// 获取当前的子窗体列表 + /// + /// + public List GetCurrentMdiChildren() + { + List list = new List(); + if (_listClosedMdiChild != null) + { + foreach (Form f in MdiChildren) + { + if (!_listClosedMdiChild.Contains(f) && f.Visible) + list.Add(f); + } + } + return list; + } + + #endregion + + #endregion + + #region private method + + private void SetFormMinimizeSize() + { + int minW = 160; + int minH = 60; + + int w = BorderWidth * 2 + IconLeftMargin + IconSize.Width + + TextLeftMargin + MinBoxSize.Width + MaxBoxSize.Width + + CloseBoxSize.Width + ControlBoxSpace * 2 + + ControlBoxOffset.X + 12; + if (w < minW) + w = minW; + int h = BorderWidth * 2 + CaptionHeight + 8; + if (h < minH) + h = minH; + base.MinimumSize = new Size(w, h); + } + + private void SetShadowFormSize() + { + if (_shawdowForm == null || _shawdowForm.IsDisposed) + return; + if (base.WindowState == FormWindowState.Normal) + { + var size = base.Size; + if (!this.DesignMode) + { + size.Width += XTheme.ShadowWidth * 2; + size.Height += XTheme.ShadowWidth * 2; + } + if (_shawdowForm.Size != size) + { + _shawdowForm.Size = size; + // update size -- api: movewindow.... + } + } + } + + private void SetShadowFormLocation() + { + if (_shawdowForm == null || _shawdowForm.IsDisposed) + return; + if (base.WindowState == FormWindowState.Normal) + { + Point p = base.Location; + if (!this.DesignMode) + { p.Offset(-XTheme.ShadowWidth, -XTheme.ShadowWidth); } + if (_shawdowForm.Location != p) + { + _shawdowForm.Location = p; + // update location -- api: movewindow.... + } + } + } + + private void PrepareForNewTheme() + { + if (base.Region != null) + base.Region.Dispose(); + base.Region = null; + + if (ControlBox) + { + controlBoxManager.ResetBoxColor(); + controlBoxManager.FormResize(); + } + SetFormRegion(); + //Padding = new Padding(0); + base.BackColor = XTheme.FormBackColor; + base.OnSizeChanged(EventArgs.Empty); + SetFormMinimizeSize(); + if (XTheme.ShowShadow) + { + if (_shawdowForm == null || _shawdowForm.IsDisposed) + { + OnActivated(EventArgs.Empty); + } + } + else + { + if (_shawdowForm != null) + { + _shawdowForm.Close(); + _shawdowForm = null; + } + } + } + + private void SetFormRegion() + { + //if (this.DesignMode) { return; } + if (base.Region != null) + base.Region.Dispose(); + + Rectangle rect = new Rectangle(Point.Empty, base.Size); + GraphicsPath path; + + if (XTheme.UseDefaultTopRoundingFormRegion) + path = GraphicsPathHelper.CreateTopRoundedPathForFormRegion(rect); + else + path = GraphicsPathHelper.CreateRoundedRect(rect, Radius, Round, false); + + this.Region = new Region(path); + } + + //private GraphicsPath CreateRoundedFormRect(bool correction) + //{ + // Rectangle rect = new Rectangle(Point.Empty, this.Size); + // return GraphicsPathHelper.CreateRoundedRect(rect, Radius, Round, correction); + //} + + /// + /// 判断所接收到的 wm_nc-calc-size 消息是否指示窗体即将最小化 + /// + private bool IsAboutToMinimize(Win32.WinAPI.RECT rect) + { + if (rect.Left == -32000 && rect.Top == -32000) + return true; + else + return false; + } + + /// + /// 判断所接收到的 wm_nc-calc-size 消息是否指示窗体即将最大化 + /// + private bool IsAboutToMaximize(Win32.WinAPI.RECT rect) + { + /* + * 判断的方法是，只要窗体的左右、上下都延伸到了屏幕工作区之外， + * 并且左和右、上和下都延伸相同的量，就认为窗体是要进行最大化 + */ + + int left = rect.Left; + int top = rect.Top; + int width = rect.Right - rect.Left; + int height = rect.Bottom - rect.Top; + + if (left < 0 && top < 0) + { + Rectangle workingArea = Screen.GetWorkingArea(this); + if (width == (workingArea.Width + (-left) * 2) + && height == (workingArea.Height + (-top) * 2)) + return true; + } + return false; + } + + private void DrawFormBackground(Graphics g) + { + SmoothingMode oldMode = g.SmoothingMode; + if (Round != RoundStyle.None) + g.SmoothingMode = SmoothingMode.AntiAlias; + + using (SolidBrush sb = new SolidBrush(XTheme.FormBackColor)) + { + using (GraphicsPath path = GraphicsPathHelper.CreateRoundedRect( + ClientRectangle, Radius, Round, false)) + { + g.FillPath(sb, path); + } + } + g.SmoothingMode = oldMode; + } + + private void DrawCaptionBackground(Graphics g) + { + using (LinearGradientBrush lb = new LinearGradientBrush( + CaptionRectToDraw, + XTheme.CaptionBackColorTop, + XTheme.CaptionBackColorBottom, + LinearGradientMode.Vertical)) + { + g.FillRectangle(lb, CaptionRectToDraw); + } + } + + private void DrawFormIconAndText(Graphics g) + { + if (ShowIcon && Icon != null && XTheme.DrawCaptionIcon) + { + g.DrawIcon(this.Icon, IconRect); + } + + if (!string.IsNullOrEmpty(Text) && XTheme.DrawCaptionText) + { + TextRenderer.DrawText( + g, + this.Text, + SystemFonts.CaptionFont, + TextRect, + XTheme.CaptionTextColor, + (XTheme.CaptionTextCenter ? TextFormatFlags.HorizontalCenter : TextFormatFlags.Left) | + TextFormatFlags.VerticalCenter | + TextFormatFlags.EndEllipsis); + } + } + + private void DrawFormBorder(Graphics g) + { + //if (this.DesignMode) { return; } + int width = BorderWidth; + Rectangle rect = ClientRectangle; + + SmoothingMode oldMode = g.SmoothingMode; + if (Round != RoundStyle.None) + g.SmoothingMode = SmoothingMode.AntiAlias; + + // outter border + if (width > 0) + { + using (Pen p = new Pen(XTheme.FormBorderOutterColor)) + { + using (GraphicsPath path = GraphicsPathHelper.CreateRoundedRect( + rect, Radius, Round, true)) + { + g.DrawPath(p, path); + } + } + } + width--; + + // inner border + if (width > 0) + { + using (Pen p = new Pen(XTheme.FormBorderInnerColor)) + { + rect.Inflate(-1, -1); + using (GraphicsPath path = GraphicsPathHelper.CreateRoundedRect( + rect, Radius, Round, true)) + { + g.DrawPath(p, path); + } + } + } + width--; + + g.SmoothingMode = oldMode; + + // other inside border + using (Pen p = new Pen(XTheme.FormBorderInmostColor)) + { + while (width > 0) + { + rect.Inflate(-1, -1); + g.DrawRectangle(p, rect); + width--; + } + } + } + + /// + /// to make the client area to have 3D view + /// + private void DrawInsetClientRect(Graphics g) + { + //if (this.DesignMode) { return; } + int x = BorderWidth; + int y = BorderWidth + CaptionHeight; + int w = ClientSize.Width - BorderWidth * 2; + int h = ClientSize.Height - BorderWidth * 2 - CaptionHeight; + Rectangle clientRect = new Rectangle(x, y, w, h); + clientRect.Width--; + clientRect.Height--; + + Color inner = ColorHelper.GetDarkerColor(this.BackColor, 20); + clientRect.Inflate(1, 1); + using (Pen p1 = new Pen(inner)) + { + g.DrawRectangle(p1, clientRect); + } + + Color outter = Color.FromArgb(80, 255, 255, 255); + clientRect.Inflate(1, 1); + using (Pen p2 = new Pen(outter)) + { + g.DrawRectangle(p2, clientRect); + } + } + + #endregion + + #region your Win-Message handler method + + private bool WmNcActivate(ref Message m) + { + // something here + m.Result = Win32.WinAPI.TRUE; + return true; + } + + private bool WmNcCalcSize(ref Message m) + { + if (m.WParam == new IntPtr(1)) + { + Win32.WinAPI.NCCALCSIZE_PARAMS info = (Win32.WinAPI.NCCALCSIZE_PARAMS) + Marshal.PtrToStructure(m.LParam, typeof(Win32.WinAPI.NCCALCSIZE_PARAMS)); + if (IsAboutToMaximize(info.rectNewForm)) + { + Rectangle workingRect = Screen.GetWorkingArea(this); + info.rectNewForm.Left = workingRect.Left - BorderWidth; + info.rectNewForm.Top = workingRect.Top - BorderWidth; + info.rectNewForm.Right = workingRect.Right + BorderWidth; + info.rectNewForm.Bottom = workingRect.Bottom + BorderWidth; + Marshal.StructureToPtr(info, m.LParam, false); + } + } + return true; + } + + private bool WmNcHitTest(ref Message m) + { + int para = m.LParam.ToInt32(); + //var point = MousePosition; + //int x0 = Win32.WinAPI.LOWORD(para); + //int y0 = Win32.WinAPI.HIWORD(para); + Point p = PointToClient(MousePosition); + + if (Resizable) + { + if (TopLeftRect.Contains(p)) + { + m.Result = new IntPtr((int)Win32.WinAPI.NCHITTEST.HTTOPLEFT); + return true; + } + + if (TopRect.Contains(p)) + { + m.Result = new IntPtr((int)Win32.WinAPI.NCHITTEST.HTTOP); + return true; + } + + if (TopRightRect.Contains(p)) + { + m.Result = new IntPtr((int)Win32.WinAPI.NCHITTEST.HTTOPRIGHT); + return true; + } + + if (LeftRect.Contains(p)) + { + m.Result = new IntPtr((int)Win32.WinAPI.NCHITTEST.HTLEFT); + return true; + } + + if (RightRect.Contains(p)) + { + m.Result = new IntPtr((int)Win32.WinAPI.NCHITTEST.HTRIGHT); + return true; + } + + if (BottomLeftRect.Contains(p)) + { + m.Result = new IntPtr((int)Win32.WinAPI.NCHITTEST.HTBOTTOMLEFT); + return true; + } + + if (BottomRect.Contains(p)) + { + m.Result = new IntPtr((int)Win32.WinAPI.NCHITTEST.HTBOTTOM); + return true; + } + + if (BottomRightRect.Contains(p)) + { + m.Result = new IntPtr((int)Win32.WinAPI.NCHITTEST.HTBOTTOMRIGHT); + return true; + } + } + + if (IconRect.Contains(p)) + { + m.Result = new IntPtr((int)Win32.WinAPI.NCHITTEST.HTSYSMENU); + return true; + } + + if (CloseBoxRect.Contains(p) || MaxBoxRect.Contains(p) || MinBoxRect.Contains(p)) + { + m.Result = new IntPtr((int)Win32.WinAPI.NCHITTEST.HTCLIENT); + return true; + } + + if (IsMdiContainer && _mdiBarController != null) + { + if (_mdiBarController.HitTestBounds.Contains(p)) + { + m.Result = new IntPtr((int)Win32.WinAPI.NCHITTEST.HTCLIENT); + return true; + } + } + + if (CaptionRect.Contains(p)) + { + m.Result = new IntPtr((int)Win32.WinAPI.NCHITTEST.HTCAPTION); + return true; + } + + m.Result = new IntPtr((int)Win32.WinAPI.NCHITTEST.HTCLIENT); + return true; + } + + #endregion + + #region override method + /// + /// 消息 + /// + /// + protected override void WndProc(ref Message m) + { + //if (this.DesignMode) { base.WndProc(ref m); return; } + bool alreadyHandled = false; + switch (m.Msg) + { + case (int)Win32.WinAPI.WindowMessages.WM_NCCALCSIZE: + alreadyHandled = WmNcCalcSize(ref m); + break; + case (int)Win32.WinAPI.WindowMessages.WM_NCHITTEST: + alreadyHandled = WmNcHitTest(ref m); + break; + + case (int)Win32.WinAPI.WindowMessages.WM_NCACTIVATE: + alreadyHandled = WmNcActivate(ref m); + break; + + case (int)Win32.WinAPI.WindowMessages.WM_NCPAINT: + alreadyHandled = true; + break; + + default: + break; + } + + if (!alreadyHandled) + base.WndProc(ref m); + } + /// + /// 画UI + /// + /// + protected override void OnPaint(PaintEventArgs e) + { + base.OnPaint(e); + DrawFormBackground(e.Graphics); + DrawCaptionBackground(e.Graphics); + + DrawFormBorder(e.Graphics); + DrawFormIconAndText(e.Graphics); + + if (XTheme.SetClientInset) + DrawInsetClientRect(e.Graphics); + + if (ControlBox) + controlBoxManager.DrawBoxes(e.Graphics); + + if (IsMdiContainer && _mdiBarController != null) + _mdiBarController.RenderTheBar(e.Graphics); + } + /// + /// 在画背景时激发 + /// + /// + protected override void OnPaintBackground(PaintEventArgs e) + { + //base.OnPaintBackground(e); + } + ///// + ///// 重写该方法解决窗体每次还原都会变大的问题 + ///// + //protected override void SetBoundsCore(int x, int y, int width, int height, BoundsSpecified specified) + //{ + // if (base.WindowState == FormWindowState.Normal) + // { + // if (this.Size == this.ClientSize) + // { + // //if (width == (this.Size.Width + SystemInformation.FrameBorderSize.Width * 2)) + // if (width == (this.Size.Width + 16)) + // { + // width = this.Size.Width; + // height = this.Size.Height; + + // } + // } + // } + // base.SetBoundsCore(x, y, width, height, specified); + //} + + /// + /// 重写该方法解决在VS设计器中，每次保存一个新的尺寸，再打开尺寸会变大的问题 + /// + protected override void SetClientSizeCore(int x, int y) + { + //MessageBox.Show("before SetClientSizeCore,size:" + + // base.Size.ToString() + ", clisize:" + base.ClientSize.ToString() + // + ", x:" + x.ToString() + ", y:" + y.ToString()); + + if (base.WindowState == FormWindowState.Normal && DesignMode) + { + if (base.Size != base.ClientSize) + { + int diffx = Size.Width - ClientSize.Width; + int diffy = Size.Height - ClientSize.Height; + //MessageBox.Show(diffx+"-"+ diffy); + if (diffx == 16) + { + x -= diffx; + y -= diffy; + } + } + } + base.SetClientSizeCore(x, y); + + //MessageBox.Show(base.SizeFromClientSize(new Size(x,y)).ToString()); + + //MessageBox.Show("after SetClientSizeCore,size:" + + // base.Size.ToString() + ", clisize:" + base.ClientSize.ToString() + // + ", x:" + x.ToString() + ", y:" + y.ToString()); + + } + /// + /// 创建控件时激发 + /// + protected override void OnCreateControl() + { + base.OnCreateControl(); + SetFormRegion(); + } + /// + /// 窗体可见变化时激发 + /// + /// + protected override void OnVisibleChanged(EventArgs e) + { + base.OnVisibleChanged(e); + if (_shawdowForm != null) + _shawdowForm.Visible = base.Visible; + } + + /// + /// 大小改变时激发 + /// + /// + protected override void OnSizeChanged(EventArgs e) + { + base.OnSizeChanged(e); + SetFormRegion(); + + if (ControlBox && controlBoxManager!=null) + controlBoxManager.FormResize(); + + if (XTheme.ShowShadow && _shawdowForm != null + && !_shawdowForm.IsDisposed) + { + if (base.WindowState == FormWindowState.Normal) + { + _shawdowForm.Visible = true; + SetShadowFormSize(); + } + else + { + _shawdowForm.Visible = false; + } + } + + } + /// + /// 在位置变化时激发 + /// + /// + protected override void OnLocationChanged(EventArgs e) + { + base.OnLocationChanged(e); + + if (XTheme.ShowShadow && _shawdowForm != null + && !_shawdowForm.IsDisposed && _shawdowForm.Visible) + SetShadowFormLocation(); + } + /// + /// 窗体激活 + /// + /// + protected override void OnActivated(EventArgs e) + { + base.OnActivated(e); + if (XTheme.ShowShadow && !base.IsMdiChild) + { + if (_shawdowForm == null) + { + _shawdowForm = new GMShadow(this); + SetShadowFormSize(); + SetShadowFormLocation(); + _shawdowForm.Show(this); + SetShadowFormSize(); + SetShadowFormLocation(); + + _shawdowForm.TopMost = base.TopMost; + + var size = base.MinimumSize; + size.Width += ShadowWidth * 2; + size.Height += ShadowWidth * 2; + _shawdowForm.MinimumSize = size; + + if (XTheme.UseShadowToResize) + _shawdowForm.BeginToResizeOwner(); + } + } + } + /// + /// 窗体关闭后激发 + /// + /// + protected override void OnFormClosed(FormClosedEventArgs e) + { + if (_shawdowForm != null && !_shawdowForm.IsDisposed) + _shawdowForm.Close(); + + base.OnFormClosed(e); + } + /// + /// 加载时 + /// + /// + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + + if (base.IsMdiContainer) + { + SetMdiClient(); + _listClosedMdiChild = new List(); + _mdiBarController = new MdiBarController(this); + _mdiBarController.TabCloseButtonClick += new EventHandler(OnMdiTabCloseButtonClick); + _mdiBarController.NewTabButtonClick += new EventHandler(OnMdiNewTabButtonClick); + OnMdiBarCreated(this, EventArgs.Empty); + } + } + /// + /// 在子窗体激活时激发 + /// + /// + protected override void OnMdiChildActivate(EventArgs e) + { + base.OnMdiChildActivate(e); + Invalidate(); + } + /// + /// 标签菜单 + /// + public ContextMenuStrip TabContextMenuStrip { get; set; } = null; + /// + /// 窗体上移动鼠标时激发 + /// + /// + protected override void OnMouseMove(MouseEventArgs e) + { + base.OnMouseMove(e); + if (ControlBox) + controlBoxManager.MouseOperation(e.Location, MouseOperationType.Move); + if (IsMdiContainer && _mdiBarController != null) + _mdiBarController.MouseOperation(e.Location, MouseOperationType.Move); + } + /// + /// 获取当前点击的标签项 + /// + public Form ClickTab { get; set; } = null; + /// + /// 在窗体上按下鼠标时激发 + /// + /// + protected override void OnMouseDown(MouseEventArgs e) + { + base.OnMouseDown(e); + + if (e.Button != System.Windows.Forms.MouseButtons.Left) + { + return; + } + + if (ControlBox) + controlBoxManager.MouseOperation(e.Location, MouseOperationType.Down); + if (IsMdiContainer && _mdiBarController != null) + _mdiBarController.MouseOperation(e.Location, MouseOperationType.Down); + } + /// + /// 在窗体上放开鼠标时激发 + /// + /// + protected override void OnMouseUp(MouseEventArgs e) + { + base.OnMouseUp(e); + + if (e.Button != System.Windows.Forms.MouseButtons.Left) + { + if (e.Button == System.Windows.Forms.MouseButtons.Right) + { + if (TabContextMenuStrip != null) + { + foreach (MdiGMTabItem tab in _mdiBarController._listTabItems) + { + if (!tab.IsHidden) + { + if (tab.Bounds.Contains(e.Location) && !tab.CloseBtnRect.Contains(e.Location)) + { + ClickTab = tab.Form; + TabContextMenuStrip.Show(PointToScreen(e.Location)); + break; + } + } + } + + } + } + return; + } + + if (e.Clicks > 1) + return; + + if (ControlBox) + controlBoxManager.MouseOperation(e.Location, MouseOperationType.Up); + if (IsMdiContainer && _mdiBarController != null) + _mdiBarController.MouseOperation(e.Location, MouseOperationType.Up); + } + /// + /// 在鼠标离开窗体时激发 + /// + /// + protected override void OnMouseLeave(EventArgs e) + { + base.OnMouseLeave(e); + if (ControlBox) + controlBoxManager.MouseOperation(Point.Empty, MouseOperationType.Leave); + if (IsMdiContainer && _mdiBarController != null) + _mdiBarController.MouseOperation(Point.Empty, MouseOperationType.Leave); + } + + #endregion private void GMForm_Load(object sender, EventArgs e) { //var size = this.ClientSize; } - } -} + } +} diff --git a/Source/ryControls/Properties/AssemblyInfo.cs b/Source/ryControls/Properties/AssemblyInfo.cs index 90a1444..7e5c963 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.2103.1301")] -[assembly: AssemblyFileVersion("2.1.2103.1301")] \ No newline at end of file +[assembly: AssemblyVersion("2.1.2104.0201")] +[assembly: AssemblyFileVersion("2.1.2104.0201")] \ 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 4068c54..8dd8f5f 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 b03be7a..15a69e0 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 1c0f7f4..855bdf1 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 08a03cd..364fce7 100644 Binary files a/Source/ryControls/bin/x86/Release/ryControls.dll and b/Source/ryControls/bin/x86/Release/ryControls.dll differ