Merge more code with gui main branch revision 39484

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@39504 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2016-03-09 15:09:26 +00:00
parent 6360094289
commit 2088ec1ab5
5 changed files with 108 additions and 51 deletions

View file

@ -643,6 +643,17 @@ static BOOL restoreMouseMoved;
attributes: attributes];
textSize = [toolTipText size];
// TESTPLANT-MAL-03092016: Merged...
if (textSize.width > 300)
{
NSRect rect;
rect = [toolTipText boundingRectWithSize: NSMakeSize(300, 1e7)
options: 0];
textSize = rect.size;
// This extra pixel is needed, otherwise the last line gets cut off.
textSize.height += 1;
}
/* Create window just off the current mouse position
* Constrain it to be on screen, shrinking if necessary.
*/