Author: jackson
Date: 2005-04-12 13:10:48 -0400 (Tue, 12 Apr 2005)
New Revision: 42843

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/OpenTreeNodeEnumerator.cs
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
Log:
        * TreeView.cs: Set the TopNode properly when scrolling
        occurs. This has the added benifit of reducing the amount of
        walking that needs to be done when drawing. Also removed an old
        misleading TODO.
        * OpenTreeNodeEnumerator.cs: Fix moving backwards.



Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2005-04-12 16:37:15 UTC (rev 42842)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2005-04-12 17:10:48 UTC (rev 42843)
@@ -1,3 +1,11 @@
+2005-04-12  Jackson Harper  <[EMAIL PROTECTED]>
+
+       * TreeView.cs: Set the TopNode properly when scrolling
+       occurs. This has the added benifit of reducing the amount of
+       walking that needs to be done when drawing. Also removed an old
+       misleading TODO.
+       * OpenTreeNodeEnumerator.cs: Fix moving backwards.
+       
 2005-04-11  Jordi Mas i Hernandez <[EMAIL PROTECTED]>
 
        * Timer.cs: fixes interval setting when the timer is already enabled

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/OpenTreeNodeEnumerator.cs
===================================================================
--- 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/OpenTreeNodeEnumerator.cs
        2005-04-12 16:37:15 UTC (rev 42842)
+++ 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/OpenTreeNodeEnumerator.cs
        2005-04-12 17:10:48 UTC (rev 42843)
@@ -83,14 +83,23 @@
                        }
 
                        if (current.PrevNode != null) {
-                               current = current.PrevNode;
+                               // Drill down as far as possible
+                               TreeNode prev = current.PrevNode;
+                               TreeNode walk = prev;
+                               while (walk != null) {
+                                       prev = walk;
+                                       if (!walk.IsExpanded)
+                                               break;
+                                       walk = walk.LastNode;
+                               }
+                               current = prev;
                                return true;
                        }
 
                        if (current.parent == null)
                                return false;
 
-                       current = current.parent.LastNode;
+                       current = current.parent;
                        return true;
                }
 

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs      
2005-04-12 16:37:15 UTC (rev 42842)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs      
2005-04-12 17:10:48 UTC (rev 42843)
@@ -620,8 +620,6 @@
                        return node != null && node.Bounds.Left <= x && 
node.Bounds.Right >= x;
                }
 
-
-               // TODO: Update from supplied node down
                internal void UpdateBelow (TreeNode node)
                {
                        // We need to update the current node so the plus/minus 
block gets update too
@@ -991,8 +989,23 @@
                {
                        int old_skip = skipped_nodes;
                        skipped_nodes = vbar.Value;
+                       int diff = old_skip - skipped_nodes;
 
-                       int y_move = (old_skip - skipped_nodes) * ItemHeight;
+                        if (top_node == null)
+                                top_node = nodes [0];
+
+                       OpenTreeNodeEnumerator walk = new 
OpenTreeNodeEnumerator (TopNode);
+                       if (diff < 0) {
+                               for (int i = diff; i <= 0; i++)
+                                       walk.MoveNext ();
+                               top_node = walk.CurrentNode;
+                       } else {
+                               for (int i = 0; i <= diff; i++)
+                                       walk.MovePrevious ();
+                               top_node = walk.CurrentNode;
+                       }
+
+                       int y_move = diff * ItemHeight;
                        XplatUI.ScrollWindow (Handle, ViewportRectangle, 0, 
y_move, false);
                }
 

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

Reply via email to