merge

1 files changed, 1 insertions, 20 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml.cs
index bf621ff2e..b90a1afff 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml.cs
@@ -61,12 +61,6 @@ namespace Tango.PPC.UI
                     has_touch = true;
                 }
             }
-
-#if !DEBUG
-            ForceTouch();
-            has_touch = true;
-#endif
-
 #endif
 
             if (!has_touch)
@@ -78,7 +72,7 @@ namespace Tango.PPC.UI
                 gridMain.Height = 1280;
                 viewBox.Child = gridMain;
                 LockAspectRatio();
-                this.SizeChanged += (x, y) =>
+                this.SizeChanged += (x, y) => 
                 {
                     LockAspectRatio();
                 };
@@ -87,18 +81,6 @@ namespace Tango.PPC.UI
             Closing += MainWindow_Closing;
         }
 
-        private void ForceTouch()
-        {
-            WindowStyle = WindowStyle.None;
-            ResizeMode = ResizeMode.NoResize;
-            WindowStartupLocation = WindowStartupLocation.Manual;
-            Topmost = false; // sure?
-            Left = 0;
-            Top = 0;
-            Width = System.Windows.Forms.Screen.PrimaryScreen.Bounds.Width;
-            Height = System.Windows.Forms.Screen.PrimaryScreen.Bounds.Height;
-        }
-
         protected override void OnSourceInitialized(EventArgs e)
         {
             //var hwndSource = PresentationSource.FromVisual(this) as HwndSource;
@@ -116,7 +98,6 @@ namespace Tango.PPC.UI
 
         private void MainWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
         {
-            e.Cancel = true;
             TangoIOC.Default.GetInstance<IPPCApplicationManager>().ShutDown();
         }
     }