starred/Electron.NET
1
0
Fork 0
mirror of https://github.com/ElectronNET/Electron.NET.git synced 2026-07-12 19:57:33 +00:00
Code Issues 668 Packages Projects Releases 20 Wiki Activity

fix planned breaking API changes from Electron 4.0

Browse Source
This commit is contained in:
Gregor Biswanger
2018-09-25 23:10:58 +02:00
parent 17399f3f6c
commit 524e6c8dff
34 changed files with 869 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ElectronNET.API/App.cs
View File

@@ -1029,21 +1029,21 @@ namespace ElectronNET.API
/// <returns>This method returns false if your process is the primary instance of
/// the application and your app should continue loading. And returns true if your
/// process has sent its parameters to another instance, and you should immediately quit.</returns>
public async Task<bool> MakeSingleInstanceAsync(Action<string[], string> newInstanceOpened, CancellationToken cancellationToken = default(CancellationToken))
public async Task<bool> RequestSingleInstanceLockAsync(Action<string[], string> newInstanceOpened, CancellationToken cancellationToken = default(CancellationToken))
{
cancellationToken.ThrowIfCancellationRequested();
var taskCompletionSource = new TaskCompletionSource<bool>();
using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
{
BridgeConnector.Socket.On("appMakeSingleInstanceCompleted", (success) =>
BridgeConnector.Socket.On("appRequestSingleInstanceLockCompleted", (success) =>
{
BridgeConnector.Socket.Off("appMakeSingleInstanceCompleted");
BridgeConnector.Socket.Off("appRequestSingleInstanceLockCompleted");
taskCompletionSource.SetResult((bool)success);
});
BridgeConnector.Socket.Off("newInstanceOpened");
BridgeConnector.Socket.On("newInstanceOpened", (result) =>
BridgeConnector.Socket.Off("secondInstance");
BridgeConnector.Socket.On("secondInstance", (result) =>
{
JArray results = (JArray)result;
string[] args = results.First.ToObject<string[]>();
@@ -1052,7 +1052,7 @@ namespace ElectronNET.API
newInstanceOpened(args, workdirectory);
});
BridgeConnector.Socket.Emit("appMakeSingleInstance");
BridgeConnector.Socket.Emit("appRequestSingleInstanceLock");
return await taskCompletionSource.Task
.ConfigureAwait(false);
@@ -1063,9 +1063,9 @@ namespace ElectronNET.API
/// Releases all locks that were created by makeSingleInstance. This will allow
/// multiple instances of the application to once again run side by side.
/// </summary>
public void ReleaseSingleInstance()
public void ReleaseSingleInstanceLock()
{
BridgeConnector.Socket.Emit("appReleaseSingleInstance");
BridgeConnector.Socket.Emit("appReleaseSingleInstanceLock");
}
/// <summary>
@@ -1155,7 +1155,8 @@ namespace ElectronNET.API
/// <summary>
/// Memory and cpu usage statistics of all the processes associated with the app.
/// </summary>
/// <returns></returns>
/// <returns>Array of ProcessMetric objects that correspond to memory and cpu usage
/// statistics of all the processes associated with the app.</returns>
public async Task<ProcessMetric[]> GetAppMetricsAsync(CancellationToken cancellationToken = default(CancellationToken))
{
cancellationToken.ThrowIfCancellationRequested();

12
ElectronNET.API/Entities/HighlightMode.cs
View File

@@ -18,6 +18,16 @@
/// <summary>
/// Never highlight the tray icon.
/// </summary>
never
never,
/// <summary>
/// Activate highlight the tray icon.
/// </summary>
on,
/// <summary>
/// Deactivate highlight the tray icon.
/// </summary>
off
}
}

2
ElectronNET.API/Entities/WebPreferences.cs
View File

@@ -126,7 +126,7 @@ namespace ElectronNET.API.Entities
/// A list of feature strings separated by ,, like CSSVariables,KeyboardEventKey to
/// enable.The full list of supported feature strings can be found in the file.
/// </summary>
public string BlinkFeatures { get; set; }
public string EnableBlinkFeatures { get; set; }
/// <summary>
/// A list of feature strings separated by ,, like CSSVariables,KeyboardEventKey to