* TreeView.cs: Store the treenodes plus/minus box bounds when it

[mono.git] / mcs / class / Managed.Windows.Forms / System.Windows.Forms / TreeView.cs

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
index e38009d1ecae8be6f7b9939f04b94c7b9629a740..2f87b9b4cb4dab3091e98dc0459f423abeffc271 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
@@ -594,7 +594,9 @@ namespace System.Windows.Forms {
 
                private void DrawNodePlusMinus (TreeNode node, int x, int y, int middle)
                {
-                       DeviceContext.DrawRectangle (SystemPens.ControlDark, x, middle - 4, 8, 8);
+                       node.UpdatePlusMinusBounds (x, middle - 4, 8, 8);
+
+                       DeviceContext.DrawRectangle (SystemPens.ControlDark, node.plus_minus_bounds);
 
                        if (node.IsExpanded) {
                                DeviceContext.DrawLine (SystemPens.ControlDarkDark, x + 2, middle, x + 6, middle); 
@@ -801,11 +803,8 @@ namespace System.Windows.Forms {
                        int half_height = ItemHeight / 2;
                        while (walk.MoveNext ()) {
                                TreeNode node = (TreeNode) walk.Current;
-                               Rectangle pm = new Rectangle (node.Bounds.Left - indent - 9, node.Bounds.Top + half_height, 8, 8);
-                               if (pm.Contains (e.X, e.Y)) {
-                                       Console.WriteLine ("toggling node:  " + node);
+                               if (node.plus_minus_bounds.Contains (e.X, e.Y)) {
                                        node.Toggle ();
-                                       Console.WriteLine ("node:   " + node.IsExpanded);
                                        break;
                                }
                        }