277437 - [Cocoa] GC#drawText font background issue

2 files changed, 11 insertions, 0 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Font.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Font.java
index ff87b982a4..b432b11234 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Font.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Font.java
@@ -299,6 +299,7 @@ void init(String name, float height, int style, String nsName) {
 	} else {
 		NSString family = NSString.stringWith(name);
 		NSFont nsFont = NSFont.fontWithName(family, size);
+		if (nsFont == null) nsFont = NSFont.systemFontOfSize(size);
 		NSFontManager manager = NSFontManager.sharedFontManager();
 		if (nsFont != null) {
 			if ((style & (SWT.BOLD | SWT.ITALIC)) == 0) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java
index 3af27f92a6..45686e0eea 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java
@@ -1619,6 +1619,16 @@ public void drawText (String string, int x, int y, int flags) {
 	NSAutoreleasePool pool = checkGC(CLIPPING | TRANSFORM | FONT);
 	try {
 		handle.saveGraphicsState();
+		boolean mode = true;
+		switch (data.textAntialias) {
+			case SWT.DEFAULT:
+				/* Printer is off by default */
+				if (!handle.isDrawingToScreen()) mode = false;
+				break;
+			case SWT.OFF: mode = false; break;
+			case SWT.ON: mode = true; break;
+		}
+		handle.setShouldAntialias(mode);
 		NSAttributedString str = createString(string, flags, true);
 		if ((flags & SWT.DRAW_TRANSPARENT) == 0) {
 			NSSize size = str.size();