Commit 609d814f authored by Alan Third's avatar Alan Third
Browse files

Fix crash when resizing GNUstep builds

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.
parent d0d95d16
Pipeline #10595 failed with stages
in 13 minutes and 20 seconds
......@@ -668,11 +668,7 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side.
}
}
{
NSTRACE_MSG ("inhibit:%d", inhibit);
adjust_frame_size (f, -1, -1, 2, false, Qtool_bar_lines);
}
}
static void
......
......@@ -7308,16 +7308,19 @@ - (void)viewDidResize:(NSNotification *)notification
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])
{
......
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