release: Check if window is visible.

Author: Aetopia

src/Flarial.Launcher.Runtime/Flarial.Launcher.Runtime.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <PlatformTarget>x64</PlatformTarget>
-    <TargetFramework>net481</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
 
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

src/Flarial.Launcher.Runtime/Game/MinecraftGDK.cs

@@ -3,6 +3,7 @@
 using System.IO;
 using System.Management.Automation;
 using System.Management.Automation.Runspaces;
+using System.Threading;
 using Flarial.Launcher.Runtime.Services;
 using Windows.ApplicationModel;
 using Windows.Win32.Foundation;
@@ -36,14 +37,14 @@ static MinecraftGDK()
 
     protected override uint? Activate()
     {
-        if (GetProcessId() is { } processId)
-            return processId;
-
         /*
             - We use PowerShell to directly start the game.
             - This simplifies the activation contract.
         */
 
+        if (GetProcessId() is { } processId)
+            return processId;
+
         using var powershell = PowerShell.Create(s_state);
         powershell.AddCommand("Invoke-CommandInDesktopPackage");
 
@@ -68,14 +69,17 @@ static MinecraftGDK()
         if (!IsGamingServicesInstalled)
             throw new Win32Exception((int)ERROR_INSTALL_PREREQUISITE_FAILED);
 
-        if (GetWindow() is { } target)
+        if (GetWindow() is { } @_ && _.IsVisible)
         {
-            target.Switch();
-            return target.ProcessId;
+            _.Switch();
+            return _.ProcessId;
         }
 
-        if (Activate() is not { } processId) return null;
-        if (Open(PROCESS_SYNCHRONIZE, processId) is not { } process) return null;
+        if (Activate() is not { } processId)
+            return null;
+
+        if (Open(PROCESS_SYNCHRONIZE, processId) is not { } process)
+            return null;
 
         using (process)
         {
@@ -89,9 +93,14 @@ static MinecraftGDK()
             {
                 while (process.Wait(1))
                 {
-                    if (GetWindow() is not { } instance) continue;
-                    if (instance.ProcessId != processId) continue;
-                    if (instance.IsVisible) return processId;
+                    if (GetWindow() is not { } window)
+                        continue;
+
+                    if (window.IsVisible)
+                        return window.ProcessId;
+
+                    if (window.ProcessId != processId)
+                        return processId;
                 }
                 return null;
             }

src/Flarial.Launcher.Runtime/System/NativeWindow.cs

@@ -1,29 +1,18 @@
+using System.Runtime.InteropServices;
 using Windows.Win32.Foundation;
 using static Windows.Win32.PInvoke;
 
 namespace Flarial.Launcher.Runtime.System;
 
-unsafe readonly struct NativeWindow
+unsafe readonly struct NativeWindow(HWND handle)
 {
-    readonly HWND _handle;
-
-    NativeWindow(HWND handle) => _handle = handle;
-
-    internal bool IsVisible => IsWindowVisible(_handle);
+    readonly HWND _handle = handle;
 
     internal void Switch() => SwitchToThisWindow(_handle, true);
 
-    internal uint ProcessId
-    {
-        get
-        {
-            uint processId;
-            GetWindowThreadProcessId(_handle, &processId);
-            return processId;
-        }
-    }
+    internal bool IsVisible => IsWindowVisible(_handle);
+    internal uint ProcessId { get { uint _; GetWindowThreadProcessId(_handle, &_); return _; } }
 
     public static implicit operator NativeWindow(in HWND hwnd) => new(hwnd);
-
     public static implicit operator HWND(in NativeWindow window) => window._handle;
 }

src/Flarial.Launcher/Flarial.Launcher.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <PlatformTarget>x64</PlatformTarget>
-    <TargetFramework>net481</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
 
     <UseWPF>true</UseWPF>
     <ApplicationIcon>Resources\Application.ico</ApplicationIcon>

src/Windows.Win32/Windows.Win32.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <PlatformTarget>x64</PlatformTarget>
-    <TargetFramework>net481</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
 
     <Optimize>true</Optimize>
     <PublishRelease>true</PublishRelease>