Select different tooltip font size for 64 bit - there MUST be a bug somewhere in GNUstep related to drawing as it screws up certain tooltip window/view drawing

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@40250 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2016-12-01 17:49:43 +00:00
parent 61e111f14f
commit fe636303ee

View file

@ -370,6 +370,8 @@ static BOOL restoreMouseMoved;
selector: @selector(_timedOut:) selector: @selector(_timedOut:)
userInfo: toolTipString userInfo: toolTipString
repeats: YES]; repeats: YES];
// WHy is this here...as it's essentially a no-op...timer has already been
// scheduled in the RunLoop in the previous line...
[[NSRunLoop currentRunLoop] addTimer: timer forMode: NSModalPanelRunLoopMode]; [[NSRunLoop currentRunLoop] addTimer: timer forMode: NSModalPanelRunLoopMode];
timedObject = self; timedObject = self;
timedTag = [theEvent trackingNumber]; timedTag = [theEvent trackingNumber];
@ -627,20 +629,20 @@ static BOOL restoreMouseMoved;
[self _endDisplay]; [self _endDisplay];
} }
size = [[NSUserDefaults standardUserDefaults] size = [[NSUserDefaults standardUserDefaults] floatForKey: @"NSToolTipsFontSize"];
floatForKey: @"NSToolTipsFontSize"];
if (size <= 0) if (size <= 0)
{ {
#if defined(__linux__) && defined(__x86_64__)
size = 11.0;
#else
size = 10.0; size = 10.0;
#endif
} }
attributes = [NSMutableDictionary dictionary]; attributes = [NSMutableDictionary dictionary];
[attributes setObject: [NSFont toolTipsFontOfSize: size] [attributes setObject: [NSFont toolTipsFontOfSize: size] forKey: NSFontAttributeName];
forKey: NSFontAttributeName]; toolTipText = [[NSAttributedString alloc] initWithString: toolTipString attributes: attributes];
toolTipText =
[[NSAttributedString alloc] initWithString: toolTipString
attributes: attributes];
textSize = [toolTipText size]; textSize = [toolTipText size];
// TESTPLANT-MAL-03092016: Merged... // TESTPLANT-MAL-03092016: Merged...