diff --git a/Bin/SunnyUI.Demo.exe b/Bin/SunnyUI.Demo.exe index 1a10b24c..eed40046 100644 Binary files a/Bin/SunnyUI.Demo.exe and b/Bin/SunnyUI.Demo.exe differ diff --git a/Bin/SunnyUI.dll b/Bin/SunnyUI.dll index 6e1fc2fd..7117b621 100644 Binary files a/Bin/SunnyUI.dll and b/Bin/SunnyUI.dll differ diff --git a/SunnyUI.Demo/FMain.Designer.cs b/SunnyUI.Demo/FMain.Designer.cs index a7e412b4..48ba6da1 100644 --- a/SunnyUI.Demo/FMain.Designer.cs +++ b/SunnyUI.Demo/FMain.Designer.cs @@ -105,6 +105,7 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1024, 720); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MaximumSize = new System.Drawing.Size(1366, 728); this.MinimumSize = new System.Drawing.Size(1024, 720); this.Name = "FMain"; this.Padding = new System.Windows.Forms.Padding(2, 35, 2, 2); diff --git a/SunnyUI/Controls/UIDataGridView.cs b/SunnyUI/Controls/UIDataGridView.cs index 62536372..07fbb79b 100644 --- a/SunnyUI/Controls/UIDataGridView.cs +++ b/SunnyUI/Controls/UIDataGridView.cs @@ -232,6 +232,18 @@ namespace Sunny.UI SetBarPosition(); } + protected override void OnColumnStateChanged(DataGridViewColumnStateChangedEventArgs e) + { + base.OnColumnStateChanged(e); + SetScrollInfo(); + } + + protected override void OnColumnRemoved(DataGridViewColumnEventArgs e) + { + base.OnColumnRemoved(e); + SetScrollInfo(); + } + private void SetBarPosition() { if (ShowRect) @@ -273,6 +285,8 @@ namespace Sunny.UI { ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.DisableResizing; } + + SetScrollInfo(); } private UIStyle _style = UIStyle.Blue; diff --git a/SunnyUI/Static/UImage.cs b/SunnyUI/Static/UImage.cs index d9631bac..3792059e 100644 --- a/SunnyUI/Static/UImage.cs +++ b/SunnyUI/Static/UImage.cs @@ -53,7 +53,7 @@ namespace Sunny.UI return bmp; } - public static ImageList GetToolbarImageList(Type type, Bitmap bitmap, Size imageSize, Color transparentColor) + public static ImageList GetToolbarImageList(Type type, Image bitmap, Size imageSize, Color transparentColor) { ImageList imageList = new ImageList(); imageList.ImageSize = imageSize; @@ -63,7 +63,7 @@ namespace Sunny.UI return imageList; } - public static Bitmap Split(this Bitmap image, int size, UIShape shape) + public static Bitmap Split(this Image image, int size, UIShape shape) { //截图画板 Bitmap result = new Bitmap(size, size); @@ -94,7 +94,7 @@ namespace Sunny.UI return result; } - public static Bitmap Split(this Bitmap image, GraphicsPath path) + public static Bitmap Split(this Image image, GraphicsPath path) { //截图画板 Bitmap result = new Bitmap(image.Width, image.Height); @@ -201,7 +201,7 @@ namespace Sunny.UI /// 角度 /// 背景色 /// 图片 - public static Bitmap Rotate(this Bitmap bmp, float angle, Color bkColor) + public static Bitmap Rotate(this Image bmp, float angle, Color bkColor) { int w = bmp.Width; int h = bmp.Height; @@ -314,7 +314,7 @@ namespace Sunny.UI /// 宽度 /// 高度 /// 新图片 - public static Bitmap ResizeImage(this Bitmap bmp, int newW, int newH) + public static Bitmap ResizeImage(this Image bmp, int newW, int newH) { if (bmp == null) {