Commit c4c9756b authored by Jan Djärv's avatar Jan Djärv

* nsterm.h: Add delay parameter to updateFrameSize.

* nsterm.m (ns_judge_scroll_bars): Pass NO to updateFrameSize.
(updateFrameSize:): Add delay parameter to updateFrameSize, send it
to change_frame_size.
(windowDidResize:): Pass YES to updateFrameSize.

Fixes: debbugs:12388
parent baa26ea0
2012-09-11 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.m (ns_judge_scroll_bars): Pass NO to updateFrameSize.
(updateFrameSize:): Add delay parameter to updateFrameSize, send it
to change_frame_size (Bug#12388).
(windowDidResize:): Pass YES to updateFrameSize.
* nsterm.h: Add delay parameter to updateFrameSize.
2012-09-11 Dmitry Antipov <dmantipov@yandex.ru>
Discard killed buffers from deleted window and frame objects.
......
......@@ -103,7 +103,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
- (void) setWindowClosing: (BOOL)closing;
- (EmacsToolbar *) toolbar;
- (void) deleteWorkingText;
- (void) updateFrameSize;
- (void) updateFrameSize: (BOOL) delay;
#ifdef NS_IMPL_GNUSTEP
/* Not declared, but useful. */
......
......@@ -3727,7 +3727,7 @@ overwriting cursor (usually when cursor on a tab) */
}
if (removed)
[eview updateFrameSize];
[eview updateFrameSize: NO];
}
......@@ -5362,7 +5362,7 @@ - (BOOL)windowShouldClose: (id)sender
return NO;
}
- (void) updateFrameSize
- (void) updateFrameSize: (BOOL) delay;
{
NSWindow *window = [self window];
NSRect wr = [window frame];
......@@ -5400,7 +5400,7 @@ - (void) updateFrameSize
NSView *view = FRAME_NS_VIEW (emacsframe);
FRAME_PIXEL_WIDTH (emacsframe) = neww;
FRAME_PIXEL_HEIGHT (emacsframe) = newh;
change_frame_size (emacsframe, rows, cols, 0, 0, 1);
change_frame_size (emacsframe, rows, cols, 0, delay, 0);
SET_FRAME_GARBAGED (emacsframe);
cancel_mouse_face (emacsframe);
[view setFrame: NSMakeRect (0, 0, neww, newh)];
......@@ -5503,7 +5503,7 @@ - (void)windowDidResize: (NSNotification *)notification
x_set_window_size (emacsframe, 0, cols, rows);
else
{
[self updateFrameSize];
[self updateFrameSize: YES];
}
}
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment