Implemented Filter Feature for all Header Renderes

Issue: #18
schoetbi · Jul 12, 2016 · 5a368b5 · 5a368b5
1 parent 842a574
commit 5a368b5
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 20 deletions.
diff --git a/Models/Table.cs b/Models/Table.cs
@@ -7116,7 +7116,7 @@ protected override void OnMouseDown(MouseEventArgs e)
                     // If the mouse is over the filter button then do nothing here - filter buttons are handled in the click event
                     if (this.EnableFilters && this.ColumnModel.Columns[column].Filterable)
                     {
-                        ColumnHeaderRegion colRegion = this.HeaderRenderer.HitTest(e.X, e.Y);
+                        ColumnHeaderRegion colRegion = this.HeaderRenderer.GetColumnHeaderRegion(e.X, e.Y);
 
                         if (colRegion == ColumnHeaderRegion.FilterButton)
                         {
@@ -7751,7 +7751,7 @@ protected override void OnMouseClick(MouseEventArgs e)
                 if (this.EnableFilters && this.ColumnModel.Columns[hotColumn].Filterable)
                 {
                     Point client = this.DisplayRectToClient(e.X, e.Y);
-                    ColumnHeaderRegion region = this.HeaderRenderer.HitTest(client.X, client.Y);
+                    ColumnHeaderRegion region = this.HeaderRenderer.GetColumnHeaderRegion(client.X, client.Y);
 
                     if (region == ColumnHeaderRegion.FilterButton)
                     {

diff --git a/Renderers/FlatHeaderRenderer.cs b/Renderers/FlatHeaderRenderer.cs
@@ -29,6 +29,7 @@
 using System.ComponentModel;
 using System.Drawing;
 using System.Windows.Forms;
+using System.Windows.Forms.VisualStyles;
 
 using XPTable.Events;
 using XPTable.Models;
@@ -86,7 +87,17 @@ protected override void OnPaint(PaintHeaderEventArgs e)
 			}
 
 			Rectangle textRect = this.ClientRectangle;
-			Rectangle imageRect = Rectangle.Empty;
+
+            if (e.Column.Filterable)
+            {
+                Rectangle filterRect = this.CalcFilterRect();
+
+                textRect.Width -= filterRect.Width;
+
+                ThemeManager.DrawComboBoxButton(e.Graphics, filterRect, ComboBoxState.Normal);
+            }
+
+            Rectangle imageRect = Rectangle.Empty;
 
             int imageWidth = 0;
             int arrowWidth = 0;
@@ -129,7 +140,7 @@ protected override void OnPaint(PaintHeaderEventArgs e)
                 arrowWidth = arrowRect.Width;
 			}
 
-            if (e.Column.Text != null && e.Column.Text.Length > 0 && textRect.Width > 0)
+            if (!string.IsNullOrEmpty(e.Column.Text) && textRect.Width > 0)
             {
                 if (e.Column.Enabled)
                 {
@@ -161,8 +172,25 @@ protected override void OnPaint(PaintHeaderEventArgs e)
             }
 		}
 
-		#endregion
+        #endregion
 
-		#endregion
-	}
+        #endregion
+
+        /// <summary>
+        /// Returns a ColumnHeaderRegion value that represents the header region at the specified client coordinates
+        /// </summary>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <returns></returns>
+        public override ColumnHeaderRegion GetColumnHeaderRegion(int x, int y)
+        {
+            Rectangle filterRect = this.CalcFilterRect();
+            if (filterRect.Contains(x, y))
+            {
+                return ColumnHeaderRegion.FilterButton;
+            }
+
+            return ColumnHeaderRegion.ColumnTitle;
+        }
+    }
 }
diff --git a/Renderers/GradientHeaderRenderer.cs b/Renderers/GradientHeaderRenderer.cs
@@ -30,6 +30,7 @@
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Windows.Forms;
+using System.Windows.Forms.VisualStyles;
 
 using XPTable.Events;
 using XPTable.Models;
@@ -217,7 +218,16 @@ protected override void OnPaint(PaintHeaderEventArgs e)
 			}
 
 			Rectangle textRect = this.ClientRectangle;
-			Rectangle imageRect = Rectangle.Empty;
+            if (e.Column.Filterable)
+            {
+                Rectangle filterRect = this.CalcFilterRect();
+
+                textRect.Width -= filterRect.Width;
+
+                ThemeManager.DrawComboBoxButton(e.Graphics, filterRect, ComboBoxState.Normal);
+            }
+
+            Rectangle imageRect = Rectangle.Empty;
 
             int imageWidth = 0;
             int arrowWidth = 0;
@@ -304,8 +314,25 @@ protected override void OnPaint(PaintHeaderEventArgs e)
             }
 		}
 
-		#endregion
+        #endregion
 
-		#endregion
-	}
+        #endregion
+
+        /// <summary>
+        /// Returns a ColumnHeaderRegion value that represents the header region at the specified client coordinates
+        /// </summary>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <returns></returns>
+        public override ColumnHeaderRegion GetColumnHeaderRegion(int x, int y)
+        {
+            Rectangle filterRect = this.CalcFilterRect();
+            if (filterRect.Contains(x, y))
+            {
+                return ColumnHeaderRegion.FilterButton;
+            }
+
+            return ColumnHeaderRegion.ColumnTitle;
+        }
+    }
 }
diff --git a/Renderers/HeaderRenderer.cs b/Renderers/HeaderRenderer.cs
@@ -404,7 +404,7 @@ protected virtual void DrawSortArrow(Graphics g, Rectangle drawRect, SortOrder d
         /// <param name="x"></param>
         /// <param name="y"></param>
         /// <returns></returns>
-        public virtual ColumnHeaderRegion HitTest(int x, int y)
+        public virtual ColumnHeaderRegion GetColumnHeaderRegion(int x, int y)
         {
             // This base class does not render filter buttons
 

diff --git a/Renderers/IHeaderRenderer.cs b/Renderers/IHeaderRenderer.cs
@@ -98,6 +98,6 @@ public interface IHeaderRenderer : IRenderer
         /// <param name="x"></param>
         /// <param name="y"></param>
         /// <returns></returns>
-        ColumnHeaderRegion HitTest(int x, int y);
+        ColumnHeaderRegion GetColumnHeaderRegion(int x, int y);
 	}
 }
diff --git a/Renderers/XPHeaderRenderer.cs b/Renderers/XPHeaderRenderer.cs
@@ -199,16 +199,13 @@ protected override void OnPaint(PaintHeaderEventArgs e)
         /// <param name="x"></param>
         /// <param name="y"></param>
         /// <returns></returns>
-        public override ColumnHeaderRegion HitTest(int x, int y)
+        public override ColumnHeaderRegion GetColumnHeaderRegion(int x, int y)
         {
             Rectangle filterRect = this.CalcFilterRect();
-
-            bool contains = filterRect.Contains(x, y);
-
-            //Console.WriteLine("HitTest ({0}, {1}) = {2} [{3}]", x, y, contains, filterRect);
-
-            if (contains)
+            if (filterRect.Contains(x, y))
+            {
                 return ColumnHeaderRegion.FilterButton;
+            }
 
             return ColumnHeaderRegion.ColumnTitle;
         }