From: martin rudalics <rudalics@gmx.at>
To: PEDRO ANDRES ARANDA GUTIERREZ <paranda@it.uc3m.es>
Cc: 48157@debbugs.gnu.org
Subject: bug#48157: Emacs-28 on Mac: corrupted GUI when setting default-frame-alist
Date: Mon, 3 May 2021 09:56:45 +0200 [thread overview]
Message-ID: <9a3da27e-277a-61a0-afdb-5e791f3966bb@gmx.at> (raw)
In-Reply-To: <CAPoMwp32JRSLtQy4iFddu3tnVpq+KpRd=asc6=u6RfCLeXrMQw@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 157 bytes --]
> I retried a couple of minutes ago and it continues to startup weirdly on my
> MacBook Air
Did you try Alan's latest fixes (I attach them here)?
martin
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-incorrect-resizing-behaviour-on-macOS-bug-48157-.patch --]
[-- Type: text/x-patch; name="0001-Fix-incorrect-resizing-behaviour-on-macOS-bug-48157-.patch", Size: 2437 bytes --]
>From c4048b3cd6841a7f2ccdfb3f6c880c9ee176390a Mon Sep 17 00:00:00 2001
From: Alan Third <alan@idiocy.org>
Date: Sun, 2 May 2021 22:38:13 +0100
Subject: [PATCH] Fix incorrect resizing behaviour on macOS (bug#48157,
bug#48162)
* src/nsterm.m ([EmacsView viewDidResize:]): The drawing buffer can be
resized independently of Emacs's idea of the frame size.
Co-authored-by: martin rudalics <rudalics@gmx.at>
---
src/nsterm.m | 36 ++++++++++++++++++++++--------------
1 file changed, 22 insertions(+), 14 deletions(-)
diff --git a/src/nsterm.m b/src/nsterm.m
index 6e7ab1266b..bb20886ab1 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -7303,16 +7303,34 @@ - (void)viewDidResize:(NSNotification *)notification
NSTRACE ("[EmacsView viewDidResize]");
+#ifdef NS_DRAW_TO_BUFFER
+ /* If the buffer size doesn't match the view's backing size, destroy
+ the buffer and let it be recreated at the correct size later. */
+ if ([self wantsUpdateLayer] && surface)
+ {
+ NSRect surfaceRect = {{0, 0}, [surface getSize]};
+ NSRect frameRect = [[self window] convertRectToBacking:frame];
+
+ if (!NSEqualRects (frameRect, surfaceRect))
+ {
+ [surface release];
+ surface = nil;
+
+ [self setNeedsDisplay:YES];
+ }
+ }
+#endif
+
neww = (int)NSWidth (frame);
newh = (int)NSHeight (frame);
oldw = FRAME_PIXEL_WIDTH (emacsframe);
oldh = FRAME_PIXEL_HEIGHT (emacsframe);
/* Don't want to do anything when the view size hasn't changed. */
- if ((oldh == newh && oldw == neww)
- || (emacsframe->new_size_p
- && newh == emacsframe->new_height
- && neww == emacsframe->new_width))
+ if (emacsframe->new_size_p
+ ? (newh == emacsframe->new_height
+ && neww == emacsframe->new_width)
+ : (oldh == newh && oldw == neww))
{
NSTRACE_MSG ("No change");
return;
@@ -7321,16 +7339,6 @@ - (void)viewDidResize:(NSNotification *)notification
NSTRACE_SIZE ("New size", NSMakeSize (neww, newh));
NSTRACE_SIZE ("Original size", NSMakeSize (oldw, oldh));
-#ifdef NS_DRAW_TO_BUFFER
- if ([self wantsUpdateLayer])
- {
- [surface release];
- surface = nil;
-
- [self setNeedsDisplay:YES];
- }
-#endif
-
change_frame_size (emacsframe, neww, newh, false, YES, false);
SET_FRAME_GARBAGED (emacsframe);
--
2.30.2
next prev parent reply other threads:[~2021-05-03 7:56 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-02 10:37 bug#48157: Emacs-28 on Mac: corrupted GUI when setting default-frame-alist PEDRO ANDRES ARANDA GUTIERREZ
2021-05-02 11:39 ` Alan Third
2021-05-02 16:17 ` martin rudalics
2021-05-03 6:49 ` PEDRO ANDRES ARANDA GUTIERREZ
2021-05-03 7:56 ` martin rudalics [this message]
[not found] ` <CAPoMwp0xhMSa9KUaTmmYsQZBJjtLpY-2Kz5qvuLZLVpxN5Dzsw@mail.gmail.com>
[not found] ` <CAPoMwp2X66+512Yj8aWna5WzYj=Luqa8r7c+JZjhiOmhMWuZ7g@mail.gmail.com>
[not found] ` <YI/cJ6q7Zgw9fCHr@idiocy.org>
[not found] ` <7B3D9FF8-ED16-4D1F-84FF-3F900FD8DB0F@it.uc3m.es>
2021-05-03 17:49 ` Alan Third
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9a3da27e-277a-61a0-afdb-5e791f3966bb@gmx.at \
--to=rudalics@gmx.at \
--cc=48157@debbugs.gnu.org \
--cc=paranda@it.uc3m.es \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).