[Stride] Winforms based window (= Stride default) with always on top and extend into title bar features. Merge once stride3d/stride#1664 is merged.

Author: azeno

VL.Core.Skia.Windows/Win32CustomTitleBar.cs

@@ -19,6 +19,7 @@
 using VL.Lib.IO;
 using VL.Lib.IO.Notifications;
 using VL.UI.Core;
+using Win32CustomTitleBar = sw::VL.Core.Windows.Win32CustomTitleBar;
 
 namespace VL.Skia
 {
@@ -41,9 +42,9 @@ public partial class SkiaRenderer : Form, IDisposable, IProjectionSpace, IWorldS
         ILayer? Layer;
         bool FFirstRenderCall = true;
 
-        public SkiaRenderer()
+        public SkiaRenderer(NodeContext nodeContext, Win32CustomTitleBar.Options options)
         {
-            FAppHost = AppHost.Current;
+            FAppHost = nodeContext.AppHost;
 
             Icon = Properties.Resources.QuadIcon;
             StartPosition = FormStartPosition.Manual;
@@ -54,6 +55,8 @@ public SkiaRenderer()
             ResizeRedraw = true;
             DoubleBuffered = false;
 
+            customTitleBar = Win32CustomTitleBar.Install(this, nodeContext, options with { IsFullscreen = () => FFullScreen });
+
             BoundsChanged = new BehaviorSubject<System.Drawing.Rectangle>(new System.Drawing.Rectangle());
             FBoundsStream = new BehaviorSubject<RectangleF>(new RectangleF());
 
@@ -205,8 +208,6 @@ protected override void OnHandleCreated(EventArgs e)
             FDarkModeSubscription.Disposable = DarkTitleBarClass.Install(Handle);
             base.OnHandleCreated(e);
             renderer = new EglSkiaRenderer(RenderContextProvider);
-
-            InsertCustomMenu();
         }
 
         protected override void OnHandleDestroyed(EventArgs e)
@@ -221,7 +222,6 @@ protected override void OnResize(EventArgs e)
         {
             base.OnResize(e);
             OnBoundsChanged();
-            UpdateTitleBarButtonRects();
         }
 
         protected override void OnLocationChanged(EventArgs e)
@@ -294,6 +294,10 @@ public void MapFromPixels(INotificationWithPosition notification, out Vector2 in
 
     public class SkiaRendererTopMost : SkiaRenderer
     {
+        public SkiaRendererTopMost(NodeContext nodeContext) : base(nodeContext, new (AlwaysOnTop: true, ExtendIntoTitleBar: false))
+        {
+        }
+
         protected override bool ShowWithoutActivation => true;
         protected override CreateParams CreateParams
         {

VL.Skia/src/SkiaRenderer.Win32.cs

@@ -1,4 +1,7 @@
 #nullable enable
+
+extern alias sw;
+
 using System;
 using System.ComponentModel;
 using System.Drawing;
@@ -13,11 +16,12 @@
 using VL.Lib.Reactive;
 using VL.Skia;
 using Keys = VL.Lib.IO.Keys;
+using sw::VL.Core.Windows;
 
 namespace Graphics.Skia;
 
 /// <summary>
-/// Internal renderer node. Only visible to VL.Skia. On patch side only ILayer related things (Space, Clear, PerfMeter) is built on top.
+/// Internal renderer node. Only visible to VL.Skia. On patch side only ILayer related things (Space, Clear, PerfMeter) are built on top.
 /// </summary>
 [ProcessNode]
 [Smell(SymbolSmell.Internal)]
@@ -43,12 +47,10 @@ public SkiaRendererNode(NodeContext nodeContext,
                            bool alwaysOnTop,
                            bool extendIntoTitleBar)
     {
-        _renderer = new SkiaRenderer()
+        _renderer = new SkiaRenderer(nodeContext, new (alwaysOnTop, extendIntoTitleBar))
         {
             Text = "Skia",
-            FormBorderStyle = FormBorderStyle.Sizable,
-            TopMost = alwaysOnTop,
-            ExtendIntoTitleBar = extendIntoTitleBar,
+            FormBorderStyle = FormBorderStyle.Sizable
         };
 
         if (!bounds.IsEmpty)
@@ -72,18 +74,6 @@ public SkiaRendererNode(NodeContext nodeContext,
                     });
                 _disposables.Add(writeBounds);
             }
-
-            _renderer.MenuToggled += (s, e) =>
-            {
-                if (e == SkiaRenderer.ID_TOGGLE_TOPMOST)
-                    session.CurrentSolution
-                        .SetPinValue(nodeContext.Stack, "Always On Top", _renderer.TopMost)
-                        .Confirm(VL.Model.SolutionUpdateKind.DontCompile);
-                if (e == SkiaRenderer.ID_TOGGLE_EXTEND_INTO_TITLEBAR)
-                    session.CurrentSolution
-                        .SetPinValue(nodeContext.Stack, "Extend Into Title Bar", _renderer.ExtendIntoTitleBar)
-                        .Confirm(VL.Model.SolutionUpdateKind.DontCompile);
-            };
         }
 
         _renderer.FormClosing += (s, e) =>

VL.Skia/src/SkiaRenderer.cs

@@ -1,12 +1,13 @@
 // Modified version of Stride.Games.GameWindowRenderer using GameWindowRendererManager.
 // This class should be kept internal
 
-using System;
-using System.Reactive.Disposables;
 using Stride.Core;
 using Stride.Core.Mathematics;
 using Stride.Games;
 using Stride.Graphics;
+using Stride.Rendering;
+using System;
+using System.Reactive.Disposables;
 using VL.Core.Utils;
 
 namespace VL.Stride.Games
@@ -137,6 +138,7 @@ protected virtual void EnsurePresenter()
 
                 WindowManager.Initialize(this, GraphicsDevice, Services.GetService<IGraphicsDeviceFactory>());
             }
+            WindowManager.EnsureBackBufferHasCorrectSize();
         }
 
         public override bool BeginDraw()
