#44 Bug Fixes

Taiizor · Oct 26, 2023 · d8f916a · d8f916a
1 parent ef52117
commit d8f916a
Show file tree

Hide file tree

Showing 15 changed files with 101 additions and 29 deletions.
diff --git a/src/Shared/Engine/Sucrose.Shared.Engine.Aurora/View/Application.xaml.cs b/src/Shared/Engine/Sucrose.Shared.Engine.Aurora/View/Application.xaml.cs
@@ -1,4 +1,5 @@
-using System.Diagnostics;
+using Microsoft.Win32;
+using System.Diagnostics;
 using System.IO;
 using System.Windows;
 using SMC = Sucrose.Memory.Constant;
@@ -53,6 +54,7 @@ public Application(string Application, string Arguments)
 
             SSEEH.ApplicationLoaded(SSEAMI.ApplicationProcess);
             SSEEH.ApplicationRendered(SSEAMI.ApplicationProcess);
+            SystemEvents.DisplaySettingsChanged += (s, e) => SSEEH.DisplaySettingsChanged(SSEAMI.ApplicationProcess, SSEAMI.ApplicationHandle);
 
             SSEAHA.SetVolume(SSEHD.GetVolume());
         }

diff --git a/src/Shared/Engine/Sucrose.Shared.Engine.CefSharp/View/Gif.xaml.cs b/src/Shared/Engine/Sucrose.Shared.Engine.CefSharp/View/Gif.xaml.cs
@@ -1,4 +1,5 @@
-using System.Windows;
+using Microsoft.Win32;
+using System.Windows;
 using SSECSEG = Sucrose.Shared.Engine.CefSharp.Event.Gif;
 using SSECSHCCM = Sucrose.Shared.Engine.CefSharp.Handler.CustomContextMenu;
 using SSECSHG = Sucrose.Shared.Engine.CefSharp.Helper.Gif;
