- v2.9.1

- Added CellRendererGetter to allow each cell to have a different renderer.
- Obsolete properties are no longer code-gen'ed.
- Fixed a few small bugs

git-svn-id: https://svn.code.sf.net/p/objectlistview/code/cs/trunk@804 0bec5ed8-b53f-49e6-9885-ce7bc93af311

Author: grammarian

ObjectListView/CellEditing/CellEditKeyEngine.cs

@@ -249,7 +249,7 @@ protected ObjectListView ListView {
         /// </summary>
         protected OLVListItem ItemBeingEdited {
             get {
-                return this.ListView.CellEditEventArgs.ListViewItem;
+                return (this.ListView == null || this.ListView.CellEditEventArgs == null) ? null : this.ListView.CellEditEventArgs.ListViewItem;
             }
         }
 
@@ -258,7 +258,7 @@ protected OLVListItem ItemBeingEdited {
         /// </summary>
         protected int SubItemIndexBeingEdited {
             get {
-                return this.ListView.CellEditEventArgs.SubItemIndex;
+                return (this.ListView == null || this.ListView.CellEditEventArgs == null) ? -1 : this.ListView.CellEditEventArgs.SubItemIndex;
             }
         }
 

ObjectListView/Implementation/Delegates.cs

@@ -5,9 +5,12 @@
  * Date: 31-March-2011 5:53 pm
  *
  * Change log:
+ * v2.10
+ * 2015-12-30  JPP  - Added CellRendererGetterDelegate
+ * v2.?
  * 2011-03-31  JPP  - Split into its own file
  * 
- * Copyright (C) 2011-2014 Phillip Piper
+ * Copyright (C) 2011-2015 Phillip Piper
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,8 +29,6 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Windows.Forms;
 using System.Drawing;
 
@@ -89,6 +90,11 @@ namespace BrightIdeasSoftware {
     /// <returns></returns>
     public delegate bool BooleanCheckStatePutterDelegate(Object rowObject, bool newValue);
 
+    /// <summary>
+    /// These delegates are used to get the renderer for a particular cell
+    /// </summary>
+    public delegate IRenderer CellRendererGetterDelegate(Object rowObject, OLVColumn column);
+
     /// <summary>
     /// The callbacks for RightColumnClick events
     /// </summary>
@@ -120,7 +126,7 @@ namespace BrightIdeasSoftware {
     /// These delegates are used to get the tooltip for a column header
     /// </summary>
     public delegate String HeaderToolTipGetterDelegate(OLVColumn column);
-
+        
     /// <summary>
     /// These delegates are used to fetch the image selector that should be used
     /// to choose an image for this column.

ObjectListView/Implementation/OLVListSubItem.cs

@@ -140,12 +140,23 @@ public Object ImageSelector {
         /// <summary>
         /// Gets or sets the url that should be invoked when this subitem is clicked
         /// </summary>
-        public string Url {
+        public string Url
+        {
             get { return this.url; }
             set { this.url = value; }
         }
         private string url;
 
+        /// <summary>
+        /// Gets or sets whether this cell is selected
+        /// </summary>
+        public bool Selected
+        {
+            get { return this.selected; }
+            set { this.selected = value; }
+        }
+        private bool selected;
+
         #endregion
 
         #region Implementation Properties

ObjectListView/ObjectListView.cs

@@ -5,6 +5,10 @@
  * Date: 9/10/2006 11:15 AM
  *
  * Change log
+ * v2.9.1
+ * 2015-12-30  JPP  - Added CellRendererGetter to allow each cell to have a different renderer.
+ *                  - Obsolete properties are no longer code-gen'ed.
+ *
  * v2.9.0
  * 2015-08-22  JPP  - Allow selected row back/fore colours to be specified for each row
  *                  - Renamed properties related to selection colours:
@@ -548,7 +552,7 @@
  * TO DO:
  * - Support undocumented group features: subseted groups, group footer items
  *
- * Copyright (C) 2006-2015 Phillip Piper
+ * Copyright (C) 2006-2016 Phillip Piper
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1035,7 +1039,7 @@ public virtual bool CellEditUseWholeCell {
             get { return cellEditUseWholeCell; }
             set { cellEditUseWholeCell = value; }
         }
-        private bool cellEditUseWholeCell = false;
+        private bool cellEditUseWholeCell;
 
         /// <summary>
         /// Gets or sets the engine that will handle key presses during a cell edit operation.
@@ -1410,6 +1414,17 @@ public IRenderer DefaultRenderer {
         }
         private IRenderer defaultRenderer = new HighlightTextRenderer();
 
+        /// <summary>
+        /// Get the renderer to be used to draw the given cell.
+        /// </summary>
+        /// <param name="model">The row model for the row</param>
+        /// <param name="column">The column to be drawn</param>
+        /// <returns>The renderer used for drawing a cell. Must not return null.</returns>
+        public IRenderer GetCellRenderer(object model, OLVColumn column) {
+            IRenderer renderer = this.CellRendererGetter == null ? null : this.CellRendererGetter(model, column);
+            return renderer ?? column.Renderer ?? this.DefaultRenderer;
+        }
+
         /// <summary>
         /// Gets or sets the style that will be applied to disabled items.
         /// </summary>
@@ -2141,29 +2156,33 @@ public virtual Color SelectedForeColorOrDefault {
             }
         }
 
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         [Obsolete("Use SelectedBackColor instead")]
         public virtual Color HighlightBackgroundColor { get { return this.SelectedBackColor; } set { this.SelectedBackColor = value; } }
 
         [Obsolete("Use SelectedBackColorOrDefault instead")]
         public virtual Color HighlightBackgroundColorOrDefault { get { return this.SelectedBackColorOrDefault; } }
 
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         [Obsolete("Use SelectedForeColor instead")]
         public virtual Color HighlightForegroundColor { get { return this.SelectedForeColor; } set { this.SelectedForeColor = value; } }
 
         [Obsolete("Use SelectedForeColorOrDefault instead")]
         public virtual Color HighlightForegroundColorOrDefault { get { return this.SelectedForeColorOrDefault; } }
 
-//        [Obsolete("Use UnfocusedSelectedBackColor instead")]
-//        public virtual Color UnfocusedHighlightBackgroundColor { get { return this.UnfocusedSelectedBackColor; } set { this.UnfocusedSelectedBackColor = value; } }
-//
-//        [Obsolete("Use UnfocusedSelectedBackColorOrDefault instead")]
-//        public virtual Color UnfocusedHighlightBackgroundColorOrDefault { get { return this.UnfocusedSelectedBackColorOrDefault; } }
-//
-//        [Obsolete("Use UnfocusedSelectedForeColor instead")]
-//        public virtual Color UnfocusedHighlightForegroundColor { get { return this.UnfocusedSelectedForeColor; } set { this.UnfocusedSelectedForeColor = value; } }
-//
-//        [Obsolete("Use UnfocusedSelectedForeColorOrDefault instead")]
-//        public virtual Color UnfocusedHighlightForegroundColorOrDefault { get { return this.UnfocusedSelectedForeColorOrDefault; } }
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Obsolete("Use UnfocusedSelectedBackColor instead")]
+        public virtual Color UnfocusedHighlightBackgroundColor { get { return this.UnfocusedSelectedBackColor; } set { this.UnfocusedSelectedBackColor = value; } }
+
+        [Obsolete("Use UnfocusedSelectedBackColorOrDefault instead")]
+        public virtual Color UnfocusedHighlightBackgroundColorOrDefault { get { return this.UnfocusedSelectedBackColorOrDefault; } }
+
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Obsolete("Use UnfocusedSelectedForeColor instead")]
+        public virtual Color UnfocusedHighlightForegroundColor { get { return this.UnfocusedSelectedForeColor; } set { this.UnfocusedSelectedForeColor = value; } }
+
+        [Obsolete("Use UnfocusedSelectedForeColorOrDefault instead")]
+        public virtual Color UnfocusedHighlightForegroundColorOrDefault { get { return this.UnfocusedSelectedForeColorOrDefault; } }
 
         /// <summary>
         /// Gets or sets whether or not hidden columns should be included in the text representation
@@ -3373,6 +3392,7 @@ public bool UseCellFormatEvents {
          DefaultValue(false)]
         public bool UseCustomSelectionColors {
             get { return false; }
+            // ReSharper disable once ValueParameterNotUsed
             set { }
         }
 
@@ -3722,6 +3742,27 @@ public virtual bool CanUseApplicationIdle {
         }
         private bool canUseApplicationIdle = true;
 
+        /// <summary>
+        /// This delegate fetches the renderer for a particular cell. 
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// If this returns null (or is not installed), the renderer for the column will be used.
+        /// If the column renderer is null, then <seealso cref="DefaultRenderer"/> will be used.
+        /// </para>
+        /// <para>
+        /// This is called every time any cell is drawn. It must be efficient! 
+        /// </para>
+        /// </remarks>
+        [Browsable(false),
+        DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual CellRendererGetterDelegate CellRendererGetter
+        {
+            get { return this.cellRendererGetter; }
+            set { this.cellRendererGetter = value; }
+        }
+        private CellRendererGetterDelegate cellRendererGetter;
+
         /// <summary>
         /// This delegate is called when the list wants to show a tooltip for a particular cell.
         /// The delegate should return the text to display, or null to use the default behavior
@@ -4229,7 +4270,7 @@ public virtual void BuildList(bool shouldPreserveState) {
                     this.TopItemIndex = previousTopIndex;
             }
 
-            System.Diagnostics.Debug.WriteLine(String.Format("PERF - Building list for {2} objects took {0}ms / {1} ticks", sw.ElapsedMilliseconds, sw.ElapsedTicks, this.GetItemCount()));
+            // System.Diagnostics.Debug.WriteLine(String.Format("PERF - Building list for {2} objects took {0}ms / {1} ticks", sw.ElapsedMilliseconds, sw.ElapsedTicks, this.GetItemCount()));
         }
 
         /// <summary>
@@ -4909,7 +4950,9 @@ protected virtual void CalculateOwnerDrawnHitTest(OlvListViewHitTestInfo hti, in
                 return;
 
             // Which renderer was responsible for drawing that point
-            IRenderer renderer = this.View == View.Details ? (hti.Column.Renderer ?? this.DefaultRenderer) : this.ItemRenderer;
+            IRenderer renderer = this.View == View.Details
+                ? this.GetCellRenderer(hti.RowObject, hti.Column)
+                : this.ItemRenderer;
 
             // We can't decide who was responsible. Give up
             if (renderer == null)
@@ -9039,12 +9082,14 @@ protected override void OnDrawSubItem(DrawListViewSubItemEventArgs e) {
                 return;
             }
 
+            object rowObject = ((OLVListItem)e.Item).RowObject;
+
             // Calculate where the subitem should be drawn
             Rectangle r = e.Bounds;
 
             // Get the special renderer for this column. If there isn't one, use the default draw mechanism.
             OLVColumn column = this.GetColumn(e.ColumnIndex);
-            IRenderer renderer = column.Renderer ?? this.DefaultRenderer;
+            IRenderer renderer = this.GetCellRenderer(rowObject, column);
 
             // Get a graphics context for the renderer to use.
             // But we have more complications. Virtual lists have a nasty habit of drawing column 0
@@ -9060,7 +9105,7 @@ protected override void OnDrawSubItem(DrawListViewSubItemEventArgs e) {
             g.SmoothingMode = ObjectListView.SmoothingMode;
 
             // Finally, give the renderer a chance to draw something
-            e.DrawDefault = !renderer.RenderSubItem(e, g, r, ((OLVListItem)e.Item).RowObject);
+            e.DrawDefault = !renderer.RenderSubItem(e, g, r, rowObject);
 
             if (!e.DrawDefault)
                 buffer.Render();
@@ -9507,7 +9552,7 @@ public Rectangle CalculateCellEditorBounds(OLVListItem item, int subItemIndex, S
         /// <returns>A rectangle that is the bounds of the cell editor</returns>
         protected Rectangle CalculateCellEditorBoundsOwnerDrawn(OLVListItem item, int subItemIndex, Rectangle r, Size preferredSize) {
             IRenderer renderer = this.View == View.Details
-                ? (this.GetColumn(subItemIndex).Renderer ?? this.DefaultRenderer)
+                ? this.GetCellRenderer(item.RowObject, this.GetColumn(subItemIndex))
                 : this.ItemRenderer;
 
             if (renderer == null)

ObjectListView/ObjectListView2012.nuspec

@@ -3,17 +3,19 @@
   <metadata>
     <id>ObjectListView.Official</id>
     <title>ObjectListView (Official)</title>
-    <version>2.9.0</version>
+    <version>2.9.1</version>
     <authors>Phillip Piper</authors>
     <owners>Phillip Piper</owners>
     <licenseUrl>http://www.gnu.org/licenses/gpl.html</licenseUrl>
     <projectUrl>http://objectlistview.sourceforge.net</projectUrl>
     <iconUrl>http://objectlistview.sourceforge.net/cs/_static/index-icon.png</iconUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <summary>ObjectListView is a .NET ListView wired on caffeine, guarana and steroids.</summary>
-    <description>ObjectListView is a .NET ListView wired on caffeine, guarana and steroids. More calmly, it is a C# wrapper around a .NET ListView, which makes the ListView much easier to use and teaches it lots of neat new tricks.</description>
-    <releaseNotes>V2.9 adds buttons to cells, fixed some formatting bugs, and completely rewrote the demo to be much easier to understand.</releaseNotes>
-    <copyright>Copyright 2006-2015 Bright Ideas Software</copyright>
+    <description>ObjectListView is a .NET ListView wired on caffeine, guarana and steroids. 
+    More calmly, it is a C# wrapper around a .NET ListView, which makes the ListView much easier to use and teaches it lots of neat new tricks.</description>
+    <releaseNotes>v2.9.1 Added CellRendererGetter to allow each cell to have a different renderer, plus Fixes a few small bugs. 
+    v2.9 adds buttons to cells, fixed some formatting bugs, and completely rewrote the demo to be much easier to understand.</releaseNotes>
+    <copyright>Copyright 2006-2016 Bright Ideas Software</copyright>
     <tags>.Net WinForms Net20 Net40 ListView Controls</tags>
   </metadata>
 </package>

ObjectListView/Properties/AssemblyInfo.cs

@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Bright Ideas Software")]
 [assembly: AssemblyProduct("ObjectListView")]
-[assembly: AssemblyCopyright("Copyright ©  2006-2015")]
+[assembly: AssemblyCopyright("Copyright ©  2006-2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -30,7 +30,7 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.9.0.*")]
-[assembly: AssemblyFileVersion("2.9.0.0")]
-[assembly: AssemblyInformationalVersion("2.9.0")]
+[assembly: AssemblyVersion("2.9.1.*")]
+[assembly: AssemblyFileVersion("2.9.1.0")]
+[assembly: AssemblyInformationalVersion("2.9.1")]
 [assembly: System.CLSCompliant(true)]