[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 12c5ca4 7/7: Fix some macOS problems
From: |
Alan Third |
Subject: |
master 12c5ca4 7/7: Fix some macOS problems |
Date: |
Sat, 31 Jul 2021 06:15:40 -0400 (EDT) |
branch: master
commit 12c5ca4d825496b3c7304b75ab82a6fabdc2023d
Author: Alan Third <alan@idiocy.org>
Commit: Alan Third <alan@idiocy.org>
Fix some macOS problems
* src/nsmenu.m (update_frame_tool_bar): Make sure the toolbar isn't
displayed when it's not supposed to be.
* src/nsterm.m ([EmacsView layoutSublayersOfLayer:]): Reinstate code
intended to prevent a crash when running redisplay.
---
src/nsmenu.m | 4 ++--
src/nsterm.m | 17 ++++++-----------
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/src/nsmenu.m b/src/nsmenu.m
index 673c042..bb0dd26 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -1089,10 +1089,10 @@ update_frame_tool_bar (struct frame *f)
#undef TOOLPROP
}
- if (![toolbar isVisible])
+ if ([toolbar isVisible] != FRAME_EXTERNAL_TOOL_BAR (f))
{
f->output_data.ns->in_animation = 1;
- [toolbar setVisible: YES];
+ [toolbar setVisible: FRAME_EXTERNAL_TOOL_BAR (f)];
f->output_data.ns->in_animation = 0;
}
diff --git a/src/nsterm.m b/src/nsterm.m
index 29a86e4..3676418 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -7945,20 +7945,15 @@ not_in_argv (NSString *arg)
crashes. I think it's because this code will always be run
within the run loop and for whatever reason processing input
is dangerous. This technique was stolen wholesale from
- nsmenu.m and seems to work.
-
- FIXME: I can't provoke a crash using layoutSublayersOfLayer,
- however I can't understand why it would be different from
- viewWillDraw. I'll leave this commented out for now, but if
- nobody reports a crash it can be removed. */
- // bool owfi = waiting_for_input;
- // waiting_for_input = 0;
- // block_input ();
+ nsmenu.m and seems to work. */
+ bool owfi = waiting_for_input;
+ waiting_for_input = 0;
+ block_input ();
redisplay ();
- // unblock_input ();
- // waiting_for_input = owfi;
+ unblock_input ();
+ waiting_for_input = owfi;
}
}
#endif
- master updated (0992335 -> 12c5ca4), Alan Third, 2021/07/31
- master 960f3fc 3/7: Change NS port resize detection, Alan Third, 2021/07/31
- 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 <=