@@ -19,6 +20,8 @@ public Gif(string Gif)
         {
             InitializeComponent();
 
+            SystemEvents.DisplaySettingsChanged += (s, e) => SSEEH.DisplaySettingsChanged(this);
+
             ContentRendered += (s, e) => SSEEH.ContentRendered(this);
 
             SSECSMI.CefEngine.MenuHandler = new SSECSHCCM();

diff --git a/src/Shared/Engine/Sucrose.Shared.Engine.CefSharp/View/Url.xaml.cs b/src/Shared/Engine/Sucrose.Shared.Engine.CefSharp/View/Url.xaml.cs
@@ -1,4 +1,5 @@
-using System.Windows;
+using Microsoft.Win32;
+using System.Windows;
 using SSECSEU = Sucrose.Shared.Engine.CefSharp.Event.Url;
 using SSECSHCCM = Sucrose.Shared.Engine.CefSharp.Handler.CustomContextMenu;
 using SSECSHU = Sucrose.Shared.Engine.CefSharp.Helper.Url;
@@ -19,6 +20,8 @@ public Url(string Url)
         {
             InitializeComponent();
 
+            SystemEvents.DisplaySettingsChanged += (s, e) => SSEEH.DisplaySettingsChanged(this);
+
             ContentRendered += (s, e) => SSEEH.ContentRendered(this);
 
             SSECSMI.CefEngine.MenuHandler = new SSECSHCCM();

diff --git a/src/Shared/Engine/Sucrose.Shared.Engine.CefSharp/View/Video.xaml.cs b/src/Shared/Engine/Sucrose.Shared.Engine.CefSharp/View/Video.xaml.cs
@@ -1,4 +1,5 @@
-using System.Windows;
+using Microsoft.Win32;
+using System.Windows;
 using SSECSEV = Sucrose.Shared.Engine.CefSharp.Event.Video;
 using SSECSHCCM = Sucrose.Shared.Engine.CefSharp.Handler.CustomContextMenu;
 using SSECSHV = Sucrose.Shared.Engine.CefSharp.Helper.Video;
@@ -20,6 +21,8 @@ public Video(string Video)
         {
             InitializeComponent();
 
+            SystemEvents.DisplaySettingsChanged += (s, e) => SSEEH.DisplaySettingsChanged(this);
+
             ContentRendered += (s, e) => SSEEH.ContentRendered(this);
 
             SSECSMI.CefEngine.MenuHandler = new SSECSHCCM();

diff --git a/src/Shared/Engine/Sucrose.Shared.Engine.CefSharp/View/Web.xaml.cs b/src/Shared/Engine/Sucrose.Shared.Engine.CefSharp/View/Web.xaml.cs
@@ -1,4 +1,5 @@
-using System.Windows;
+using Microsoft.Win32;
+using System.Windows;
 using SSECSEW = Sucrose.Shared.Engine.CefSharp.Event.Web;
 using SSECSHCCM = Sucrose.Shared.Engine.CefSharp.Handler.CustomContextMenu;
 using SSECSHW = Sucrose.Shared.Engine.CefSharp.Helper.Web;
@@ -19,6 +20,8 @@ public Web(string Web)
         {
             InitializeComponent();
 
+            SystemEvents.DisplaySettingsChanged += (s, e) => SSEEH.DisplaySettingsChanged(this);
+
             ContentRendered += (s, e) => SSEEH.ContentRendered(this);
 
             SSECSMI.CefEngine.MenuHandler = new SSECSHCCM();

diff --git a/src/Shared/Engine/Sucrose.Shared.Engine.CefSharp/View/YouTube.xaml.cs b/src/Shared/Engine/Sucrose.Shared.Engine.CefSharp/View/YouTube.xaml.cs
@@ -1,4 +1,5 @@
-using System.Windows;
+using Microsoft.Win32;
+using System.Windows;
 using SSECSEYT = Sucrose.Shared.Engine.CefSharp.Event.YouTube;
 using SSECSHCCM = Sucrose.Shared.Engine.CefSharp.Handler.CustomContextMenu;
 using SSECSHYT = Sucrose.Shared.Engine.CefSharp.Helper.YouTube;
@@ -19,6 +20,8 @@ public YouTube(string YouTube)
         {
             InitializeComponent();
 
+            SystemEvents.DisplaySettingsChanged += (s, e) => SSEEH.DisplaySettingsChanged(this);
+
             ContentRendered += (s, e) => SSEEH.ContentRendered(this);
 
             SSECSMI.CefEngine.MenuHandler = new SSECSHCCM();

diff --git a/src/Shared/Engine/Sucrose.Shared.Engine.MpvPlayer/View/Video.xaml.cs b/src/Shared/Engine/Sucrose.Shared.Engine.MpvPlayer/View/Video.xaml.cs
@@ -1,4 +1,5 @@
-using System.Windows;
+using Microsoft.Win32;
+using System.Windows;
 using System.Windows.Media;
 using SSEEH = Sucrose.Shared.Engine.Event.Handler;
 using SSEHD = Sucrose.Shared.Engine.Helper.Data;
@@ -19,6 +20,8 @@ public Video(string Video)
         {
             InitializeComponent();
 
+            SystemEvents.DisplaySettingsChanged += (s, e) => SSEEH.DisplaySettingsChanged(this);
+
             SSEMPMI.Source = SSEHS.GetSource(Video).ToString();
 
             ContentRendered += (s, e) => SSEEH.ContentRendered(this);

diff --git a/src/Shared/Engine/Sucrose.Shared.Engine.Nebula/View/Video.xaml.cs b/src/Shared/Engine/Sucrose.Shared.Engine.Nebula/View/Video.xaml.cs
@@ -1,4 +1,5 @@
-using System.Windows;
+using Microsoft.Win32;
+using System.Windows;
 using System.Windows.Media;
 using SSEEH = Sucrose.Shared.Engine.Event.Handler;
 using SSEHD = Sucrose.Shared.Engine.Helper.Data;
@@ -20,6 +21,8 @@ public Video(string Video)
         {
             InitializeComponent();
 
+            SystemEvents.DisplaySettingsChanged += (s, e) => SSEEH.DisplaySettingsChanged(this);
+
             ContentRendered += (s, e) => SSEEH.ContentRendered(this);
 
             Content = SSENMI.MediaEngine;

diff --git a/src/Shared/Engine/Sucrose.Shared.Engine.Vexana/View/Gif.xaml.cs b/src/Shared/Engine/Sucrose.Shared.Engine.Vexana/View/Gif.xaml.cs
@@ -1,4 +1,5 @@
-using System.Windows;
+using Microsoft.Win32;
+using System.Windows;
 using System.Windows.Media;
 using SSEEH = Sucrose.Shared.Engine.Event.Handler;
 using SSEHD = Sucrose.Shared.Engine.Helper.Data;
@@ -21,6 +22,8 @@ public Gif(string Gif)
         {
             InitializeComponent();
 
+            SystemEvents.DisplaySettingsChanged += (s, e) => SSEEH.DisplaySettingsChanged(this);
+
             ContentRendered += (s, e) => SSEEH.ContentRendered(this);
 
             Content = SSEVMI.ImageEngine;

diff --git a/src/Shared/Engine/Sucrose.Shared.Engine.WebView/View/Gif.xaml.cs b/src/Shared/Engine/Sucrose.Shared.Engine.WebView/View/Gif.xaml.cs
@@ -1,4 +1,5 @@
-using System.Windows;
+using Microsoft.Win32;
+using System.Windows;
 using SSEEH = Sucrose.Shared.Engine.Event.Handler;
 using SSEHD = Sucrose.Shared.Engine.Helper.Data;
 using SSEHR = Sucrose.Shared.Engine.Helper.Run;
@@ -18,6 +19,8 @@ public Gif(string Gif)
         {
             InitializeComponent();
 
+            SystemEvents.DisplaySettingsChanged += (s, e) => SSEEH.DisplaySettingsChanged(this);
+
             ContentRendered += (s, e) => SSEEH.ContentRendered(this);
 
             Content = SSEWVMI.WebEngine;

diff --git a/src/Shared/Engine/Sucrose.Shared.Engine.WebView/View/Url.xaml.cs b/src/Shared/Engine/Sucrose.Shared.Engine.WebView/View/Url.xaml.cs
@@ -1,4 +1,5 @@
-using System.Windows;
+using Microsoft.Win32;
+using System.Windows;
 using SSEEH = Sucrose.Shared.Engine.Event.Handler;
 using SSEHD = Sucrose.Shared.Engine.Helper.Data;
 using SSEHR = Sucrose.Shared.Engine.Helper.Run;
@@ -18,6 +19,8 @@ public Url(string Url)
         {
             InitializeComponent();
 
+            SystemEvents.DisplaySettingsChanged += (s, e) => SSEEH.DisplaySettingsChanged(this);
+
             ContentRendered += (s, e) => SSEEH.ContentRendered(this);
 
             Content = SSEWVMI.WebEngine;

diff --git a/src/Shared/Engine/Sucrose.Shared.Engine.WebView/View/Video.xaml.cs b/src/Shared/Engine/Sucrose.Shared.Engine.WebView/View/Video.xaml.cs
@@ -1,4 +1,5 @@
-using System.Windows;
+using Microsoft.Win32;
+using System.Windows;
 using SSEEH = Sucrose.Shared.Engine.Event.Handler;
 using SSEHD = Sucrose.Shared.Engine.Helper.Data;
 using SSEHR = Sucrose.Shared.Engine.Helper.Run;
@@ -18,6 +19,8 @@ public Video(string Video)
         {
             InitializeComponent();
 
+            SystemEvents.DisplaySettingsChanged += (s, e) => SSEEH.DisplaySettingsChanged(this);
+
             ContentRendered += (s, e) => SSEEH.ContentRendered(this);
 
             Content = SSEWVMI.WebEngine;

diff --git a/src/Shared/Engine/Sucrose.Shared.Engine.WebView/View/Web.xaml.cs b/src/Shared/Engine/Sucrose.Shared.Engine.WebView/View/Web.xaml.cs
@@ -1,4 +1,5 @@
-using System.Windows;
+using Microsoft.Win32;
+using System.Windows;
 using SSEEH = Sucrose.Shared.Engine.Event.Handler;
 using SSEHD = Sucrose.Shared.Engine.Helper.Data;
 using SSEHR = Sucrose.Shared.Engine.Helper.Run;
@@ -18,6 +19,8 @@ public Web(string Web)
         {
             InitializeComponent();
 
+            SystemEvents.DisplaySettingsChanged += (s, e) => SSEEH.DisplaySettingsChanged(this);
+
             ContentRendered += (s, e) => SSEEH.ContentRendered(this);
 
             Content = SSEWVMI.WebEngine;

diff --git a/src/Shared/Engine/Sucrose.Shared.Engine.WebView/View/YouTube.xaml.cs b/src/Shared/Engine/Sucrose.Shared.Engine.WebView/View/YouTube.xaml.cs
@@ -1,4 +1,5 @@
-using System.Windows;
+using Microsoft.Win32;
+using System.Windows;
 using SSEEH = Sucrose.Shared.Engine.Event.Handler;
 using SSEHD = Sucrose.Shared.Engine.Helper.Data;
 using SSEHR = Sucrose.Shared.Engine.Helper.Run;
@@ -18,6 +19,8 @@ public YouTube(string YouTube)
         {
             InitializeComponent();
 
+            SystemEvents.DisplaySettingsChanged += (s, e) => SSEEH.DisplaySettingsChanged(this);
+
             ContentRendered += (s, e) => SSEEH.ContentRendered(this);
 
             Content = SSEWVMI.WebEngine;

diff --git a/src/Shared/Engine/Sucrose.Shared.Engine/Event/Handler.cs b/src/Shared/Engine/Sucrose.Shared.Engine/Event/Handler.cs
@@ -7,6 +7,7 @@
 using SWHWI = Skylark.Wing.Helper.WindowInterop;
 using SWHWO = Skylark.Wing.Helper.WindowOperations;
 using SWNM = Skylark.Wing.Native.Methods;
+using SWUS = Skylark.Wing.Utility.Screene;
 
 namespace Sucrose.Shared.Engine.Event
 {
@@ -24,21 +25,6 @@ public static void WindowLoaded(Window Window)
             Window.ShowInTaskbar = false;
         }
 
-        public static void ApplicationLoaded(Process Process)
-        {
-            IntPtr Handle = SWHPI.MainWindowHandle(Process);
-
-            //ShowInTaskbar = false : causing issue with Windows10-Windows11 Taskview.
-            SWHWO.RemoveWindowFromTaskbar(Handle);
-
-            SWNM.ShowWindow(Handle, (int)SWNM.SHOWWINDOW.SW_HIDE);
-
-            int currentStyle = SWNM.GetWindowLong(Handle, (int)SWNM.GWL.GWL_STYLE);
-            SWNM.SetWindowLong(Handle, (int)SWNM.GWL.GWL_STYLE, currentStyle & ~((int)SWNM.WindowStyles.WS_CAPTION | (int)SWNM.WindowStyles.WS_THICKFRAME | (int)SWNM.WindowStyles.WS_MINIMIZE | (int)SWNM.WindowStyles.WS_MAXIMIZE | (int)SWNM.WindowStyles.WS_SYSMENU | (int)SWNM.WindowStyles.WS_DLGFRAME | (int)SWNM.WindowStyles.WS_BORDER | (int)SWNM.WindowStyles.WS_EX_CLIENTEDGE));
-
-            SWHWO.BorderlessWinStyle(Handle);
-        }
-
         public static void ContentRendered(Window Window)
         {
             switch (SSEHD.GetDisplayType())
@@ -55,6 +41,21 @@ public static void ContentRendered(Window Window)
             }
         }
 
+        public static void ApplicationLoaded(Process Process)
+        {
+            IntPtr Handle = SWHPI.MainWindowHandle(Process);
+
+            //ShowInTaskbar = false : causing issue with Windows10-Windows11 Taskview.
+            SWHWO.RemoveWindowFromTaskbar(Handle);
+
+            SWNM.ShowWindow(Handle, (int)SWNM.SHOWWINDOW.SW_HIDE);
+
+            int currentStyle = SWNM.GetWindowLong(Handle, (int)SWNM.GWL.GWL_STYLE);
+            SWNM.SetWindowLong(Handle, (int)SWNM.GWL.GWL_STYLE, currentStyle & ~((int)SWNM.WindowStyles.WS_CAPTION | (int)SWNM.WindowStyles.WS_THICKFRAME | (int)SWNM.WindowStyles.WS_MINIMIZE | (int)SWNM.WindowStyles.WS_MAXIMIZE | (int)SWNM.WindowStyles.WS_SYSMENU | (int)SWNM.WindowStyles.WS_DLGFRAME | (int)SWNM.WindowStyles.WS_BORDER | (int)SWNM.WindowStyles.WS_EX_CLIENTEDGE));
+
+            SWHWO.BorderlessWinStyle(Handle);
+        }
+
         public static void ApplicationRendered(Process Process)
         {
             switch (SSEHD.GetDisplayType())
@@ -72,5 +73,35 @@ public static void ApplicationRendered(Process Process)
 
             SWNM.ShowWindow(SWHPI.MainWindowHandle(Process), (int)SWNM.SHOWWINDOW.SW_SHOW);
         }
+
+        public static async void DisplaySettingsChanged(Window Window)
+        {
+            Window.Hide();
+
+            await Task.Delay(1000);
+
+            SWUS.Initialize();
+
+            await Task.Delay(500);
+
+            ContentRendered(Window);
+
+            Window.Show();
+        }
+
+        public static async void DisplaySettingsChanged(Process Process, IntPtr Handle)
+        {
+            SWNM.ShowWindow(Handle, (int)SWNM.SHOWWINDOW.SW_HIDE);
+
+            await Task.Delay(1000);
+
+            SWUS.Initialize();
+
+            await Task.Delay(500);
+
+            ApplicationRendered(Process);
+
+            SWNM.ShowWindow(Handle, (int)SWNM.SHOWWINDOW.SW_SHOW);
+        }
     }
 }