starred/Electron.NET
1
0
Fork 0
mirror of https://github.com/ElectronNET/Electron.NET.git synced 2026-02-18 05:35:34 +00:00
Code Issues 668 Packages Projects Releases 20 Wiki Activity

use concurrent dictionary instead of list

Browse Source
This commit is contained in:
rafael-aero
2021-09-01 18:59:15 +02:00
parent 2d68ca5270
commit 9a938dc680
1 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ElectronNET.API/WindowManager.cs
View File

@@ -3,6 +3,7 @@ using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Newtonsoft.Json.Serialization;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices;
@@ -62,8 +63,9 @@ namespace ElectronNET.API
/// <value>
/// The browser windows.
/// </value>
public IReadOnlyCollection<BrowserWindow> BrowserWindows { get { return _browserWindows.AsReadOnly(); } }
private List<BrowserWindow> _browserWindows = new List<BrowserWindow>();
public IReadOnlyCollection<BrowserWindow> BrowserWindows { get { return _browserWindows.Values.ToList().AsReadOnly(); } }
private ConcurrentDictionary<int, BrowserWindow> _browserWindows = new ();
/// <summary>
/// Gets the browser views.
@@ -71,8 +73,8 @@ namespace ElectronNET.API
/// <value>
/// The browser view.
/// </value>
public IReadOnlyCollection<BrowserView> BrowserViews { get { return _browserViews.AsReadOnly(); } }
private List<BrowserView> _browserViews = new List<BrowserView>();
public IReadOnlyCollection<BrowserView> BrowserViews { get { return _browserViews.Values.ToList().AsReadOnly(); } }
private ConcurrentDictionary<int, BrowserView> _browserViews = new ();
/// <summary>
/// Creates the window asynchronous.
@@ -98,8 +100,9 @@ namespace ElectronNET.API
{
BridgeConnector.Off("BrowserWindowCreated");
BrowserWindow browserWindow = new BrowserWindow(id);
_browserWindows.Add(browserWindow);
var browserWindow = new BrowserWindow(id);
_browserWindows[id] = browserWindow;
taskCompletionSource.SetResult(browserWindow);
});
@@ -107,12 +110,9 @@ namespace ElectronNET.API
BridgeConnector.Off("BrowserWindowClosed");
BridgeConnector.On<int[]>("BrowserWindowClosed", (browserWindowIds) =>
{
for (int index = 0; index < _browserWindows.Count; index++)
foreach(var id in browserWindowIds)
{
if (!browserWindowIds.Contains(_browserWindows[index].Id))
{
_browserWindows.RemoveAt(index);
}
_browserWindows.TryRemove(id, out _);
}
});
@@ -184,18 +184,12 @@ namespace ElectronNET.API
BrowserView browserView = new BrowserView(id);
_browserViews.Add(browserView);
_browserViews[id] = browserView;
taskCompletionSource.SetResult(browserView);
});
var keepDefaultValuesSerializer = new JsonSerializer()
{
ContractResolver = new CamelCasePropertyNamesContractResolver(),
NullValueHandling = NullValueHandling.Ignore,
DefaultValueHandling = DefaultValueHandling.Include
};
BridgeConnector.Emit("createBrowserView", JObject.FromObject(options, keepDefaultValuesSerializer));
BridgeConnector.Emit("createBrowserView", JObject.FromObject(options, _keepDefaultValuesSerializer));
return taskCompletionSource.Task;
}