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

fix display serialization, serialize only window id when sending ipc message

Browse Source
This commit is contained in:
theolivenbaum
2021-09-02 16:34:20 +02:00
parent 25af4a7314
commit 5f4b1628e5
5 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ElectronNET.API/BridgeConnector.cs
View File

@@ -151,6 +151,7 @@ namespace ElectronNET.API
else
{
Console.WriteLine(formatString, args);
Console.WriteLine(E.ToString());
}
}

4
ElectronNET.API/Entities/Display.cs
View File

@@ -26,12 +26,12 @@
/// <summary>
/// Can be 0, 90, 180, 270, represents screen rotation in clock-wise degrees.
/// </summary>
public int Rotation { get; set; }
public float Rotation { get; set; }
/// <summary>
/// Output device's pixel scale factor.
/// </summary>
public int ScaleFactor { get; set; }
public float ScaleFactor { get; set; }
/// <summary>
/// Gets or sets the size.

10
ElectronNET.API/IpcMain.cs
View File

@@ -182,10 +182,12 @@ namespace ElectronNET.API
if(parameterObject.GetType().IsArray || parameterObject.GetType().IsGenericType && parameterObject is IEnumerable)
{
jarrays.Add(JArray.FromObject(parameterObject, _jsonSerializer));
} else if(parameterObject.GetType().IsClass && !parameterObject.GetType().IsPrimitive && !(parameterObject is string))
}
else if(parameterObject.GetType().IsClass && !parameterObject.GetType().IsPrimitive && !(parameterObject is string))
{
jobjects.Add(JObject.FromObject(parameterObject, _jsonSerializer));
} else if(parameterObject.GetType().IsPrimitive || (parameterObject is string))
}
else if(parameterObject.GetType().IsPrimitive || (parameterObject is string))
{
objects.Add(parameterObject);
}
@@ -193,11 +195,11 @@ namespace ElectronNET.API
if(jobjects.Count > 0 || jarrays.Count > 0)
{
BridgeConnector.Emit("sendToIpcRenderer", JObject.FromObject(browserWindow, _jsonSerializer), channel, jarrays.ToArray(), jobjects.ToArray(), objects.ToArray());
BridgeConnector.Emit("sendToIpcRenderer", browserWindow.Id, channel, jarrays.ToArray(), jobjects.ToArray(), objects.ToArray());
}
else
{
BridgeConnector.Emit("sendToIpcRenderer", JObject.FromObject(browserWindow, _jsonSerializer), channel, data);
BridgeConnector.Emit("sendToIpcRenderer", browserWindow.Id, channel, data);
}
}