* UIDataGridViewFooter：增加配色

SunnyUI.Demo/Controls/FDataGridView.Designer.cs

@@ -126,8 +126,7 @@
             // 
             this.uiDataGridViewFooter1.DataGridView = this.uiDataGridView1;
             this.uiDataGridViewFooter1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.uiDataGridViewFooter1.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
+            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);
             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

@@ -0,0 +1,120 @@
+<?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/Controls/FDataGridView.cs

@@ -8,10 +8,10 @@ namespace Sunny.UI.Demo
         {
             InitializeComponent();
 
-            uiDataGridView1.AddColumn("Column1", "Column1").SetFixedMode(100);
+            uiDataGridView1.AddColumn("Column1", "Column1").SetFixedMode(150);
-            uiDataGridView1.AddColumn("Column2", "Column2").SetFixedMode(100);
+            uiDataGridView1.AddColumn("Column2", "Column2").SetFixedMode(150);
-            uiDataGridView1.AddColumn("Column3", "Column3").SetFixedMode(100);
+            uiDataGridView1.AddColumn("Column3", "Column3").SetFixedMode(150);
-            uiDataGridView1.AddColumn("Column4", "Column4").SetFixedMode(100);
+            uiDataGridView1.AddColumn("Column4", "Column4").SetFixedMode(150);
             uiDataGridView1.ReadOnly = true;
         }
 
@@ -53,6 +53,11 @@ namespace Sunny.UI.Demo
         private void uiPagination1_PageChanged(object sender, object pagingSource, int pageIndex, int count)
         {
             uiDataGridView1.DataSource = pagingSource;
+            uiDataGridViewFooter1.Clear();
+            uiDataGridViewFooter1["Column1"] = "合计：";
+            uiDataGridViewFooter1["Column2"] = "Column2_" + pageIndex;
+            uiDataGridViewFooter1["Column3"] = "Column3_" + pageIndex;
+            uiDataGridViewFooter1["Column4"] = "Column4_" + pageIndex;
         }
     }
 }

SunnyUI.Demo/SunnyUI.Demo.csproj

@@ -359,6 +359,9 @@
     <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

@@ -37,6 +37,9 @@ namespace Sunny.UI
             Height = 29;
             RadiusSides = UICornerRadiusSides.None;
             RectSides = ToolStripStatusLabelBorderSides.None;
+
+            foreColor = UIFontColor.Primary;
+            fillColor = UIColor.LightBlue;
         }
 
         private UIDataGridView dgv;
@@ -113,13 +116,13 @@ namespace Sunny.UI
                     if (str.IsNullOrEmpty()) continue;
 
                     SizeF sf = g.MeasureString(str, Font);
-                    if (rect.Left == 0 && rect.Width < column.Width)
+                    if (rect.Left == minleft && rect.Width < column.Width)
                     {
-                        g.DrawString(str, Font, Color.White, rect.Width - column.Width + (column.Width - sf.Width) / 2.0f, (Height - sf.Height) / 2.0f);
+                        g.DrawString(str, Font, ForeColor, rect.Width - column.Width + (column.Width - sf.Width) / 2.0f, (Height - sf.Height) / 2.0f);
                     }
                     else
                     {
-                        g.DrawString(str, Font, Color.White, rect.Left + (column.Width - sf.Width) / 2.0f, (Height - sf.Height) / 2.0f);
+                        g.DrawString(str, Font, ForeColor, rect.Left + (column.Width - sf.Width) / 2.0f, (Height - sf.Height) / 2.0f);
                     }
                 }
             }
@@ -130,6 +133,7 @@ namespace Sunny.UI
             base.SetStyleColor(uiColor);
             if (uiColor.IsCustom()) return;
 
+            foreColor = UIFontColor.Primary;
             fillColor = uiColor.PlainColor;
 
             Invalidate();
@@ -139,7 +143,7 @@ namespace Sunny.UI
         /// 填充颜色，当值为背景色或透明色或空值则不填充
         /// </summary>
         [Description("填充颜色"), Category("SunnyUI")]
-        [DefaultValue(typeof(Color), "80, 160, 255")]
+        [DefaultValue(typeof(Color), "235, 243, 255")]
         public Color FillColor
         {
             get => fillColor;
@@ -161,7 +165,7 @@ namespace Sunny.UI
         /// 字体颜色
         /// </summary>
         [Description("字体颜色"), Category("SunnyUI")]
-        [DefaultValue(typeof(Color), "White")]
+        [DefaultValue(typeof(Color), "48, 48, 48")]
         public override Color ForeColor
         {
             get => foreColor;