Merge pull request #546 from TheJoeFin/dev

Add arch check to WinAI support

Author: TheJoeFin

Text-Grab-Package/Package.appxmanifest

@@ -12,7 +12,7 @@
   <Identity
     Name="40087JoeFinApps.TextGrab"
     Publisher="CN=153F3B0F-BA3D-4964-8098-71AC78A1DF6A"
-    Version="4.9.4.0" />
+    Version="4.9.5.0" />
 
   <Properties>
     <DisplayName>Text Grab</DisplayName>

Text-Grab/Text-Grab.csproj

@@ -23,7 +23,7 @@
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
         <EnableMsixTooling>false</EnableMsixTooling>
-        <Version>4.9.4</Version>
+        <Version>4.9.5</Version>
     </PropertyGroup>
 
     <ItemGroup>

Text-Grab/Utilities/WindowsAiUtilities.cs

@@ -3,6 +3,7 @@
 using Microsoft.Windows.AI.Imaging;
 using System;
 using System.Drawing;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 using Text_Grab.Extensions;
@@ -19,6 +20,13 @@ public static bool CanDeviceUseWinAI()
         if (!AppUtilities.IsPackaged() || OSInterop.IsWindows10())
             return false;
 
+        // Today, Windows AI Text Recognition is only supported on ARM64
+        Architecture arch = RuntimeInformation.ProcessArchitecture;
+        if (arch != Architecture.Arm64)
+            return false;
+
+        // After checking for Arm64 the remainder checks should be good to catch supporting devices
+
         try
         {
             AIFeatureReadyState readyState = TextRecognizer.GetReadyState();

Text-Grab/Views/FullscreenGrab.xaml.cs

@@ -422,8 +422,6 @@ private static async Task LoadOcrLanguages(ComboBox languagesComboBox, bool usin
 
                 count++;
             }
-            if (languagesComboBox.SelectedIndex == -1)
-                languagesComboBox.SelectedIndex = 0;
         }
 
         IReadOnlyList<Language> possibleOCRLanguages = OcrEngine.AvailableRecognizerLanguages;
@@ -444,6 +442,10 @@ private static async Task LoadOcrLanguages(ComboBox languagesComboBox, bool usin
 
             count++;
         }
+
+        // if no lang is set, select the first one
+        if (languagesComboBox.SelectedIndex == -1)
+            languagesComboBox.SelectedIndex = 0;
     }
 
     private void NewEditTextMenuItem_Click(object sender, RoutedEventArgs e)

build-unpackaged.ps1

@@ -38,7 +38,7 @@ dotnet publish "$PSScriptRoot\$Project\$Project.csproj" `
     -v minimal `
     -o $BuildPathX64 `
     -p:EnableMsixTooling=true `
-    -p:PublishReadyToRun=true `
+    -p:PublishReadyToRun=false `
     -p:PublishSingleFile=true `
     -p:CopyOutputSymbolsToPublishDirectory=false `
     --nologo