gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 06:40:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed the point argument to -view:stringForToolTip:point:userData: (should be relative to the tracking rectangle, was relative to the window). Added support for displaying tooltips from NSToolTipAttributeName attributes in NSTextView.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@31550 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
theraven 2010-10-22 16:38:29 +00:00
parent ca5443707d
commit 78873afa01
3 changed files with 101 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Source/GSToolTips.m
View file

@ -28,6 +28,7 @@
#import <Foundation/NSGeometry.h>
#import <Foundation/NSString.h>
#import <Foundation/NSTimer.h>
#import <Foundation/NSIndexSet.h>
#import "AppKit/NSAttributedString.h"
#import "AppKit/NSBezierPath.h"
@ -38,6 +39,7 @@
#import "AppKit/NSPanel.h"
#import "GNUstepGUI/GSTrackingRect.h"
#import "GSToolTips.h"
#import "GSFastEnumeration.h"
@interface NSWindow (GNUstepPrivate)
@ -288,9 +290,16 @@ static BOOL restoreMouseMoved;
if ([[provider object] respondsToSelector:
@selector(view:stringForToolTip:point:userData:)] == YES)
{
// According to the Apple docs, the point is relative to the tracking
// rectangle
NSPoint p = [theEvent locationInWindow];
NSPoint origin =
[view convertRect: [provider viewRect] toView: nil].origin;
p.x -= origin.x;
p.y -= origin.y;
toolTipString = [[provider object] view: view
stringForToolTip: [theEvent trackingNumber]
point: [theEvent locationInWindow]
point: p
userData: [provider data]];
}
else
@ -393,6 +402,28 @@ static BOOL restoreMouseMoved;
toolTipTag = -1;
}
- (void)removeToolTipsInRect: (NSRect)aRect
{
NSUInteger idx = 0;
NSMutableIndexSet *indexes = [NSMutableIndexSet new];
FOR_IN(GSTrackingRect*, rect, ((NSViewPtr)view)->_tracking_rects)
if ((rect->owner == self) && NSContainsRect(aRect, rect->rectangle))
{
RELEASE((GSTTProvider*)rect->user_data);
rect->user_data = 0;
[indexes addIndex: idx];
[rect invalidate];
}
idx++;
END_FOR_IN(((NSViewPtr)view)->_tracking_rects)
[((NSViewPtr)view)->_tracking_rects removeObjectsAtIndexes: indexes];
if ([((NSViewPtr)view)->_tracking_rects count] == 0)
{
((NSViewPtr)view)->_rFlags.has_trkrects = 0;
}
[indexes release];
}
- (void) removeToolTip: (NSToolTipTag)tag
{
NSEnumerator *enumerator;
@ -406,6 +437,7 @@ static BOOL restoreMouseMoved;
RELEASE((GSTTProvider*)rect->user_data);
rect->user_data = 0;
[view removeTrackingRect: tag];
return;
}
}
}