gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-06-02 11:00:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/GSToolTips.m: Use a single retained window for tooltips instead of a

Browse source 
newly created one each time.  This significantly reduces callback interaction 
  with MS-Windows callbacks.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@30141 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
jonathanosx 2010-04-13 18:59:45 +00:00
parent f4908e6f24
commit b0b25e2f29
2 changed files with 24 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2010-04-13 Jonathan Gillaspie <jonathan.gillaspie@testplant.com>
* Source/GSToolTips.m: Use a single retain window for tooltips instead of a
newly created one each time. This significantly reduces callback interaction
with MS-Windows callbacks.
2010-04-12 Fred Kiefer <FredKiefer@gmx.de> 2010-04-12 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSBitmapImageRep+JPEG.m * Source/NSBitmapImageRep+JPEG.m

38
Source/GSToolTips.m
View file

@ -54,7 +54,7 @@
/* A trivial class to hold information about the provider of the tooltip /* A trivial class to hold information about the provider of the tooltip
* string. Instance allocation/deallocation is managed by GSToolTip and * string. Instance allocation/deallocation is managed by GSToolTip and
* are instances are stored in the user data field of tracking rectangles. * our instances are stored in the user data field of tracking rectangles.
*/ */
@interface GSTTProvider : NSObject @interface GSTTProvider : NSObject
{ {
@ -159,7 +159,7 @@ typedef NSView* NSViewPtr;
static NSMapTable *viewsMap = 0; static NSMapTable *viewsMap = 0;
static NSTimer *timer = nil; static NSTimer *timer = nil;
static GSToolTips *timedObject = nil; static GSToolTips *timedObject = nil;
static GSTTPanel *window = nil; static GSTTPanel *window = nil; // Having a single stored panel for tooltips greatly reduces callback interaction from MS-Windows
static BOOL isOpening = NO; // Prevent Windows callback API from attempting to dismiss tooltip as its in the process of appearing static BOOL isOpening = NO; // Prevent Windows callback API from attempting to dismiss tooltip as its in the process of appearing
static NSSize offset; static NSSize offset;
static BOOL restoreMouseMoved; static BOOL restoreMouseMoved;
@ -168,6 +168,18 @@ static BOOL restoreMouseMoved;
{ {
viewsMap = NSCreateMapTable(NSNonOwnedPointerMapKeyCallBacks, viewsMap = NSCreateMapTable(NSNonOwnedPointerMapKeyCallBacks,
NSObjectMapValueCallBacks, 8); NSObjectMapValueCallBacks, 8);
window = [[GSTTPanel alloc] initWithContentRect: NSMakeRect(0,0,100,25)
styleMask: NSBorderlessWindowMask
backing: NSBackingStoreRetained
defer: YES];
[window setBackgroundColor:
[NSColor colorWithDeviceRed: 1.0 green: 1.0 blue: 0.90 alpha: 1.0]];
[window setReleasedWhenClosed: NO];
[window setExcludedFromWindowsMenu: YES];
[window setLevel: NSStatusWindowLevel];
[window setAutodisplay: NO];
} }
+ (void) removeTipsForView: (NSView*)aView + (void) removeTipsForView: (NSView*)aView
@ -505,8 +517,7 @@ static BOOL restoreMouseMoved;
} }
if (window != nil) if (window != nil)
{ {
[window close]; [window orderOut:self];
window = nil;
} }
if (restoreMouseMoved == YES) if (restoreMouseMoved == YES)
{ {
@ -515,6 +526,7 @@ static BOOL restoreMouseMoved;
} }
} }
/* The delay timed out -- display the tooltip */
- (void) _timedOut: (NSTimer *)aTimer - (void) _timedOut: (NSTimer *)aTimer
{ {
NSString *toolTipString = [aTimer userInfo]; NSString *toolTipString = [aTimer userInfo];
@ -523,7 +535,6 @@ static BOOL restoreMouseMoved;
NSPoint mouseLocation = [NSEvent mouseLocation]; NSPoint mouseLocation = [NSEvent mouseLocation];
NSRect visible; NSRect visible;
NSRect rect; NSRect rect;
NSColor *color;
NSMutableDictionary *attributes; NSMutableDictionary *attributes;
if (timer != nil) if (timer != nil)
@ -536,7 +547,7 @@ static BOOL restoreMouseMoved;
timedObject = nil; timedObject = nil;
} }
if (window != nil) if ([window isVisible])
{ {
/* Moved from one tooltip view to another ... so stop displaying /* Moved from one tooltip view to another ... so stop displaying
* the old tool tip before we start the new one. * the old tool tip before we start the new one.
@ -599,21 +610,8 @@ static BOOL restoreMouseMoved;
offset.width = rect.origin.x - mouseLocation.x; offset.width = rect.origin.x - mouseLocation.x;
isOpening = YES; isOpening = YES;
window = [[GSTTPanel alloc] initWithContentRect: rect [window setFrame:rect display:NO];
styleMask: NSBorderlessWindowMask
backing: NSBackingStoreRetained
defer: YES];
color
= [NSColor colorWithDeviceRed: 1.0 green: 1.0 blue: 0.90 alpha: 1.0];
[window setBackgroundColor: color];
[window setReleasedWhenClosed: YES];
[window setExcludedFromWindowsMenu: YES];
[window setLevel: NSStatusWindowLevel];
[window orderFront: nil]; [window orderFront: nil];
[window setAutodisplay: NO];
[window display]; [window display];
[self _drawText: toolTipText]; [self _drawText: toolTipText];
[window flushWindow]; [window flushWindow];