Fix GNUStep toolbar not updating.

* src/nsterm.m (updateFrameSize:): Fix GNUStep toolbar not updating.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5711b356f6149b3430cdc3b21ac0f4d72e4f2b64..e7016c6165bb59d3253391b13cdd02f77b34233c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2013-12-08  Jan Djärv  <jan.h.d@swipnet.se>
 
+       * nsterm.m (updateFrameSize:): Fix GNUStep toolbar not updating.
+
        * emacs.c (main): Call fixup_locale a second time for GNUStep.
 
 2013-12-08  Martin Rudalics  <rudalics@gmx.at>

diff --git a/src/nsterm.m b/src/nsterm.m
index 07120c7e451c6663d6c9d7c7fda4fb9eda26b16b..9c87923f32e5730d57427dcc5a205634c66c05a4 100644 (file)
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -5682,6 +5682,11 @@ not_in_argv (NSString *arg)
 
   if (! [self isFullscreen])
     {
+#ifdef NS_IMPL_GNUSTEP
+      // GNUStep does not always update the tool bar height.  Force it.
+      if (toolbar) update_frame_tool_bar (emacsframe);
+#endif
+
       extra = FRAME_NS_TITLEBAR_HEIGHT (emacsframe)
         + FRAME_TOOLBAR_HEIGHT (emacsframe);
     }