Merge branch 'disableSetProcessName-feature' into tmp8

donandren · Oct 3, 2022 · d8ee76d · d8ee76d
1 parent 62a5ee1
commit d8ee76d
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/native/Avalonia.Native/src/OSX/main.mm b/native/Avalonia.Native/src/OSX/main.mm
@@ -3,6 +3,7 @@
 #include "common.h"
 
 static NSString* s_appTitle = @"Avalonia";
+static int disableSetProcessName = 0;
 
 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
@@ -111,11 +112,17 @@ virtual HRESULT SetApplicationTitle(char* utf8String) override
         @autoreleasepool
         {
             auto appTitle = [NSString stringWithUTF8String: utf8String];
-
-            [[NSProcessInfo processInfo] setProcessName:appTitle];
-
-
-            SetProcessName(appTitle);
+            if (disableSetProcessName == 0)
+            {
+                [[NSProcessInfo processInfo] setProcessName:appTitle];
+
+                SetProcessName(appTitle);
+            }
+            if (disableSetProcessName == 1)
+            {
+                auto rootMenu = [NSApp mainMenu];
+                [rootMenu setTitle:appTitle];
+            }
 
             return S_OK;
         }
@@ -133,6 +140,17 @@ virtual HRESULT SetShowInDock(int show)  override
         }
     }
 
+    virtual HRESULT SetDisableSetProcessName(int disable)  override
+    {
+        START_COM_CALL;
+
+        @autoreleasepool
+        {
+            disableSetProcessName = disable;
+            return S_OK;
+        }
+    }
+
 };
 
 /// See "Using POSIX Threads in a Cocoa Application" section here:

diff --git a/src/Avalonia.Native/AvaloniaNativePlatform.cs b/src/Avalonia.Native/AvaloniaNativePlatform.cs
@@ -98,6 +98,7 @@ void DoInitialize()
                 var macOpts = AvaloniaLocator.Current.GetService<MacOSPlatformOptions>() ?? new MacOSPlatformOptions();
 
                 _factory.MacOptions.SetShowInDock(macOpts.ShowInDock ? 1 : 0);
+                _factory.MacOptions.SetDisableSetProcessName(macOpts.DisableSetProcessName ? 1 : 0);
             }
 
             AvaloniaLocator.CurrentMutable

diff --git a/src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs b/src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs
@@ -78,5 +78,7 @@ public class MacOSPlatformOptions
         /// Gets or sets a value indicating whether the native macOS menu bar will be enabled for the application.
         /// </summary>
         public bool DisableNativeMenus { get; set; }
+
+        public bool DisableSetProcessName { get; set; }
     }
 }
diff --git a/src/Avalonia.Native/avn.idl b/src/Avalonia.Native/avn.idl
@@ -542,6 +542,7 @@ interface IAvnMacOptions : IUnknown
 {
      HRESULT SetShowInDock(int show);
      HRESULT SetApplicationTitle(char* utf8string);
+     HRESULT SetDisableSetProcessName(int disable);
 }
 
 [uuid(04c1b049-1f43-418a-9159-cae627ec1367)]