summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog3
-rw-r--r--src/nsterm.m3
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d3874dbbadc..0b58cdc1662 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
2014-10-05 Jan Djärv <jan.h.d@swipnet.se>
+ * nsterm.m (updateFrameSize:): Only call update_frame_tool_bar
+ if toolbar is visible.
+
* nsfont.m (nsfont_draw): Use CGFloat for GNUstep newer than
0.23 (Bug#18030).
diff --git a/src/nsterm.m b/src/nsterm.m
index ea8b4f726ff..b0a2994bcf5 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -5827,7 +5827,8 @@ not_in_argv (NSString *arg)
{
#ifdef NS_IMPL_GNUSTEP
// GNUstep does not always update the tool bar height. Force it.
- if (toolbar) update_frame_tool_bar (emacsframe);
+ if (toolbar && [toolbar isVisible])
+ update_frame_tool_bar (emacsframe);
#endif
extra = FRAME_NS_TITLEBAR_HEIGHT (emacsframe)