mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 21:20:53 -08:00
Code Issues Projects Releases Wiki Activity

Fix crash when resizing GNUstep builds

Browse source 
The toolkit can send far too many resize notifications, so be more
careful when we take action after receiving one.

* src/nsfns.m (ns_set_tool_bar_lines): Remove unneeded NSTRACE.
* src/nsterm.m ([EmacsView viewDidResize:]): Don't report resizes to
Emacs when the same change has already been reported and delayed.
This commit is contained in:
Alan Third 2021-05-02 11:25:40 +01:00
parent d0d95d1614
commit 609d814fdf
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/nsfns.m
View file

@ -668,11 +668,7 @@ ns_set_tool_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
}
}
{
NSTRACE_MSG ("inhibit:%d", inhibit);
adjust_frame_size (f, -1, -1, 2, false, Qtool_bar_lines);
}
adjust_frame_size (f, -1, -1, 2, false, Qtool_bar_lines);
}
static void

11
src/nsterm.m
View file

@ -7308,16 +7308,19 @@ not_in_argv (NSString *arg)
oldw = FRAME_PIXEL_WIDTH (emacsframe);
oldh = FRAME_PIXEL_HEIGHT (emacsframe);
NSTRACE_SIZE ("New size", NSMakeSize (neww, newh));
NSTRACE_SIZE ("Original size", NSMakeSize (oldw, oldh));
/* Don't want to do anything when the view size hasn't changed. */
if (oldh == newh && oldw == neww)
if ((oldh == newh && oldw == neww)
|| (emacsframe->new_size_p
&& newh == emacsframe->new_height
&& neww == emacsframe->new_width))
{
NSTRACE_MSG ("No change");
return;
}
NSTRACE_SIZE ("New size", NSMakeSize (neww, newh));
NSTRACE_SIZE ("Original size", NSMakeSize (oldw, oldh));
#ifdef NS_DRAW_TO_BUFFER
if ([self wantsUpdateLayer])
{