Changeset 24006

Timestamp:

06/16/2008 06:56:43 PM (6 months ago)

Author:

zacw

Message:

Use an instance variable to keep track of whether or not the mouse is inside the tracking rect. This sort of breaks the case where the contact list growing won't display a tooltip under the mouse if it expands to the location the mouse is, but I consider this bug annoying enough to not care so much about that. Fixes #9936.

Files:

• trunk/Frameworks/AIUtilities Framework/Source/AISmoothTooltipTracker.h (modified) (1 diff)
• trunk/Frameworks/AIUtilities Framework/Source/AISmoothTooltipTracker.m (modified) (3 diffs)

trunk/Frameworks/AIUtilities Framework/Source/AISmoothTooltipTracker.h

@@ -44 +44 @@
-        NSView                                                                          *view;          //View we are tracking tooltips for
-        id<AISmoothTooltipTrackerDelegate>                      delegate;       //Our delegate
+        
+        BOOL                            mouseInside;
-
-        NSPoint                         lastMouseLocation;                              //Last known location of the mouse, used for movement tracking

trunk/Frameworks/AIUtilities Framework/Source/AISmoothTooltipTracker.m

@@ -129 +129 @@
-        if (tooltipTrackingTag == -1) {
-                NSRect                  trackingRect;
-
-
+
-                //Add a new tracking rect
-                trackingRect = [view frame];
-                trackingRect.origin = NSMakePoint(0,0);
-                
-                mouseInside = NSPointInRect([view convertPoint:[[view window] convertScreenToBase:[NSEvent mouseLocation]] fromView:[[view window] contentView]],
-                                                                        trackingRect);
-                tooltipTrackingTag = [view addTrackingRect:trackingRect owner:self userData:nil assumeInside:mouseInside];
-                
@@ -188 +185 @@
-        NSLog(@"+++ [%@: mouseEntered]", self);
-#endif
+        mouseInside = YES;
+        
-        [self _startTrackingMouse];
-}
@@ -197 +196 @@
-        NSLog(@"--- [%@: mouseExited]", self);
-#endif
+        mouseInside = NO;
+        
-        [self _stopTrackingMouse];
-}