aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Robert2009-02-24 12:44:27 +0000
committerAdrian Robert2009-02-24 12:44:27 +0000
commitf097e22350db31631c3cbda77f50e98400c89512 (patch)
tree4ad8728c7f50ac4681cbd5fcd26873098d8ac68d
parentcf06418438e5329f5627fc09ca1c912831dd7cf8 (diff)
downloademacs-f097e22350db31631c3cbda77f50e98400c89512.tar.gz
emacs-f097e22350db31631c3cbda77f50e98400c89512.zip
* nsterm.m (ns_ring_bell): Convert rect to window coordinates
before caching.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/nsterm.m6
2 files changed, 7 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c6a1abd6a3e..60dc389335b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12009-02-24 Adrian Robert <Adrian.B.Robert@gmail.com>
2
3 * nsterm.m (ns_ring_bell): Convert rect to window coordinates
4 before caching.
5
12009-02-24 Kenichi Handa <handa@m17n.org> 62009-02-24 Kenichi Handa <handa@m17n.org>
2 7
3 * fontset.c (fontset_find_font): Fix the condition for checking 8 * fontset.c (fontset_find_font): Fix the condition for checking
diff --git a/src/nsterm.m b/src/nsterm.m
index b8639834e57..c0b68bfc198 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -844,11 +844,9 @@ ns_ring_bell ()
844 r.origin.y += (r.size.height - dim.y) / 2; 844 r.origin.y += (r.size.height - dim.y) / 2;
845 r.size.width = dim.x; 845 r.size.width = dim.x;
846 r.size.height = dim.y; 846 r.size.height = dim.y;
847 /* XXX: cacheImageInRect under GNUstep does not account for 847 surr = NSInsetRect (r, -2, -2);
848 offset in x_set_window_size, so overestimate (4 fine on Cocoa) */
849 surr = NSInsetRect (r, -10, -10);
850 ns_focus (frame, &surr, 1); 848 ns_focus (frame, &surr, 1);
851 [[view window] cacheImageInRect: surr]; 849 [[view window] cacheImageInRect: [view convertRect: surr toView:nil]];
852 [ns_lookup_indexed_color (NS_FACE_FOREGROUND 850 [ns_lookup_indexed_color (NS_FACE_FOREGROUND
853 (FRAME_DEFAULT_FACE (frame)), frame) set]; 851 (FRAME_DEFAULT_FACE (frame)), frame) set];
854 NSRectFill (r); 852 NSRectFill (r);