[Emacs-diffs] emacs/src ChangeLog nsmenu.m

[David Reitter]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     David Reitter <davidswelt>      09/06/14 22:29:17

Modified files:
        src            : ChangeLog nsmenu.m 

Log message:
        nsmenu.m (EmacsTooltip: setText): set height of tooltip.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7573&r2=1.7574
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsmenu.m?cvsroot=emacs&r1=1.22&r2=1.23

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7573
retrieving revision 1.7574
diff -u -b -r1.7573 -r1.7574
--- ChangeLog   14 Jun 2009 18:58:38 -0000      1.7573
+++ ChangeLog   14 Jun 2009 22:29:15 -0000      1.7574
@@ -1,3 +1,7 @@
+2009-06-14  Sidney Markowitz <address@hidden>
+
+       * nsmenu.m (EmacsTooltip: setText): set height of tooltip.
+
 2009-06-14  Adrian Robert  <address@hidden>
 
        * nsfont.m (ns_attribute_value): Remove.

Index: nsmenu.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsmenu.m,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- nsmenu.m    13 Apr 2009 18:45:15 -0000      1.22
+++ nsmenu.m    14 Jun 2009 22:29:17 -0000      1.23
@@ -1439,7 +1439,14 @@
 {
   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];
 }