Browse Source

Revert "Merge branch 'disableSetProcessName-feature' into tmp8"

This reverts commit d8ee76d61d.
tmp9
Dan Walmsley 3 years ago
parent
commit
a35520c45b
  1. 28
      native/Avalonia.Native/src/OSX/main.mm
  2. 1
      src/Avalonia.Native/AvaloniaNativePlatform.cs
  3. 2
      src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs
  4. 1
      src/Avalonia.Native/avn.idl

28
native/Avalonia.Native/src/OSX/main.mm

@ -3,7 +3,6 @@
#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
@ -112,17 +111,11 @@ public:
@autoreleasepool
{
auto appTitle = [NSString stringWithUTF8String: utf8String];
if (disableSetProcessName == 0)
{
[[NSProcessInfo processInfo] setProcessName:appTitle];
SetProcessName(appTitle);
}
if (disableSetProcessName == 1)
{
auto rootMenu = [NSApp mainMenu];
[rootMenu setTitle:appTitle];
}
[[NSProcessInfo processInfo] setProcessName:appTitle];
SetProcessName(appTitle);
return S_OK;
}
@ -140,17 +133,6 @@ public:
}
}
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:

1
src/Avalonia.Native/AvaloniaNativePlatform.cs

@ -98,7 +98,6 @@ namespace Avalonia.Native
var macOpts = AvaloniaLocator.Current.GetService<MacOSPlatformOptions>() ?? new MacOSPlatformOptions();
_factory.MacOptions.SetShowInDock(macOpts.ShowInDock ? 1 : 0);
_factory.MacOptions.SetDisableSetProcessName(macOpts.DisableSetProcessName ? 1 : 0);
}
AvaloniaLocator.CurrentMutable

2
src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs

@ -78,7 +78,5 @@ namespace Avalonia
/// 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; }
}
}

1
src/Avalonia.Native/avn.idl

@ -542,7 +542,6 @@ interface IAvnMacOptions : IUnknown
{
HRESULT SetShowInDock(int show);
HRESULT SetApplicationTitle(char* utf8string);
HRESULT SetDisableSetProcessName(int disable);
}
[uuid(04c1b049-1f43-418a-9159-cae627ec1367)]

Loading…
Cancel
Save