From b3e42b7083e6d13701179e22774b4803b1054392 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20Dj=C3=A4rv?= <jan.h.d@swipnet.se>
Date: Sun, 8 Dec 2013 13:59:14 +0100
Subject: [PATCH] Fix GNUStep toolbar not updating.

* src/nsterm.m (updateFrameSize:): Fix GNUStep toolbar not updating.
---
 src/ChangeLog | 2 ++
 src/nsterm.m  | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/src/ChangeLog b/src/ChangeLog
index 5711b356f61..e7016c6165b 100644
--- 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 07120c7e451..9c87923f32e 100644
--- 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);
     }
-- 
2.39.2