From 627eedec51e12aaf962aae65061ee7e2e414063e Mon Sep 17 00:00:00 2001
From: Miepee <janbidler00@protonmail.com>
Date: Mon, 6 Mar 2023 12:26:33 +0100
Subject: [PATCH] [Mac] use proper text alignment on arm64

TextAlignment Right and Center are switched up on Arm64 Macos.
---
 src/.idea/.idea.Eto/.idea/workspace.xml | 151 ++++++++++++++++++++++++
 src/Eto.Mac/MacConversions.cs           |  14 ++-
 2 files changed, 161 insertions(+), 4 deletions(-)
 create mode 100644 src/.idea/.idea.Eto/.idea/workspace.xml

diff --git a/src/.idea/.idea.Eto/.idea/workspace.xml b/src/.idea/.idea.Eto/.idea/workspace.xml
new file mode 100644
index 0000000000..4a7d788768
--- /dev/null
+++ b/src/.idea/.idea.Eto/.idea/workspace.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoGeneratedRunConfigurationManager">
+    <projectFile>../lib/monomac/src/generator.csproj</projectFile>
+    <projectFile>../test/Eto.Test.Direct2D/Eto.Test.Direct2D.csproj</projectFile>
+    <projectFile>../test/Eto.Test.Gtk/Eto.Test.Gtk.csproj</projectFile>
+    <projectFile>../test/Eto.Test.Mac/Eto.Test.Mac64.csproj</projectFile>
+    <projectFile kind="XamarinMacOS">../test/Eto.Test.Mac/Eto.Test.XamMac2.csproj</projectFile>
+    <projectFile kind="XamarinMacOS">../test/Eto.Test.Mac/Eto.Test.macOS.csproj</projectFile>
+    <projectFile>../test/Eto.Test.WinForms/Eto.Test.WinForms.csproj</projectFile>
+    <projectFile>../test/Eto.Test.Wpf/Eto.Test.Wpf.csproj</projectFile>
+  </component>
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="a6e9426c-0f27-4ed7-86ce-6fd6b358d64e" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/Eto.Mac/MacConversions.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Eto.Mac/MacConversions.cs" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="HighlightingSettingsPerFile">
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/07a3e9bcf54b4fb0a42ebf996fe6038d94e200/9e/cba46dbd/ExceptionDispatchInfo.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/20ef43e650914ce09f55852fc4abbf3075e00/3e/39ba29f8/Reflect.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/25288f22b7c548d8adf4cb3c0171568e75600/3a/2af0fcd2/Assert.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/287c5e6af90e47dfb7466a7d820c695dc0400/78/953b13ed/Double.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/ba889255384849bea9fd387fe9008224336e00/b9/572ea05b/Window.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/4addefb1e79fbe7def610dadfd98060a787c2216743868459b9995d81a829/Reflect.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/../lib/monomac/src/imagekit.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/../lib/monomac/src/pdfkit.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/../lib/monomac/src/wkwebkit.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Eto.Android/Forms/TableLayoutHandler.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/../test/Eto.Test/UnitTests/TestBase.cs" root0="FORCE_HIGHLIGHTING" />
+  </component>
+  <component name="MacroExpansionManager">
+    <option name="directoryName" value="2ltcj300" />
+  </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
+  <component name="ProjectId" id="2MafChFDn3cDz04haMXeUOZlfjz" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "WebServerToolWindowFactoryState": "false",
+    "XThreadsFramesViewSplitterKey": "0.43664122",
+    "nodejs_package_manager_path": "npm",
+    "rider.run.widget.enabled.cache": "false",
+    "vue.rearranger.settings.migration": "true"
+  },
+  "keyToStringList": {
+    "rider.external.source.directories": [
+      "/home/narr/.config/JetBrains/Rider2022.3/resharper-host/DecompilerCache",
+      "/home/narr/.config/JetBrains/Rider2022.3/resharper-host/SourcesCache",
+      "/home/narr/.local/share/Symbols/src"
+    ]
+  }
+}]]></component>
+  <component name="RunManager" selected=".NET Static Method.Eto.Test.UnitTests.TestBase.Initialize">
+    <configuration name="Unnamed" type="DotNetProject" factoryName=".NET Project" nameIsGenerated="true">
+      <option name="EXE_PATH" value="$PROJECT_DIR$/../artifacts/test/Eto.Test.Gtk/Debug/net48/Eto.Test.Gtk.exe" />
+      <option name="PROGRAM_PARAMETERS" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../artifacts/test/Eto.Test.Gtk/Debug/net48" />
+      <option name="PASS_PARENT_ENVS" value="1" />
+      <envs>
+        <env name="GDK_BACKEND" value="x11" />
+      </envs>
+      <option name="USE_EXTERNAL_CONSOLE" value="0" />
+      <option name="USE_MONO" value="0" />
+      <option name="RUNTIME_ARGUMENTS" value="" />
+      <option name="PROJECT_PATH" value="$PROJECT_DIR$/../test/Eto.Test.Gtk/Eto.Test.Gtk.csproj" />
+      <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
+      <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
+      <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
+      <option name="PROJECT_KIND" value="DotNetCore" />
+      <option name="PROJECT_TFM" value=".NETFramework,Version=v4.8" />
+      <method v="2">
+        <option name="Build" />
+      </method>
+    </configuration>
+    <configuration name="Eto.Test.UnitTests.TestBase.Initialize" type="DotNetStaticMethod" factoryName=".NET Static Method" temporary="true">
+      <option name="EXE_PATH" value="$APPLICATION_HOME_DIR$/lib/ReSharperHost/JetLauncherILc.exe" />
+      <option name="PROGRAM_PARAMETERS" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="PASS_PARENT_ENVS" value="1" />
+      <option name="USE_EXTERNAL_CONSOLE" value="0" />
+      <option name="USE_MONO" value="0" />
+      <option name="RUNTIME_ARGUMENTS" value="" />
+      <option name="PROJECT_PATH" value="$PROJECT_DIR$/../test/Eto.Test/Eto.Test.csproj" />
+      <option name="PROJECT_TFM" value=".NETStandard,Version=v2.0" />
+      <option name="CLASS_NAME" value="Eto.Test.UnitTests.TestBase" />
+      <option name="METHOD_NAME" value="Initialize" />
+      <method v="2">
+        <option name="Build" />
+      </method>
+    </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue=".NET Static Method.Eto.Test.UnitTests.TestBase.Initialize" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="a6e9426c-0f27-4ed7-86ce-6fd6b358d64e" name="Changes" comment="" />
+      <created>1678010493564</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1678010493564</updated>
+      <workItem from="1678010496013" duration="664000" />
+      <workItem from="1678041600466" duration="471000" />
+      <workItem from="1678093489556" duration="4534000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+  <component name="UnityUnitTestConfiguration" currentTestLauncher="Both" />
+  <component name="VcsManagerConfiguration">
+    <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="DotNet Breakpoints">
+          <url>file://$PROJECT_DIR$/../test/Eto.Test/UnitTests/Forms/CascadingStyleTests.cs</url>
+          <line>94</line>
+          <properties documentPath="$PROJECT_DIR$/../test/Eto.Test/UnitTests/Forms/CascadingStyleTests.cs" initialLine="94" containingFunctionPresentation="method 'DefaultStyleShouldApplyWhenControlDynamicallyAdded'">
+            <startOffsets>
+              <option value="2804" />
+            </startOffsets>
+            <endOffsets>
+              <option value="2832" />
+            </endOffsets>
+          </properties>
+          <option name="timeStamp" value="13" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/Eto.Mac/MacConversions.cs b/src/Eto.Mac/MacConversions.cs
index 8151c8212b..73cb491a0d 100644
--- 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 == 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 == 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();
 			}