Merge pull request MonoGame#2070 from nkast/tnc_Rename_SwapChainBackg…

…roundPanel

Rename SwapChainBackgroundPanel

MonoGame.Framework/GameTimer.cs

@@ -144,7 +144,7 @@ static private void OnTick()
 
             // Do we need to initialize the window event handlers?
             if (_windowEvents == null && Window.Current != null)
-                _windowEvents = new InputEvents(Window.Current.CoreWindow, SharedGraphicsDeviceManager.Current.SwapChainPanel);
+                _windowEvents = new InputEvents(Window.Current.CoreWindow, SharedGraphicsDeviceManager.Current.SwapChainBackgroundPanel);
             if (_windowEvents != null)
                 _windowEvents.UpdateState();
 

MonoGame.Framework/Graphics/GraphicsDevice.DirectX.cs

@@ -54,7 +54,7 @@ public partial class GraphicsDevice
         // The swap chain resources.
         SharpDX.Direct2D1.Bitmap1 _bitmapTarget;
         SharpDX.DXGI.SwapChain1 _swapChain;
-        SwapChainBackgroundPanel _swapChainPanel;
+        SwapChainBackgroundPanel _swapChainBackgroundPanel;
 
         float _dpi; 
 #endif
@@ -333,7 +333,7 @@ internal void CreateSizeDependentResources()
 
             // We need presentation parameters to continue here.
             if (    PresentationParameters == null ||
-                    (PresentationParameters.DeviceWindowHandle == IntPtr.Zero && PresentationParameters.SwapChainPanel == null))
+                    (PresentationParameters.DeviceWindowHandle == IntPtr.Zero && PresentationParameters.SwapChainBackgroundPanel == null))
             {
                 if (_swapChain != null)
                 {
@@ -345,9 +345,9 @@ internal void CreateSizeDependentResources()
             }
 
             // Did we change swap panels?
-            if (PresentationParameters.SwapChainPanel != _swapChainPanel)
+            if (PresentationParameters.SwapChainBackgroundPanel != _swapChainBackgroundPanel)
             {
-                _swapChainPanel = null;
+                _swapChainBackgroundPanel = null;
                 if (_swapChain != null)
                 {
                     _swapChain.Dispose();
@@ -415,9 +415,9 @@ internal void CreateSizeDependentResources()
                     }
                     else
                     {
-                        _swapChainPanel = PresentationParameters.SwapChainPanel;
+                        _swapChainBackgroundPanel = PresentationParameters.SwapChainBackgroundPanel;
 
-                        using (var nativePanel = ComObject.As<SharpDX.DXGI.ISwapChainBackgroundPanelNative>(PresentationParameters.SwapChainPanel))
+                        using (var nativePanel = ComObject.As<SharpDX.DXGI.ISwapChainBackgroundPanelNative>(PresentationParameters.SwapChainBackgroundPanel))
                         {
                             _swapChain = dxgiFactory2.CreateSwapChainForComposition(_d3dDevice, ref desc, null);
                             nativePanel.SwapChain = _swapChain;

MonoGame.Framework/Graphics/PresentationParameters.cs

@@ -121,7 +121,7 @@ public IntPtr DeviceWindowHandle
 
 #if WINDOWS_STOREAPP
         [CLSCompliant(false)]
-        public SwapChainBackgroundPanel SwapChainPanel { get; set; }
+        public SwapChainBackgroundPanel SwapChainBackgroundPanel { get; set; }
 #endif
 
         public DepthFormat DepthStencilFormat

MonoGame.Framework/GraphicsDeviceManager.cs

@@ -245,15 +245,15 @@ public void ApplyChanges()
 
 			// The graphics device can use a XAML panel or a window
 			// to created the default swapchain target.
-            if (SwapChainPanel != null)
+            if (this.SwapChainBackgroundPanel != null)
             {
                 _graphicsDevice.PresentationParameters.DeviceWindowHandle = IntPtr.Zero;
-                _graphicsDevice.PresentationParameters.SwapChainPanel = SwapChainPanel;
+                _graphicsDevice.PresentationParameters.SwapChainBackgroundPanel = this.SwapChainBackgroundPanel;
             }
             else
             {
                 _graphicsDevice.PresentationParameters.DeviceWindowHandle = _game.Window.Handle;
-                _graphicsDevice.PresentationParameters.SwapChainPanel = null;
+                _graphicsDevice.PresentationParameters.SwapChainBackgroundPanel = null;
             }
 
             // Update the back buffer.
@@ -339,15 +339,15 @@ private void Initialize()
 #elif WINRT
 			// The graphics device can use a XAML panel or a window
 			// to created the default swapchain target.
-            if (SwapChainPanel != null)
+            if (this.SwapChainBackgroundPanel != null)
             {
                 presentationParameters.DeviceWindowHandle = IntPtr.Zero;
-                presentationParameters.SwapChainPanel = SwapChainPanel;
+                presentationParameters.SwapChainBackgroundPanel = this.SwapChainBackgroundPanel;
             }
             else
             {
                 presentationParameters.DeviceWindowHandle = _game.Window.Handle;
-                presentationParameters.SwapChainPanel = null;
+                presentationParameters.SwapChainBackgroundPanel = null;
             }
 #else
             presentationParameters.DeviceWindowHandle = _game.Window.Handle;
@@ -404,7 +404,7 @@ public void ToggleFullScreen()
 
 #if WINDOWS_STOREAPP
         [CLSCompliant(false)]
-        public SwapChainBackgroundPanel SwapChainPanel { get; set; }
+        public SwapChainBackgroundPanel SwapChainBackgroundPanel { get; set; }
 #endif
 
         public GraphicsProfile GraphicsProfile { get; set; }

MonoGame.Framework/SharedGraphicsDeviceManager.cs

@@ -65,7 +65,7 @@ public SharedGraphicsDeviceManager()
 
 #if WINRT && !WINDOWS_PHONE
         [CLSCompliant(false)]
-        public SwapChainBackgroundPanel SwapChainPanel { get; set; }
+        public SwapChainBackgroundPanel SwapChainBackgroundPanel { get; set; }
 #endif 
 
         public event EventHandler<EventArgs> DeviceCreated;
@@ -90,7 +90,7 @@ public void ApplyChanges()
             presentationParameters.MultiSampleCount = MultiSampleCount;
             presentationParameters.PresentationInterval = PresentationInterval;
             presentationParameters.IsFullScreen = false;
-            presentationParameters.SwapChainPanel = SwapChainPanel;
+            presentationParameters.SwapChainBackgroundPanel = this.SwapChainBackgroundPanel;
 
             if (createDevice)
             {

MonoGame.Framework/Windows/GamerServices/Guide.cs

@@ -118,8 +118,8 @@ private static string ShowKeyboardInput(
 		 bool usePasswordMode)
         {
 #if WINDOWS_STOREAPP
-			// If SwapChainPanel is null then we are running the non-XAML template
-			if (Game.Instance.graphicsDeviceManager.SwapChainPanel == null)
+			// If SwapChainBackgroundPanel is null then we are running the non-XAML template
+			if (Game.Instance.graphicsDeviceManager.SwapChainBackgroundPanel == null)
 			{
 				throw new NotImplementedException("This method works only when using the XAML template.");
 			}

MonoGame.Framework/Windows8/XamlGame.cs

@@ -19,30 +19,30 @@ public static class XamlGame<T>
         /// </summary>
         /// <param name="launchParameters">The command line arguments from launch.</param>
         /// <param name="window">The core window object.</param>
-        /// <param name="swapPanel">The XAML swapchain panel to which we render the scene and recieve input events.</param>
+        /// <param name="SwapChainBackgroundPanel">The XAML SwapChainBackgroundPanel to which we render the scene and recieve input events.</param>
         /// <returns></returns>
-        static public T Create(string launchParameters, CoreWindow window, SwapChainBackgroundPanel swapPanel)
+        static public T Create(string launchParameters, CoreWindow window, SwapChainBackgroundPanel swapChainBackgroundPanel)
         {
             if (launchParameters == null)
                 throw new NullReferenceException("The launch parameters cannot be null!");
             if (window == null)
                 throw new NullReferenceException("The window cannot be null!");
-            if (swapPanel == null)
+            if (swapChainBackgroundPanel == null)
                 throw new NullReferenceException("The swap chain panel cannot be null!");
 
             // Save any launch parameters to be parsed by the platform.
             MetroGamePlatform.LaunchParameters = launchParameters;
 
             // Setup the window class.
-            MetroGameWindow.Instance.Initialize(window, swapPanel);
+            MetroGameWindow.Instance.Initialize(window, swapChainBackgroundPanel);
 
             // Construct the game.
             var game = new T();
 
             // Set the swap chain panel on the graphics mananger.
             if (game.graphicsDeviceManager == null)
                 throw new NullReferenceException("You must create the GraphicsDeviceManager in the Game constructor!");
-            game.graphicsDeviceManager.SwapChainPanel = swapPanel;
+            game.graphicsDeviceManager.SwapChainBackgroundPanel = swapChainBackgroundPanel;
 
             // Start running the game.
             game.Run(GameRunBehavior.Asynchronous);
@@ -56,20 +56,20 @@ static public T Create(string launchParameters, CoreWindow window, SwapChainBack
         /// </summary>
         /// <param name="launchParameters">The command line arguments from launch.</param>
         /// <param name="window">The core window object.</param>
-        /// <param name="swapPanel">The XAML swapchain panel to which we render the scene and recieve input events.</param>
+        /// <param name="swapChainBackgroundPanel">The XAML SwapChainBackgroundPanel to which we render the scene and recieve input events.</param>
         /// <returns></returns>
-        static public T Create(LaunchActivatedEventArgs args, CoreWindow window, SwapChainBackgroundPanel swapPanel)
+        static public T Create(LaunchActivatedEventArgs args, CoreWindow window, SwapChainBackgroundPanel swapChainBackgroundPanel)
         {
             MetroGamePlatform.PreviousExecutionState = args.PreviousExecutionState;
 
-            return Create(args.Arguments, window, swapPanel);
+            return Create(args.Arguments, window, swapChainBackgroundPanel);
         }
 
-        static public T Create(ProtocolActivatedEventArgs args, CoreWindow window, SwapChainBackgroundPanel swapPanel)
+        static public T Create(ProtocolActivatedEventArgs args, CoreWindow window, SwapChainBackgroundPanel swapChainBackgroundPanel)
         {
             MetroGamePlatform.PreviousExecutionState = args.PreviousExecutionState;
 
-            return Create(args.Uri.AbsoluteUri, window, swapPanel);
+            return Create(args.Uri.AbsoluteUri, window, swapChainBackgroundPanel);
         }
     }
 }