* UIDataGridViewFooter：更新了刷新位置

SunnyUI.Demo/Controls/FDataGridView.Designer.cs

@@ -126,7 +126,7 @@
             // 
             this.uiDataGridViewFooter1.DataGridView = this.uiDataGridView1;
             this.uiDataGridViewFooter1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.uiDataGridViewFooter1.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiDataGridViewFooter1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.uiDataGridViewFooter1.Location = new System.Drawing.Point(0, 351);
             this.uiDataGridViewFooter1.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiDataGridViewFooter1.Name = "uiDataGridViewFooter1";

SunnyUI.Demo/Controls/FDataGridView.Designer.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

SunnyUI.Demo/SunnyUI.Demo.csproj

@@ -120,7 +120,7 @@
     <Compile Include="Controls\FDataGridView.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Controls\FDataGridView.Designer.cs">
+    <Compile Include="Controls\FDataGridView.designer.cs">
       <DependentUpon>FDataGridView.cs</DependentUpon>
     </Compile>
     <Compile Include="Controls\FFlowLayoutPanel.cs">
@@ -359,9 +359,6 @@
     <EmbeddedResource Include="Controls\FContextMenuStrip.resx">
       <DependentUpon>FContextMenuStrip.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Controls\FDataGridView.Designer.resx">
-      <DependentUpon>FDataGridView.Designer.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Controls\FDataGridView.resx">
       <DependentUpon>FDataGridView.cs</DependentUpon>
     </EmbeddedResource>

SunnyUI/Controls/UIDataGridViewFooter.cs

@@ -29,7 +29,7 @@ using System.Windows.Forms;
 namespace Sunny.UI
 {
     [ToolboxItem(true)]
-    public class UIDataGridViewFooter : UIControl
+    public sealed class UIDataGridViewFooter : UIControl
     {
         public UIDataGridViewFooter()
         {
@@ -38,6 +38,7 @@ namespace Sunny.UI
             RadiusSides = UICornerRadiusSides.None;
             RectSides = ToolStripStatusLabelBorderSides.None;
 
+            Font = UIFontColor.Font;
             foreColor = UIFontColor.Primary;
             fillColor = UIColor.LightBlue;
         }
@@ -116,6 +117,8 @@ namespace Sunny.UI
                     if (str.IsNullOrEmpty()) continue;
 
                     SizeF sf = g.MeasureString(str, Font);
+
+                    if (rect.Left == 0 && rect.Width == 0) continue;
                     if (rect.Left == minleft && rect.Width < column.Width)
                     {
                         g.DrawString(str, Font, ForeColor, rect.Width - column.Width + (column.Width - sf.Width) / 2.0f, (Height - sf.Height) / 2.0f);

SunnyUI/Controls/UIEdit.cs

@@ -26,7 +26,7 @@ using System.Windows.Forms;
 namespace Sunny.UI
 {
     [ToolboxItem(false)]
-    public sealed class UIEdit : TextBox
+    public class UIEdit : TextBox
     {
         private bool canEmpty;
         private int decLength = 2;
@@ -41,10 +41,10 @@ namespace Sunny.UI
         {
             //设置为单选边框
             BorderStyle = BorderStyle.FixedSingle;
-            Font = UIFontColor.Font;
+            base.Font = UIFontColor.Font;
-            ForeColor = UIFontColor.Primary;
+            base.ForeColor = UIFontColor.Primary;
             Width = 150;
-            MaxLength = 32767;
+            base.MaxLength = 32767;
         }
 
         private string watermark;

SunnyUI/Controls/UIPanel.cs

@@ -44,16 +44,6 @@ namespace Sunny.UI
         public UIPanel()
         {
             InitializeComponent();
-
-            SetStyle(ControlStyles.AllPaintingInWmPaint, true);
-            SetStyle(ControlStyles.DoubleBuffer, true);
-            SetStyle(ControlStyles.Selectable, true);
-            SetStyle(ControlStyles.SupportsTransparentBackColor, true);
-            SetStyle(ControlStyles.UserPaint, true);
-            SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
-            base.DoubleBuffered = true;
-            UpdateStyles();
-
             Version = UIGlobal.Version;
             AutoScaleMode = AutoScaleMode.None;
             base.Font = UIFontColor.Font;