[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 960f3fc 3/7: Change NS port resize detection
From: |
Alan Third |
Subject: |
master 960f3fc 3/7: Change NS port resize detection |
Date: |
Sat, 31 Jul 2021 06:15:39 -0400 (EDT) |
branch: master
commit 960f3fc589d8d021e1ed1a505e660929e4c13d0a
Author: Alan Third <alan@idiocy.org>
Commit: Alan Third <alan@idiocy.org>
Change NS port resize detection
* src/nsterm.m ([EmacsView windowDidResize:]): Remove function, it's
not performing a useful function any more.
([EmacsView viewDidResize]):
([EmacsView resizeWithOldSuperviewSize:]): Replace viewDidResize with
resizeWithOldSuperviewSize.
([EmacsView initFrameFromEmacs:]): Remove the view resize notification
as we don't need it any more.
---
src/nsterm.m | 82 +++++++++++-------------------------------------------------
1 file changed, 15 insertions(+), 67 deletions(-)
diff --git a/src/nsterm.m b/src/nsterm.m
index 569365d..a005c4e 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -7020,43 +7020,6 @@ not_in_argv (NSString *arg)
}
-- (void)windowDidResize: (NSNotification *)notification
-{
- NSTRACE ("[EmacsView windowDidResize:]");
- if (!FRAME_LIVE_P (emacsframe))
- {
- NSTRACE_MSG ("Ignored (frame dead)");
- return;
- }
- if (emacsframe->output_data.ns->in_animation)
- {
- NSTRACE_MSG ("Ignored (in animation)");
- return;
- }
-
- if (! [self fsIsNative])
- {
- NSWindow *theWindow = [notification object];
- /* We can get notification on the non-FS window when in
- fullscreen mode. */
- if ([self window] != theWindow) return;
- }
-
- NSTRACE_RECT ("frame", [[notification object] frame]);
-
-#ifdef NS_IMPL_GNUSTEP
- NSWindow *theWindow = [notification object];
-
- /* In GNUstep, at least currently, it's possible to get a didResize
- without getting a willResize, therefore we need to act as if we got
- the willResize now. */
- NSSize sz = [theWindow frame].size;
- sz = [self windowWillResize: theWindow toSize: sz];
-#endif /* NS_IMPL_GNUSTEP */
-
- ns_send_appdefined (-1);
-}
-
#ifdef NS_IMPL_COCOA
- (void)viewDidEndLiveResize
{
@@ -7074,38 +7037,30 @@ not_in_argv (NSString *arg)
#endif /* NS_IMPL_COCOA */
-- (void)viewDidResize:(NSNotification *)notification
+- (void)resizeWithOldSuperviewSize: (NSSize)oldSize
{
- NSRect frame = [self frame];
- int neww, newh, oldw, oldh;
+ NSRect frame;
+ int width, height;
- if (! FRAME_LIVE_P (emacsframe))
- return;
+ NSTRACE ("[EmacsView resizeWithOldSuperviewSize:]");
- NSTRACE ("[EmacsView viewDidResize]");
+ [super resizeWithOldSuperviewSize:oldSize];
- neww = (int)NSWidth (frame);
- newh = (int)NSHeight (frame);
- oldw = FRAME_PIXEL_WIDTH (emacsframe);
- oldh = FRAME_PIXEL_HEIGHT (emacsframe);
+ if (! FRAME_LIVE_P (emacsframe))
+ return;
- /* Don't want to do anything when the view size hasn't changed. */
- if (emacsframe->new_size_p
- ? (newh == emacsframe->new_height
- && neww == emacsframe->new_width)
- : (oldh == newh && oldw == neww))
- {
- NSTRACE_MSG ("No change");
- return;
- }
+ frame = [self frame];
+ width = (int)NSWidth (frame);
+ height = (int)NSHeight (frame);
- NSTRACE_SIZE ("New size", NSMakeSize (neww, newh));
- NSTRACE_SIZE ("Original size", NSMakeSize (oldw, oldh));
+ NSTRACE_SIZE ("New size", NSMakeSize (width, height));
+ NSTRACE_SIZE ("Original size", size);
- change_frame_size (emacsframe, neww, newh, false, YES, false);
+ change_frame_size (emacsframe, width, height, false, YES, false);
SET_FRAME_GARBAGED (emacsframe);
cancel_mouse_face (emacsframe);
+ ns_send_appdefined (-1);
}
@@ -7269,7 +7224,7 @@ not_in_argv (NSString *arg)
/* These settings mean AppKit will retain the contents of the frame
on resize. Unfortunately it also means the frame will not be
automatically marked for display, but we can do that ourselves in
- viewDidResize. */
+ resizeWithOldSuperviewSize. */
[self setWantsLayer:YES];
[self setLayerContentsRedrawPolicy:
NSViewLayerContentsRedrawOnSetNeedsDisplay];
@@ -7293,13 +7248,6 @@ not_in_argv (NSString *arg)
[NSApp registerServicesMenuSendTypes: ns_send_types
returnTypes: [NSArray array]];
- /* Set up view resize notifications. */
- [self setPostsFrameChangedNotifications:YES];
- [[NSNotificationCenter defaultCenter]
- addObserver:self
- selector:@selector (viewDidResize:)
- name:NSViewFrameDidChangeNotification object:nil];
-
ns_window_num++;
return self;
}
- master updated (0992335 -> 12c5ca4), Alan Third, 2021/07/31
- master 960f3fc 3/7: Change NS port resize detection,
Alan Third <=
- master a4d2c88 1/7: Simplify macOS drawing code, Alan Third, 2021/07/31
- master 0b5cf48 5/7: Move NS port toolbar handling to the window, Alan Third, 2021/07/31
- master 5a48c99 6/7: Move parent frame setting code into EmacsWindow, Alan Third, 2021/07/31
- master 1535c81 2/7: Tidy up NS port OS window handling, Alan Third, 2021/07/31
- master 1ba02d8 4/7: Fix macOS live resize drawing, Alan Third, 2021/07/31
- master 12c5ca4 7/7: Fix some macOS problems, Alan Third, 2021/07/31