[Mac] use proper text alignment on arm64

TextAlignment Right and Center are switched up on Arm64 Macos.
picoe · Mar 6, 2023 · fff00e3 · fff00e3
1 parent 7bc5c5b
commit fff00e3
Show file tree

Hide file tree

Showing 2 changed files with 161 additions and 4 deletions.
diff --git a/src/.idea/.idea.Eto/.idea/workspace.xml b/src/.idea/.idea.Eto/.idea/workspace.xml
diff --git a/src/Eto.Mac/MacConversions.cs b/src/Eto.Mac/MacConversions.cs
@@ -426,28 +426,34 @@ public static NSDatePickerMode ToNS(this CalendarMode mode)
 
 		public static TextAlignment ToEto(this NSTextAlignment align)
 		{
+			// NSTextAlignment Right and Center are interchanged on Arm64 MacOS
+			// See https://github.com/picoe/Eto/issues/2250 
+			bool isArm = System.Runtime.InteropServices.RuntimeInformation.ProcessArchitecture == System.Runtime.InteropServices.Architecture.Arm64;
 			switch (align)
 			{
 				default:
 				case NSTextAlignment.Left:
 					return TextAlignment.Left;
 				case NSTextAlignment.Right:
-					return TextAlignment.Right;
+					return isArm ? TextAlignment.Center : TextAlignment.Right;
 				case NSTextAlignment.Center:
-					return TextAlignment.Center;
+					return isArm ? TextAlignment.Right : TextAlignment.Center;
 			}
 		}
 
 		public static NSTextAlignment ToNS(this TextAlignment align)
 		{
+			// NSTextAlignment Right and Center are interchanged on Arm64 MacOS
+			// See https://github.com/picoe/Eto/issues/2250 
+			bool isArm = System.Runtime.InteropServices.RuntimeInformation.ProcessArchitecture == System.Runtime.InteropServices.Architecture.Arm64;
 			switch (align)
 			{
 				case TextAlignment.Left:
 					return NSTextAlignment.Left;
 				case TextAlignment.Center:
-					return NSTextAlignment.Center;
+					return isArm ? NSTextAlignment.Right : NSTextAlignment.Center;
 				case TextAlignment.Right:
-					return NSTextAlignment.Right;
+					return isArm ? NSTextAlignment.Center : NSTextAlignment.Right;
 				default:
 					throw new NotSupportedException();
 			}