mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-11 16:08:13 +00:00
Code Issues Releases Activity

* nsterm.m (ns_update_begin): Don't change clip path if it would be

Browse Source 
larger than the NSWindow.

Fixes: debbugs:14934
This commit is contained in:
Jan Djärv 2013-08-08 19:52:00 +02:00
parent a3738d206c
commit 10bf7f5a3d
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2013-08-08 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.m (ns_update_begin): Don't change clip path if it would be
larger than the NSWindow (Bug#14934).
2013-08-08 Dmitry Antipov <dmantipov@yandex.ru>
Redesign redisplay interface to drop global variable updated_window.

19
src/nsterm.m
View File

@ -691,9 +691,18 @@ Free a pool and temporary objects it refers to (callable from C)
{
NSBezierPath *bp;
NSRect r = [view frame];
bp = [[NSBezierPath bezierPathWithRect: r] retain];
[bp setClip];
[bp release];
NSRect cr = [[view window] frame];
/* If a large frame size is set, r may be larger than the window frame
before constrained. In that case don't change the clip path, as we
will clear in to the tool bar and title bar. */
if (r.size.height
+ FRAME_NS_TITLEBAR_HEIGHT (f)
+ FRAME_TOOLBAR_HEIGHT (f) <= cr.size.height)
{
bp = [[NSBezierPath bezierPathWithRect: r] retain];
[bp setClip];
[bp release];
}
}
#endif
@ -784,9 +793,9 @@ Free a pool and temporary objects it refers to (callable from C)
EmacsView *view = FRAME_NS_VIEW (f);
/* if (f == MOUSE_HL_INFO (f)->mouse_face_mouse_frame) */
MOUSE_HL_INFO (f)->mouse_face_defer = 0;
MOUSE_HL_INFO (f)->mouse_face_defer = 0;
block_input ();
block_input ();
[view unlockFocus];
[[view window] flushWindow];