From 8d3c68d7f020990b307d8829bd49b2f93554619e Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Tue, 24 Jan 2017 17:12:17 -0500 Subject: [PATCH] Moved the AppKit text drawer out of the way for now. One last experiment first; didn't seem to matter :S --- darwin/{drawtext.m => _appkit_drawtext.m} | 1 + darwin/{fontmatch.m => _appkit_fontmatch.m} | 0 darwin/uipriv_darwin.h | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) rename darwin/{drawtext.m => _appkit_drawtext.m} (99%) rename darwin/{fontmatch.m => _appkit_fontmatch.m} (100%) diff --git a/darwin/drawtext.m b/darwin/_appkit_drawtext.m similarity index 99% rename from darwin/drawtext.m rename to darwin/_appkit_drawtext.m index 4747e58b..644a2bdf 100644 --- a/darwin/drawtext.m +++ b/darwin/_appkit_drawtext.m @@ -101,6 +101,7 @@ uiDrawTextLayout *uiDrawNewTextLayout(uiAttributedString *s, uiDrawFontDescripto [tl->container setLineFragmentPadding:0]; tl->layoutManager = [[NSLayoutManager alloc] init]; + [tl->layoutManager setTypesetterBehavior:NSTypesetterLatestBehavior]; [tl->layoutManager addTextContainer:tl->container]; [tl->attrstr addLayoutManager:tl->layoutManager]; diff --git a/darwin/fontmatch.m b/darwin/_appkit_fontmatch.m similarity index 100% rename from darwin/fontmatch.m rename to darwin/_appkit_fontmatch.m diff --git a/darwin/uipriv_darwin.h b/darwin/uipriv_darwin.h index bfbf0688..0a15e3bf 100644 --- a/darwin/uipriv_darwin.h +++ b/darwin/uipriv_darwin.h @@ -147,5 +147,5 @@ extern void doManualMove(NSWindow *w, NSEvent *initialEvent); extern void doManualResize(NSWindow *w, NSEvent *initialEvent, uiWindowResizeEdge edge); // fontmatch.m -//TODO extern CTFontDescriptorRef fontdescToCTFontDescriptor(uiDrawFontDescriptor *fd); +extern CTFontDescriptorRef fontdescToCTFontDescriptor(uiDrawFontDescriptor *fd); extern NSFontDescriptor *fontdescToNSFontDescriptor(uiDrawFontDescriptor *fd);