From 5ee6f6296a21c3c2e31a50f5bbdc586708cedd80 Mon Sep 17 00:00:00 2001 From: David Reitter Date: Sun, 14 Jun 2009 22:29:15 +0000 Subject: [PATCH] nsmenu.m (EmacsTooltip: setText): set height of tooltip. --- src/ChangeLog | 4 ++++ src/nsmenu.m | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 8b3ebdc763e..08ac6ceac9a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2009-06-14 Sidney Markowitz + + * nsmenu.m (EmacsTooltip: setText): set height of tooltip. + 2009-06-14 Adrian Robert * nsfont.m (ns_attribute_value): Remove. diff --git a/src/nsmenu.m b/src/nsmenu.m index 190bbb37624..aab3016e5e8 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m @@ -1439,7 +1439,14 @@ update_frame_tool_bar (FRAME_PTR f) { NSString *str = [NSString stringWithUTF8String: text]; NSRect r = [textField frame]; - r.size.width = [[[textField font] screenFont] widthOfString: str] + 8; + NSSize textSize = [str sizeWithAttributes: + [NSDictionary dictionaryWithObject: [[textField font] screenFont] + forKey: NSFontAttributeName]]; + NSSize padSize = [[[textField font] screenFont] + boundingRectForFont].size; + + r.size.width = textSize.width + padSize.width/2; + r.size.height = textSize.height + padSize.height/2; [textField setFrame: r]; [textField setStringValue: str]; } -- 2.39.2