Merge branch 'master' into fixes/animationinstance-unsubscribe

native/Avalonia.Native/src/OSX/window.mm

@@ -513,6 +513,7 @@ private:
     bool _fullScreenActive;
     SystemDecorations _decorations;
     AvnWindowState _lastWindowState;
+    AvnWindowState _actualWindowState;
     bool _inSetWindowState;
     NSRect _preZoomSize;
     bool _transitioningWindowState;
@@ -539,6 +540,7 @@ private:
         _transitioningWindowState = false;
         _inSetWindowState = false;
         _lastWindowState = Normal;
+        _actualWindowState = Normal;
         WindowEvents = events;
         [Window setCanBecomeKeyAndMain];
         [Window disableCursorRects];
@@ -633,7 +635,7 @@ private:
     
     void WindowStateChanged () override
     {
-        if(!_inSetWindowState && !_transitioningWindowState)
+        if(_shown && !_inSetWindowState && !_transitioningWindowState)
         {
             AvnWindowState state;
             GetWindowState(&state);
@@ -963,14 +965,14 @@ private:
     {
         @autoreleasepool
         {
-            if(_lastWindowState == state)
+            if(_actualWindowState == state)
             {
                 return S_OK;
             }
             
             _inSetWindowState = true;
             
-            auto currentState = _lastWindowState;
+            auto currentState = _actualWindowState;
             _lastWindowState = state;
             
             if(currentState == Normal)
@@ -1049,8 +1051,11 @@ private:
                         }
                         break;
                 }
+                
+                _actualWindowState = _lastWindowState;
             }
             
+            
             _inSetWindowState = false;
             
             return S_OK;

samples/ControlCatalog/MainWindow.xaml.cs

@@ -17,7 +17,10 @@ namespace ControlCatalog
         public MainWindow()
         {
             this.InitializeComponent();
-            this.AttachDevTools();
+            this.AttachDevTools(new Avalonia.Diagnostics.DevToolsOptions()
+            {
+                StartupScreenIndex = 1,
+            });
             //Renderer.DrawFps = true;
             //Renderer.DrawDirtyRects = Renderer.DrawFps = true;
 

src/Avalonia.Diagnostics/Diagnostics/DevTools.cs

@@ -10,7 +10,8 @@ namespace Avalonia.Diagnostics
 {
     public static class DevTools
     {
-        private static readonly Dictionary<TopLevel, Window> s_open = new Dictionary<TopLevel, Window>();
+        private static readonly Dictionary<TopLevel, MainWindow> s_open =
+            new Dictionary<TopLevel, MainWindow>();
 
         public static IDisposable Attach(TopLevel root, KeyGesture gesture)
         {
@@ -52,6 +53,7 @@ namespace Avalonia.Diagnostics
                     Width = options.Size.Width,
                     Height = options.Size.Height,
                 };
+                window.SetOptions(options);
 
                 window.Closed += DevToolsClosed;
                 s_open.Add(root, window);

src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs

@@ -22,5 +22,10 @@ namespace Avalonia.Diagnostics
         /// Gets or sets the initial size of the DevTools window. The default value is 1280x720.
         /// </summary>
         public Size Size { get; set; } = new Size(1280, 720);
+
+        /// <summary>
+        /// Get or set the startup screen index where the DevTools window will be displayed.
+        /// </summary>
+        public int? StartupScreenIndex { get; set; }
     }
 }

src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs

@@ -151,7 +151,7 @@ namespace Avalonia.Diagnostics.ViewModels
             get { return _pointerOverElement; }
             private set { RaiseAndSetIfChanged(ref _pointerOverElement, value); }
         }
-
+        
         private void UpdateConsoleContext(ConsoleContext context)
         {
             context.root = _root;
@@ -213,5 +213,12 @@ namespace Avalonia.Diagnostics.ViewModels
                 tree.SelectControl(control);
             }
         }
+
+        public int? StartupScreenIndex { get; private set; } = default;
+
+        public void SetOptions(DevToolsOptions options)
+        {
+            StartupScreenIndex = options.StartupScreenIndex;
+        }
     }
 }

src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs

@@ -24,6 +24,23 @@ namespace Avalonia.Diagnostics.Views
             _keySubscription = InputManager.Instance.Process
                 .OfType<RawKeyEventArgs>()
                 .Subscribe(RawKeyDown);
+
+            EventHandler? lh = default;
+            lh = (s, e) =>
+              {
+                  this.Opened -= lh;
+                  if ((DataContext as MainViewModel)?.StartupScreenIndex is int index)
+                  {
+                      var screens = this.Screens;
+                      if (index > -1 && index < screens.ScreenCount)                          
+                      {
+                          var screen = screens.All[index];
+                          this.Position = screen.Bounds.TopLeft;
+                          this.WindowState = WindowState.Maximized;
+                      }
+                  }
+              };
+            this.Opened += lh;
         }
 
         public TopLevel? Root
@@ -115,5 +132,8 @@ namespace Avalonia.Diagnostics.Views
         }
 
         private void RootClosed(object? sender, EventArgs e) => Close();
+
+        public void SetOptions(DevToolsOptions options) =>
+            (DataContext as MainViewModel)?.SetOptions(options);
     }
 }