summaryrefslogtreecommitdiff
path: root/src/nsterm.h
diff options
context:
space:
mode:
authorAlan Third <alan@idiocy.org>2022-03-30 22:40:03 +0100
committerAlan Third <alan@idiocy.org>2022-04-08 22:43:05 +0100
commit9d20b47ad34ff8b409e83198406883f70782c295 (patch)
tree3cc179111c53e481e2e2ec5906aad4aad3d9be83 /src/nsterm.h
parent022a1f48a4e2005be7aa66b67eb2f17f8386c853 (diff)
downloademacs-9d20b47ad34ff8b409e83198406883f70782c295.tar.gz
Fix scrollbars on macOS 10.13 and below (bug#54623)
Make any build on macOS 10.13 and below follow the same drawing path as the GNUstep port. macOS 10.14 and above will use EmacsLayer. * src/nsterm.h (EmacsLayer): * src/nsterm.m ([EmacsView makeBackingLayer]): ([EmacsView unlockFocus]): ([EmacsView windowDidChangeBackingProperties:]): ([EmacsView copyRect:to:]): Remove any code required for macOS 10.13 and below, and fix the #if's to enforce strict separation of the drawing paths. (ns_update_end): (ns_unfocus): Fix #ifs so that flushWindow is called on old macOS versions as well as GNUstep.
Diffstat (limited to 'src/nsterm.h')
-rw-r--r--src/nsterm.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nsterm.h b/src/nsterm.h
index f0276461231..4cba5c0be8f 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -487,7 +487,7 @@ typedef id instancetype;
#endif
- (int)fullscreenState;
-#ifdef NS_IMPL_COCOA
+#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
- (void)lockFocus;
- (void)unlockFocus;
#endif
@@ -698,7 +698,7 @@ typedef id instancetype;
+ (CGFloat)scrollerWidth;
@end
-#ifdef NS_IMPL_COCOA
+#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
@interface EmacsLayer : CALayer
{
NSMutableArray *cache;