aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2012-09-08 19:22:15 +0200
committerJan Djärv2012-09-08 19:22:15 +0200
commit0b3b1d23224845e760ad7ef6e316cbac05f54093 (patch)
treea5c420b41242fa2e990efbf0bd0968f42a3432ba /src
parente6aca219893bfab1ae669f5172738555ac56d3b9 (diff)
downloademacs-0b3b1d23224845e760ad7ef6e316cbac05f54093.tar.gz
emacs-0b3b1d23224845e760ad7ef6e316cbac05f54093.zip
* nsterm.m (updateFrameSize): Call setFrame: on the view when size
changes. Fixes: debbugs:12088
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/nsterm.m2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ec6e39ad0b5..dd4719e25c6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12012-09-08 Jan Djärv <jan.h.d@swipnet.se>
2
3 * nsterm.m (updateFrameSize): Call setFrame: on the view when size
4 changes (Bug#12088).
5
12012-09-08 Chong Yidong <cyd@gnu.org> 62012-09-08 Chong Yidong <cyd@gnu.org>
2 7
3 * syntax.c (Fstring_to_syntax): Doc fix. 8 * syntax.c (Fstring_to_syntax): Doc fix.
diff --git a/src/nsterm.m b/src/nsterm.m
index 73372238cf4..583db79b904 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -5374,11 +5374,13 @@ not_in_argv (NSString *arg)
5374 5374
5375 if (oldr != rows || oldc != cols || neww != oldw || newh != oldh) 5375 if (oldr != rows || oldc != cols || neww != oldw || newh != oldh)
5376 { 5376 {
5377 NSView *view = FRAME_NS_VIEW (emacsframe);
5377 FRAME_PIXEL_WIDTH (emacsframe) = neww; 5378 FRAME_PIXEL_WIDTH (emacsframe) = neww;
5378 FRAME_PIXEL_HEIGHT (emacsframe) = newh; 5379 FRAME_PIXEL_HEIGHT (emacsframe) = newh;
5379 change_frame_size (emacsframe, rows, cols, 0, 0, 1); 5380 change_frame_size (emacsframe, rows, cols, 0, 0, 1);
5380 SET_FRAME_GARBAGED (emacsframe); 5381 SET_FRAME_GARBAGED (emacsframe);
5381 cancel_mouse_face (emacsframe); 5382 cancel_mouse_face (emacsframe);
5383 [view setFrame: NSMakeRect (0, 0, neww, newh)];
5382 } 5384 }
5383} 5385}
5384 5386