@@ -170,6 +172,17 @@ public override void EndDraw()
         {
             if (beginDrawOk)
             {
+                if (Window.NativeWindow.NativeWindow is IHasCustomTitleBar customTitleBar)
+                {
+                    var renderContext = RenderContext.GetShared(Services);
+                    var renderDrawContext = renderContext.GetThreadContext();
+                    using (renderDrawContext.PushRenderTargetsAndRestore())
+                    {
+                        renderDrawContext.CommandList.SetRenderTargetAndViewport(null, Presenter.BackBuffer);
+                        customTitleBar.DrawTitleBarButtons(renderDrawContext);
+                    }
+                }
+
                 // We'd like to call Present() here like in the original code, however that would be too early
                 // in case other game systems want to draw into our backbuffer (like GameProfilingSystem).
                 // Present();

VL.Skia/src/SkiaRendererNode.cs

@@ -770,9 +770,15 @@ protected virtual void OnPreparingDeviceSettings(object sender, PreparingDeviceS
         }
 
         private void Window_ClientSizeChanged(object sender, EventArgs e)
+        {
+            EnsureBackBufferHasCorrectSize();
+        }
+
+        public void EnsureBackBufferHasCorrectSize()
         {
             var clientSize = window.ClientBounds.Size;
-            if (!isChangingDevice && !window.IsFullscreen && ((clientSize.Height != 0) || (clientSize.Width != 0)))
+            var backBufferDescription = windowRenderer.Presenter.Description;
+            if (!isChangingDevice && !window.IsFullscreen && ((clientSize.Height != 0) || (clientSize.Width != 0)) && (clientSize.Width != backBufferDescription.BackBufferWidth || clientSize.Height != backBufferDescription.BackBufferHeight))
             {
                 resizedBackBufferWidth = clientSize.Width;
                 resizedBackBufferHeight = clientSize.Height;
@@ -804,6 +810,8 @@ private void Window_OrientationChanged(object sender, EventArgs e)
             }
         }
 
+        Int2 windowedPostion;
+
         private void Window_FullscreenChanged(object sender, EventArgs eventArgs)
         {
             if (sender is GameWindow window)
@@ -834,11 +842,16 @@ private void Window_FullscreenChanged(object sender, EventArgs eventArgs)
                         resizedBackBufferHeight = output.CurrentDisplayMode.Height;
                     else
                         resizedBackBufferHeight = ApplyDesktopBoundsFix(output.DesktopBounds).Height;
+
+                    var position = output.DesktopBounds.Location;
+                    windowedPostion = window.Position;
+                    window.Position = new Int2(position.X, position.Y);
                 }
                 else
                 {
                     resizedBackBufferWidth = window.PreferredWindowedSize.X;
                     resizedBackBufferHeight = window.PreferredWindowedSize.Y;
+                    window.Position = windowedPostion;
                 }
 
                 deviceSettingsChanged = true;

VL.Stride.Runtime/VL.Stride.Engine.vl

@@ -0,0 +1,9 @@
+using Stride.Graphics;
+using Stride.Rendering;
+
+namespace VL.Stride.Games;
+
+internal interface IHasCustomTitleBar
+{
+    void DrawTitleBarButtons(RenderDrawContext renderDrawContext);
+}

VL.Stride.Runtime/src/Games/GameWindowRenderer.cs

@@ -19,6 +19,17 @@ namespace VL.Stride.Games
 {
     public class VLGame : Game, IGraphicsDeviceProvider
     {
+        internal record struct GameContextParams(NodeContext NodeContext, bool AlwaysOnTop, bool ExtendIntoTitleBar, AppContextType AppContextType, int RequestedWidth, int RequestedHeight, bool IsUserManagingRun);
+        internal static Func<GameContextParams, GameContext> VLGameContextFactory;
+
+        public static GameContext CreateGameContext(NodeContext nodeContext, bool alwaysOnTop, bool extendIntoTitleBar, AppContextType appContextType, int requestedWidth = 0, int requestedHeight = 0, bool isUserManagingRun = false)
+        {
+            if (VLGameContextFactory is null)
+                throw new InvalidOperationException("VL Stride init routines didn't run yet.");
+
+            return VLGameContextFactory(new(nodeContext, alwaysOnTop, extendIntoTitleBar, appContextType, requestedWidth, requestedHeight, isUserManagingRun));
+        }
+
         private readonly TimeSpan maximumElapsedTime = TimeSpan.FromMilliseconds(2000.0);
         private TimeSpan accumulatedElapsedGameTime;
         private bool forceElapsedTimeToZero;