diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2012-09-11 19:08:02 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2012-09-11 19:08:02 +0200 |
| commit | c4c9756b17a36a45ebdc3e80db2ad1f0211d0cdc (patch) | |
| tree | eae1a7dc067831fb342d82f98e0f027efbf4ffcb | |
| parent | baa26ea03380c3c5f17e9e0c2f47e7509a69895a (diff) | |
| download | emacs-c4c9756b17a36a45ebdc3e80db2ad1f0211d0cdc.tar.gz emacs-c4c9756b17a36a45ebdc3e80db2ad1f0211d0cdc.tar.bz2 emacs-c4c9756b17a36a45ebdc3e80db2ad1f0211d0cdc.zip | |
* nsterm.h: Add delay parameter to updateFrameSize.
* nsterm.m (ns_judge_scroll_bars): Pass NO to updateFrameSize.
(updateFrameSize:): Add delay parameter to updateFrameSize, send it
to change_frame_size.
(windowDidResize:): Pass YES to updateFrameSize.
Fixes: debbugs:12388
| -rw-r--r-- | src/ChangeLog | 9 | ||||
| -rw-r--r-- | src/nsterm.h | 2 | ||||
| -rw-r--r-- | src/nsterm.m | 8 |
3 files changed, 14 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 46f1847f7f6..6cb0e65281a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2012-09-11 Jan Djärv <jan.h.d@swipnet.se> + + * nsterm.m (ns_judge_scroll_bars): Pass NO to updateFrameSize. + (updateFrameSize:): Add delay parameter to updateFrameSize, send it + to change_frame_size (Bug#12388). + (windowDidResize:): Pass YES to updateFrameSize. + + * nsterm.h: Add delay parameter to updateFrameSize. + 2012-09-11 Dmitry Antipov <dmantipov@yandex.ru> Discard killed buffers from deleted window and frame objects. diff --git a/src/nsterm.h b/src/nsterm.h index b1836692b2c..f3adab883a1 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -103,7 +103,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ - (void) setWindowClosing: (BOOL)closing; - (EmacsToolbar *) toolbar; - (void) deleteWorkingText; -- (void) updateFrameSize; +- (void) updateFrameSize: (BOOL) delay; #ifdef NS_IMPL_GNUSTEP /* Not declared, but useful. */ diff --git a/src/nsterm.m b/src/nsterm.m index 798c9758376..f9611fd1210 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -3727,7 +3727,7 @@ ns_judge_scroll_bars (struct frame *f) } if (removed) - [eview updateFrameSize]; + [eview updateFrameSize: NO]; } @@ -5362,7 +5362,7 @@ not_in_argv (NSString *arg) return NO; } -- (void) updateFrameSize +- (void) updateFrameSize: (BOOL) delay; { NSWindow *window = [self window]; NSRect wr = [window frame]; @@ -5400,7 +5400,7 @@ not_in_argv (NSString *arg) NSView *view = FRAME_NS_VIEW (emacsframe); FRAME_PIXEL_WIDTH (emacsframe) = neww; FRAME_PIXEL_HEIGHT (emacsframe) = newh; - change_frame_size (emacsframe, rows, cols, 0, 0, 1); + change_frame_size (emacsframe, rows, cols, 0, delay, 0); SET_FRAME_GARBAGED (emacsframe); cancel_mouse_face (emacsframe); [view setFrame: NSMakeRect (0, 0, neww, newh)]; @@ -5503,7 +5503,7 @@ not_in_argv (NSString *arg) x_set_window_size (emacsframe, 0, cols, rows); else { - [self updateFrameSize]; + [self updateFrameSize: YES]; } } #endif |