Author: jpobst
Date: 2007-07-20 16:56:39 -0400 (Fri, 20 Jul 2007)
New Revision: 82388

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
Log:
2007-07-20  Jonathan Pobst  <[EMAIL PROTECTED]>

        * TreeView.cs: Implement OnNodeMouseClick and OnNodeMouseDoubleClick.

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-07-20 20:25:49 UTC (rev 82387)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-07-20 20:56:39 UTC (rev 82388)
@@ -1,5 +1,9 @@
 2007-07-20  Jonathan Pobst  <[EMAIL PROTECTED]>
 
+       * TreeView.cs: Implement OnNodeMouseClick and OnNodeMouseDoubleClick.
+
+2007-07-20  Jonathan Pobst  <[EMAIL PROTECTED]>
+
        * TreeNode.cs: Implement ContextMenu, ContextMenuStrip, and Level.
        * TreeView.cs: Use the node's contextmenu[strip] if applicable.
 

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs      
2007-07-20 20:25:49 UTC (rev 82387)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs      
2007-07-20 20:56:39 UTC (rev 82388)
@@ -63,6 +63,7 @@
 
 #if NET_2_0
                private string image_key;
+               private TreeNode mouse_click_node;
                private bool right_to_left_layout;
                private string selected_image_key;
                private ImageList state_image_list;
@@ -967,6 +968,22 @@
                                e.Handled = true;
                }
 
+#if NET_2_0
+               protected virtual void OnNodeMouseClick 
(TreeNodeMouseClickEventArgs e)
+               {
+                       TreeNodeMouseClickEventHandler eh = 
(TreeNodeMouseClickEventHandler)(Events[NodeMouseClickEvent]);
+                       if (eh != null)
+                               eh (this, e);
+               }
+
+               protected virtual void OnNodeMouseDoubleClick 
(TreeNodeMouseClickEventArgs e)
+               {
+                       TreeNodeMouseClickEventHandler eh = 
(TreeNodeMouseClickEventHandler)(Events[NodeMouseDoubleClickEvent]);
+                       if (eh != null)
+                               eh (this, e);
+               }
+#endif
+
                protected virtual void OnItemDrag (ItemDragEventArgs e)
                {
                        ItemDragEventHandler eh = (ItemDragEventHandler)(Events 
[ItemDragEvent]);
@@ -1926,6 +1943,10 @@
                        if (node == null)
                                return;
 
+#if NET_2_0
+                       mouse_click_node = node;
+#endif
+
                        if (show_plus_minus && IsPlusMinusArea (node, e.X)) {
                                node.Toggle ();
                                return;
@@ -1956,6 +1977,18 @@
                }
 
                private void MouseUpHandler (object sender, MouseEventArgs e) {
+#if NET_2_0
+                       TreeNode node = GetNodeAt (e.Y);
+                       
+                       if (node != null && node == mouse_click_node) {
+                               if (e.Clicks == 2)
+                                       OnNodeMouseDoubleClick (new 
TreeNodeMouseClickEventArgs (node, e.Button, e.Clicks, e.X, e.Y));
+                               else
+                                       OnNodeMouseClick (new 
TreeNodeMouseClickEventArgs (node, e.Button, e.Clicks, e.X, e.Y));
+                       }
+                       
+                       mouse_click_node = null;
+#endif
 
                        drag_begin_x = -1;
                        drag_begin_y = -1;

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

Reply via email to