From: Jan Djärv Date: Sun, 5 Oct 2014 18:03:42 +0000 (+0200) Subject: Fix disable toolbar for GNUStep. X-Git-Tag: emacs-25.0.90~2635^2~679^2~116 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d589d252238f18a1eeea0db545ebf43e3eaaa42f;p=emacs.git Fix disable toolbar for GNUStep. * nsterm.m (updateFrameSize:): Only call update_frame_tool_bar if toolbar is visible. Fixes: debbugs:18345 --- 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 + * 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)