Mercurial > emacs

diff src/nsmenu.m @ 109092:babf8e935ea8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename FRAME_NS_TOOLBAR_HEIGHT to FRAME_TOOLBAR_HEIGHT to aid common code. * nsmenu.m (update_frame_tool_bar, free_frame_tool_bar): Update FRAME_TOOLBAR_HEIGHT. * nsterm.h (FRAME_NS_TOOLBAR_HEIGHT): Rename to FRAME_TOOLBAR_HEIGH * nsterm.m (x_set_window_size, initFrameFromEmacs): Renamed FRAME_NS_TOOLBAR_HEIGHT to FRAME_TOOLBAR_HEIGHT.
author Jan D <jan.h.d@swipnet.se>
date Thu, 01 Jul 2010 14:16:33 +0200
parents b4da23aa9b59
children 750db9f3e6d8
line wrap: on
line diff
--- a/src/nsmenu.m	Thu Jul 01 12:45:26 2010 +0200
+++ b/src/nsmenu.m	Thu Jul 01 14:16:33 2010 +0200
@@ -1001,6 +1001,7 @@
 {
   BLOCK_INPUT;
   [[FRAME_NS_VIEW (f) toolbar] setVisible: NO];
+  FRAME_TOOLBAR_HEIGHT (f) = 0;
   UNBLOCK_INPUT;
 }
 
@@ -1011,7 +1012,9 @@
    -------------------------------------------------------------------------- */
 {
   int i;
-  EmacsToolbar *toolbar = [FRAME_NS_VIEW (f) toolbar];
+  EmacsView *view = FRAME_NS_VIEW (f);
+  NSWindow *window = [view window];
+  EmacsToolbar *toolbar = [view toolbar];
 
   BLOCK_INPUT;
   [toolbar clearActive];
@@ -1097,6 +1100,9 @@
       [newDict release];
     }
 
+  FRAME_TOOLBAR_HEIGHT (f) =
+    NSHeight ([window frameRectForContentRect: NSMakeRect (0, 0, 0, 0)])
+    - FRAME_NS_TITLEBAR_HEIGHT (f);
   UNBLOCK_INPUT;
 }