From b8c9a4e36dc3525fa03e0e0d862693dc26137b5f Mon Sep 17 00:00:00 2001 From: Jan D Date: Sat, 15 Nov 2014 14:35:15 +0100 Subject: [PATCH] Fix getting frame size wrong when restoring desktop. * nsmenu.m (update_frame_tool_bar): If tool bar changes height, call updateFrameSize. --- src/ChangeLog | 3 +++ src/nsmenu.m | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 16ec7125967..b431dd255a9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2014-11-15 Jan Djärv + * nsmenu.m (update_frame_tool_bar): If tool bar changes height, + call updateFrameSize. + * nsterm.m (setFrame:): Remove call to display (Bug#18757). 2014-11-14 Jan Djärv diff --git a/src/nsmenu.m b/src/nsmenu.m index 24842241f37..323b287a401 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m @@ -1072,10 +1072,13 @@ update_frame_tool_bar (struct frame *f) EmacsView *view = FRAME_NS_VIEW (f); NSWindow *window = [view window]; EmacsToolbar *toolbar = [view toolbar]; + int oldh; if (view == nil || toolbar == nil) return; block_input (); + oldh = FRAME_TOOLBAR_HEIGHT (f); + #ifdef NS_IMPL_COCOA [toolbar clearActive]; #else @@ -1182,6 +1185,8 @@ update_frame_tool_bar (struct frame *f) if (FRAME_TOOLBAR_HEIGHT (f) < 0) // happens if frame is fullscreen. FRAME_TOOLBAR_HEIGHT (f) = 0; + if (oldh != FRAME_TOOLBAR_HEIGHT (f)) + [view updateFrameSize:YES]; if (view->wait_for_tool_bar && FRAME_TOOLBAR_HEIGHT (f) > 0) [view setNeedsDisplay: YES]; -- 2.39.5