[Emacs-diffs] trunk r118055: Fix disable toolbar for GNUStep.

[Jan D.]

------------------------------------------------------------
revno: 118055
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18345
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2014-10-05 20:03:42 +0200
message:
  Fix disable toolbar for GNUStep.
  
  * nsterm.m (updateFrameSize:): Only call update_frame_tool_bar
  if toolbar is visible.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsterm.m                   nsterm.m-20091113204419-o5vbwnq5f7feedwu-8747

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-10-05 17:51:11 +0000
+++ b/src/ChangeLog     2014-10-05 18:03:42 +0000
@@ -1,5 +1,8 @@
 2014-10-05  Jan Djärv  <address@hidden>
 
+       * 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).
 

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2014-10-05 15:46:10 +0000
+++ b/src/nsterm.m      2014-10-05 18:03:42 +0000
@@ -5827,7 +5827,8 @@
     {
 #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)