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

Merge branch 'master' into dev/AutoUpdate

Browse Source
This commit is contained in:
Gregor Biswanger
2019-07-28 13:24:41 +02:00
parent 552b4331b2 68505f8feb
commit 10e95afa5c
20 changed files with 2143 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ElectronNET.WebApp/Controllers/TrayController.cs
View File

@@ -1,11 +1,21 @@
using Microsoft.AspNetCore.Mvc;
using System.IO;
using Microsoft.AspNetCore.Mvc;
using ElectronNET.API;
using ElectronNET.API.Entities;
using Microsoft.AspNetCore.Hosting;
namespace ElectronNET.WebApp.Controllers
{
public class TrayController : Controller
{
private readonly IHostingEnvironment _env;
public TrayController(IHostingEnvironment env)
{
_env = env;
}
public IActionResult Index()
{
if (HybridSupport.IsElectronActive)
@@ -21,7 +31,7 @@ namespace ElectronNET.WebApp.Controllers
Click = () => Electron.Tray.Destroy()
};
Electron.Tray.Show("/Assets/electron_32x32.png", menu);
Electron.Tray.Show(Path.Combine(_env.ContentRootPath, "Assets/electron_32x32.png"), menu);
Electron.Tray.SetToolTip("Electron Demo in the tray.");
}
else