Author: ivanz
Date: 2008-02-11 09:53:36 -0500 (Mon, 11 Feb 2008)
New Revision: 95439

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGrid.cs
Log:
2008-02-11  Ivan N. Zlatev  <[EMAIL PROTECTED]>

        * PropertyGrid.cs: Do not populate subgriditems unless expandable.
        Fixes a bug where on repopulation after value changed items become
        expandable.



Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2008-02-11 14:45:04 UTC (rev 95438)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2008-02-11 14:53:36 UTC (rev 95439)
@@ -1,3 +1,9 @@
+2008-02-11  Ivan N. Zlatev  <[EMAIL PROTECTED]>
+
+       * PropertyGrid.cs: Do not populate subgriditems unless expandable.
+       Fixes a bug where on repopulation after value changed items become
+       expandable.
+
 2008-02-10  Carlos Alberto Cortez <[EMAIL PROTECTED]>
 
        * Binding.cs: For the 2.0 profile, look for a 
@@ -142,7 +148,7 @@
         - Refactor SetValue to allow setting the value
        when a custom editor is used, but the entry is not editable.
         - Remove the custom editor control on CloseDropDown.
-       [Fixed #359196]
+       [Fixes #359196]
 
 2008-02-06  Andreia Gaita <[EMAIL PROTECTED]>
 

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGrid.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGrid.cs  
2008-02-11 14:45:04 UTC (rev 95438)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGrid.cs  
2008-02-11 14:53:36 UTC (rev 95439)
@@ -1557,13 +1557,15 @@
                                        rootItem.GridItems.Add (item);
                                }
 
-                               if (IsExpandable (item))
-                                       PopulateSubGridItems (item);
+                               PopulateSubGridItems (item);
                        }
                }
 
                private void PopulateSubGridItems (GridEntry parentItem)
                {
+                       if (!IsExpandable (parentItem))
+                               return;
+
                        object[] propertyOwners = parentItem.Values;
                        if (propertyOwners == null)
                                return;

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to