Author: mkestner
Date: 2007-01-02 11:16:52 -0500 (Tue, 02 Jan 2007)
New Revision: 70368

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs
Log:

2007-01-02  Mike Kestner  <[EMAIL PROTECTED]>

        * ListView.cs: rework the mouse event forwarding everaldo added
        to translate the coordinates to the parent control not
        raise the parent events until after we've done our work. Hover
        needs more work, in the case where HoverSelection is on, because
        the item control receives more than one MouseHover per Enter
        event, so we need to ensure only the "first" hover gets forwarded.
        Opening a minor bug for that.


Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-01-02 15:36:38 UTC (rev 70367)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-01-02 16:16:52 UTC (rev 70368)
@@ -1,3 +1,13 @@
+2007-01-02  Mike Kestner  <[EMAIL PROTECTED]>
+
+       * ListView.cs: rework the mouse event forwarding everaldo added
+       to translate the coordinates to the parent control not
+       raise the parent events until after we've done our work. Hover
+       needs more work, in the case where HoverSelection is on, because
+       the item control receives more than one MouseHover per Enter
+       event, so we need to ensure only the "first" hover gets forwarded.
+       Opening a minor bug for that.
+
 2007-01-02  Gert Driesen  <[EMAIL PROTECTED]>
 
        * CheckedListBox.cs: Fixed SelectionMode to match MS.

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs      
2007-01-02 15:36:38 UTC (rev 70367)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs      
2007-01-02 16:16:52 UTC (rev 70368)
@@ -1415,6 +1415,12 @@
                        ke.Handled = KeySearchString (ke);
                }
 
+               private MouseEventArgs TranslateMouseEventArgs (MouseEventArgs 
args)
+               {
+                       Point loc = PointToClient (Control.MousePosition);
+                       return new MouseEventArgs (args.Button, args.Clicks, 
loc.X, loc.Y, args.Delta);
+               }
+
                internal class ItemControl : Control {
 
                        ListView owner;
@@ -1571,18 +1577,17 @@
 
                        private void ItemsMouseDown (object sender, 
MouseEventArgs me)
                        {
-                               owner.OnMouseDown(me);
-                               
-                               if (owner.items.Count == 0)
+                               if (owner.items.Count == 0) {
+                                       owner.OnMouseDown 
(owner.TranslateMouseEventArgs (me));
                                        return;
+                               }
 
                                Point pt = new Point (me.X, me.Y);
                                foreach (ListViewItem item in owner.items) {
                                        if (me.Clicks == 1 && 
item.CheckRectReal.Contains (pt)) {
                                                checking = true;
-                                               if (me.Clicks > 1)
-                                                       return;
                                                ToggleCheckState (item);
+                                               owner.OnMouseDown 
(owner.TranslateMouseEventArgs (me));
                                                return;
                                        }
 
@@ -1638,32 +1643,32 @@
                                                owner.OnSelectedIndexChanged 
(EventArgs.Empty);
                                        }
                                }
+
+                               owner.OnMouseDown 
(owner.TranslateMouseEventArgs (me));
                        }
 
                        private void ItemsMouseMove (object sender, 
MouseEventArgs me)
                        {
-                               owner.OnMouseMove(me);
-                               
-                               if (PerformBoxSelection (new Point (me.X, 
me.Y)))
-                                       return;
+                               bool done = PerformBoxSelection (new Point 
(me.X, me.Y));
 
-                               if (owner.HoverSelection && hover_processed) {
+                               if (!done && owner.HoverSelection && 
hover_processed) {
 
                                        Point pt = PointToClient 
(Control.MousePosition);
                                        ListViewItem item = owner.GetItemAt 
(pt.X, pt.Y);
-                                       if (item == null || item.Selected)
-                                               return;
+                                       if (item != null && !item.Selected) {
+                                               hover_processed = false;
+                                               XplatUI.ResetMouseHover 
(Handle);
+                                       }
+                               }
 
-                                       hover_processed = false;
-                                       XplatUI.ResetMouseHover (Handle);
-                               }
+                               owner.OnMouseMove 
(owner.TranslateMouseEventArgs (me));
                        }
 
 
                        private void ItemsMouseHover (object sender, EventArgs 
e)
                        {
                                owner.OnMouseHover(e);
-                               
+
                                if (Capture || !owner.HoverSelection)
                                        return;
 
@@ -1680,11 +1685,11 @@
 
                        private void ItemsMouseUp (object sender, 
MouseEventArgs me)
                        {
-                               owner.OnMouseUp(me);
-                               
                                Capture = false;
-                               if (owner.Items.Count == 0)
+                               if (owner.Items.Count == 0) {
+                                       owner.OnMouseUp 
(owner.TranslateMouseEventArgs (me));
                                        return;
+                               }
 
                                Point pt = new Point (me.X, me.Y);
 
@@ -1725,6 +1730,7 @@
                                prev_selection = null;
                                box_select_mode = BoxSelect.None;
                                checking = false;
+                               owner.OnMouseUp (owner.TranslateMouseEventArgs 
(me));
                        }
                        
                        internal void LabelEditFinished (object sender, 
EventArgs e)

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

Reply via email to