Merge pull request #96 from Mikou27/master

Nucleus  v2.3.1

Author: Mikou27

Master/NucleusCoopTool/Controls/HubWebView.Designer.cs

@@ -9,7 +9,9 @@
 using Nucleus.Gaming.UI;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Drawing;
+using System.Drawing.Drawing2D;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -88,6 +90,8 @@ public HubWebView()
 
             button_Panel.BackColor = BackColor;
 
+            ShowThrobber();
+
             string debugUri = Path.Combine(Application.StartupPath, $"webview\\debugUri.txt");
 
             if (File.Exists(debugUri))
@@ -120,10 +124,55 @@ public HubWebView()
                     }
                 }
             }
-
+         
             BuildHandlersDatas();
         }
 
+        private PictureBox throbber;
+
+        private void ShowThrobber()
+        {
+            if (throbber == null)
+            {
+                throbber = new PictureBox
+                {
+                    Size = new Size(50, 50),
+                    BackColor = BackColor,
+                    Image = ImageCache.GetImage(Globals.ThemeFolder + "loading.gif"),
+                    SizeMode = PictureBoxSizeMode.StretchImage
+                };
+
+                throbber.LocationChanged += ThrobberLocationChanged;              
+                Controls.Add(throbber);
+
+                throbber.BringToFront();
+            } 
+        }
+
+        protected void ThrobberLocationChanged(object sender,EventArgs e)
+        {
+            PictureBox _throb = (PictureBox)sender;
+            using (var gp = new GraphicsPath())
+            {
+                gp.AddEllipse(new Rectangle(0, 0, _throb.Width , _throb.Height));
+                _throb.Region = new Region(gp);
+            }
+        }
+
+        private void ThrobberDispose()
+        {
+            if (throbber != null)
+                Controls.Remove(throbber);
+                throbber?.Dispose();
+                throbber = null;
+        }
+
+        private void HubWebView_Resize(object sender, EventArgs e)
+        {
+            if(throbber != null)
+            throbber.Location = RectangleUtil.Center(throbber.ClientRectangle, ClientRectangle).Location;
+        }
+
         private void BuildHandlersDatas()
         {
             installedHandlers.Clear();
@@ -146,14 +195,14 @@ private void BuildHandlersDatas()
         }
 
         private async void OnLoad(object sender, EventArgs e)
-        {
+        {         
             await InitializeAsync();
         }
 
         private async Task InitializeAsync()
         {
             try
-            {
+            {               
                 CoreWebView2Environment environment;
                 CoreWebView2EnvironmentOptions environmentOptions = new CoreWebView2EnvironmentOptions();
                 environmentOptions.AreBrowserExtensionsEnabled = true;
@@ -215,14 +264,45 @@ private async void WebView_CoreWebView2InitializationCompleted(object sender, Co
                     webView.CoreWebView2.NewWindowRequested += NewWindowRequested;
                     webView.CoreWebView2.WebMessageReceived += WebMessageReceived;
                     webView.CoreWebView2.ProcessFailed += ProcessFailed;
+                    webView.CoreWebView2.NavigationStarting += NavigationStarting;
+                    webView.CoreWebView2.NavigationCompleted += NavigationCompleted;
+
                     webView.CoreWebView2.Profile.PreferredColorScheme = CoreWebView2PreferredColorScheme.Dark;
-                
+                    
                     BringToFront();
                 }
             }
             catch { Console.WriteLine("Webview init failed!"); }
         }
 
+        private bool inUserBrowser;
+
+        private void NavigationCompleted(object sender, CoreWebView2NavigationCompletedEventArgs e)
+        {
+            if(e.IsSuccess)
+                inUserBrowser = false;
+        }
+
+        private void NavigationStarting(object sender, CoreWebView2NavigationStartingEventArgs e)
+        {
+            CoreWebView2 currentWindow = (CoreWebView2)sender;
+
+            if (!e.Uri.StartsWith("https://hub.splitscreen.me/"))
+            {
+                if(!inUserBrowser)
+                {
+                    Process.Start(e.Uri);
+                    inUserBrowser = true; 
+                }
+                else
+                {
+                    currentWindow.Reload();
+                }
+
+                e.Cancel = true;
+            }
+        }
+
         private void WebMessageReceived(object sender, CoreWebView2WebMessageReceivedEventArgs e)
         {
             Console.WriteLine(e.WebMessageAsJson);
@@ -256,6 +336,7 @@ private void DOMContentLoaded(object sender, CoreWebView2DOMContentLoadedEventAr
                 hasFreshCahe = false;
             }
 
+            ThrobberDispose();
             webView.ZoomFactor = 0.8;
             SendDatas();
         }
@@ -596,7 +677,6 @@ private void DisposeContent(object sender, EventArgs e)
             }
 
             webView?.Dispose();
-        }
+        }   
     }
-
 }

Master/NucleusCoopTool/Controls/HubWebView.cs

@@ -26,8 +26,6 @@ public partial class DownloadPrompt : Form
         private int entriesDone = 0;
         private float fontSize;
         private bool overwriteWithoutAsking = false;
-        private MainForm mainForm;
-        //public bool gameExeNoUpdate;
         public string game;
 
         private void controlscollect()