diff --git a/Bin/SunnyUI.dll b/Bin/SunnyUI.dll
index 90382618..86b68525 100644
Binary files a/Bin/SunnyUI.dll and b/Bin/SunnyUI.dll differ
diff --git a/Bin/SunnyUI.pdb b/Bin/SunnyUI.pdb
index d39130c2..054b8194 100644
Binary files a/Bin/SunnyUI.pdb and b/Bin/SunnyUI.pdb differ
diff --git a/SunnyUI.Demo/Bin/SunnyUI.dll b/SunnyUI.Demo/Bin/SunnyUI.dll
index 90382618..86b68525 100644
Binary files a/SunnyUI.Demo/Bin/SunnyUI.dll and b/SunnyUI.Demo/Bin/SunnyUI.dll differ
diff --git a/SunnyUI/Controls/DropItem/UIDateTimeItem.resx b/SunnyUI/Controls/DropItem/UIDateTimeItem.resx
deleted file mode 100644
index 1af7de15..00000000
--- a/SunnyUI/Controls/DropItem/UIDateTimeItem.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
\ No newline at end of file
diff --git a/SunnyUI/Controls/UIDataGridView.cs b/SunnyUI/Controls/UIDataGridView.cs
index 154585a6..395b7f06 100644
--- a/SunnyUI/Controls/UIDataGridView.cs
+++ b/SunnyUI/Controls/UIDataGridView.cs
@@ -248,10 +248,10 @@ namespace Sunny.UI
VBar.Height = Height - 2;
VBar.BringToFront();
- HBar.Left = 2;
+ HBar.Left = 0;
HBar.Height = ScrollBarInfo.HorizontalScrollBarHeight() + 1;
- HBar.Width = Width - (VBar.Visible ? VBar.Width : 0) - 2;
- HBar.Top = Height - HBar.Height - 2;
+ HBar.Width = Width - (VBar.Visible ? VBar.Width : 0);
+ HBar.Top = Height - HBar.Height;
HBar.BringToFront();
}
@@ -298,6 +298,7 @@ namespace Sunny.UI
set
{
AlternatingRowsDefaultCellStyle.BackColor = value;
+ HBar.FillColor = VBar.FillColor = value;
Invalidate();
}
}
diff --git a/SunnyUI/Controls/UITreeView.cs b/SunnyUI/Controls/UITreeView.cs
index e6b81d53..b4fe84f2 100644
--- a/SunnyUI/Controls/UITreeView.cs
+++ b/SunnyUI/Controls/UITreeView.cs
@@ -89,9 +89,16 @@ namespace Sunny.UI
if (view != null)
{
view.FillColor = color;
+ view.BackColor = color;
}
}
+ protected override void AfterSetForeColor(Color color)
+ {
+ base.AfterSetForeColor(color);
+ view.ForeColor = color;
+ }
+
[DefaultValue(TreeViewDrawMode.OwnerDrawAll)]
public TreeViewDrawMode DrawMode
{
@@ -617,7 +624,7 @@ namespace Sunny.UI
{
base.OnDrawNode(e);
- if (e.Node==null) return;
+ if (e.Node == null) return;
if (BorderStyle == BorderStyle.Fixed3D) BorderStyle = BorderStyle.FixedSingle;
@@ -629,7 +636,7 @@ namespace Sunny.UI
else
{
var drawLeft = (e.Node.Level + 1) * Indent + 3;
- var checkBoxLeft = (e.Node.Level + 1) * Indent + 3;
+ var checkBoxLeft = (e.Node.Level + 1) * Indent + 1;
var imageLeft = drawLeft;
var haveImage = false;
var sf = e.Graphics.MeasureString(e.Node.Text, Font);
diff --git a/SunnyUI/Static/USystem.cs b/SunnyUI/Static/USystem.cs
index bc845c0a..571012bc 100644
--- a/SunnyUI/Static/USystem.cs
+++ b/SunnyUI/Static/USystem.cs
@@ -53,6 +53,7 @@ namespace Sunny.UI
int start = Environment.TickCount;
while (Environment.TickCount - start < ms)
{
+ System.Threading.Thread.Sleep(1);
Application.DoEvents();
}
}
diff --git a/SunnyUI/SunnyUI.csproj b/SunnyUI/SunnyUI.csproj
index e5bd43b2..94f49df0 100644
--- a/SunnyUI/SunnyUI.csproj
+++ b/SunnyUI/SunnyUI.csproj
@@ -487,9 +487,6 @@
-
- UIDateTimeItem.cs
-
UIEditForm.cs