[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r109984: * nsterm.h: Add delay parame
From: |
Jan D. |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r109984: * nsterm.h: Add delay parameter to updateFrameSize. |
Date: |
Tue, 11 Sep 2012 19:08:02 +0200 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 109984
fixes bug: http://debbugs.gnu.org/12388
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Tue 2012-09-11 19:08:02 +0200
message:
* 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.
modified:
src/ChangeLog
src/nsterm.h
src/nsterm.m
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-09-11 15:42:50 +0000
+++ b/src/ChangeLog 2012-09-11 17:08:02 +0000
@@ -1,3 +1,12 @@
+2012-09-11 Jan Djärv <address@hidden>
+
+ * 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 <address@hidden>
Discard killed buffers from deleted window and frame objects.
=== modified file 'src/nsterm.h'
--- a/src/nsterm.h 2012-09-08 12:48:33 +0000
+++ b/src/nsterm.h 2012-09-11 17:08:02 +0000
@@ -103,7 +103,7 @@
- (void) setWindowClosing: (BOOL)closing;
- (EmacsToolbar *) toolbar;
- (void) deleteWorkingText;
-- (void) updateFrameSize;
+- (void) updateFrameSize: (BOOL) delay;
#ifdef NS_IMPL_GNUSTEP
/* Not declared, but useful. */
=== modified file 'src/nsterm.m'
--- a/src/nsterm.m 2012-09-10 21:01:45 +0000
+++ b/src/nsterm.m 2012-09-11 17:08:02 +0000
@@ -3727,7 +3727,7 @@
}
if (removed)
- [eview updateFrameSize];
+ [eview updateFrameSize: NO];
}
@@ -5362,7 +5362,7 @@
return NO;
}
-- (void) updateFrameSize
+- (void) updateFrameSize: (BOOL) delay;
{
NSWindow *window = [self window];
NSRect wr = [window frame];
@@ -5400,7 +5400,7 @@
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 @@
x_set_window_size (emacsframe, 0, cols, rows);
else
{
- [self updateFrameSize];
+ [self updateFrameSize: YES];
}
}
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r109984: * nsterm.h: Add delay parameter to updateFrameSize.,
Jan D. <=