mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-25 07:01:22 +00:00
GSToolTips merge
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@38702 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
a836b68b6a
commit
302adee8ba
1 changed files with 4 additions and 1 deletions
|
@ -351,7 +351,8 @@ static BOOL restoreMouseMoved;
|
||||||
@selector(view:stringForToolTip:point:userData:)] == YES)
|
@selector(view:stringForToolTip:point:userData:)] == YES)
|
||||||
{
|
{
|
||||||
// From testing on OS X, point is in the view's coordinate system
|
// From testing on OS X, point is in the view's coordinate system
|
||||||
// The locationInWindow has been converted to this in [NSWindow _checkTrackingRectangles:forEvent:]
|
// The locationInWindow has been converted to this in
|
||||||
|
// [NSWindow _checkTrackingRectangles:forEvent:]
|
||||||
NSPoint p = [theEvent locationInWindow];
|
NSPoint p = [theEvent locationInWindow];
|
||||||
|
|
||||||
toolTipString = [[provider object] view: view
|
toolTipString = [[provider object] view: view
|
||||||
|
@ -683,6 +684,8 @@ static BOOL restoreMouseMoved;
|
||||||
[(GSTTView*)([window contentView]) setText: toolTipText];
|
[(GSTTView*)([window contentView]) setText: toolTipText];
|
||||||
[window setFrame: rect display: NO];
|
[window setFrame: rect display: NO];
|
||||||
[window orderFront: nil];
|
[window orderFront: nil];
|
||||||
|
// Testplant-MAL-2015-06-26: Main branch merge...
|
||||||
|
// Keeping this testplant fix...
|
||||||
[window display];
|
[window display];
|
||||||
isOpening = NO;
|
isOpening = NO;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue