Wpf conversion part three

FRBDK/Glue/CompilerPlugin/Managers/Runner.cs

@@ -18,6 +18,7 @@
 using System.Threading;
 using GeneralResponse = ToolsUtilities.GeneralResponse;
 using System.ComponentModel;
+using GlueFormsCore.Controls;
 
 namespace CompilerPlugin.Managers
 {
@@ -561,12 +562,13 @@ private async void HandleProcessExit(object sender, EventArgs e)
             this._compilerViewModel.DidRunnerStartProcess = false;
 
 
-            if (!global::Glue.MainGlueWindow.Self.IsDisposed)
+            if (!GlueCommands.Self.DialogCommands.IsMainWindowDisposed())
             {
                 // This can get disposed in the meantime...
                 try
                 {
-                    global::Glue.MainGlueWindow.Self.Invoke(() =>
+
+                    MainPanelControl.Self.Invoke(() =>
                     {
                         IsRunning = runningGameProcess != null;
                         DidRunnerStartProcess = GetDidFrbEditorStartProcess();

FRBDK/Glue/CompilerPlugin/Views/BuildTabView.xaml.cs

@@ -1,5 +1,6 @@
 using CompilerPlugin.Managers;
 using FlatRedBall.Math.Geometry;
+using GlueFormsCore.Controls;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -76,7 +77,7 @@ public void PrintOutput(string text)
 
             try
             {
-                Glue.MainGlueWindow.Self.Invoke(() =>
+                MainPanelControl.Self.Invoke(() =>
                 {
                     var paragraph = TextBox.Document.Blocks.LastOrDefault() as Paragraph;
                     if(paragraph == null)
@@ -117,7 +118,7 @@ public void PrintError(string text)
 
             try
             {
-                Glue.MainGlueWindow.Self.Invoke(() =>
+                MainPanelControl.Self.Invoke(() =>
                 {
                     var paragraph = TextBox.Document.Blocks.LastOrDefault() as Paragraph;
                     if (paragraph == null)

FRBDK/Glue/GameCommunicationPlugin/GlueControl/MainCompilerPlugin.cs

@@ -42,6 +42,8 @@
 using FlatRedBall.Glue.Plugins.ExportedInterfaces.CommandInterfaces;
 using System.Security.Permissions;
 using Microsoft.Xna.Framework.Graphics;
+using GlueFormsCore.Controls;
+using System.Windows.Threading;
 
 namespace GameCommunicationPlugin.GlueControl
 {
@@ -90,7 +92,7 @@ public override Version Version
 
         bool ignoreViewModelChanges = false;
 
-        Timer dragDropTimer;
+        DispatcherTimer dragDropTimer;
 
         System.Threading.SemaphoreSlim getCommandsSemaphore = new System.Threading.SemaphoreSlim(1, 1);
 
@@ -562,9 +564,9 @@ private void CreateGameTab()
 
             // This was 250 but it wasn't fast enough to feel responsive
             var dragDropTimerFrequency = 100; // ms
-            dragDropTimer = new Timer(dragDropTimerFrequency);
-            dragDropTimer.Elapsed += (not, used) => _dragDropManagerGameWindow.HandleDragDropTimerElapsed(gameHostView);
-            dragDropTimer.SynchronizingObject = MainGlueWindow.Self;
+            dragDropTimer = new DispatcherTimer();
+            dragDropTimer.Interval = TimeSpan.FromMilliseconds(dragDropTimerFrequency);
+            dragDropTimer.Tick += (not, used) => _dragDropManagerGameWindow.HandleDragDropTimerElapsed(gameHostView);
             dragDropTimer.Start();
 
             #endregion
@@ -1164,4 +1166,6 @@ public override void HandleEvent(string eventName, string payload)
 
     }
 
+
+
 }

FRBDK/Glue/GameCommunicationPlugin/GlueControl/Views/GameHostView.xaml.cs

@@ -360,7 +360,7 @@ private void GlueViewSettingsButtonClicked(object sender, RoutedEventArgs e)
         // get solved, too high and the user sees long delays between the flickers.
         const int msDelayBetweenResizes = 5;
 
-        int lastWidth;
+        double lastWidth;
 
         private async void BottomStatusBar_ZoomMinusClick()
         {
@@ -395,7 +395,7 @@ private void ToolsSidePanel_DragEnter(object sender, DragEventArgs e)
             }
         }
 
-        int lastHeight;
+        double lastHeight;
         public async void ReactToMainWindowResizeEnd()
         {
             await ForceRefreshGameArea();
@@ -410,7 +410,7 @@ public async void ReactToMainWindowResizeEnd()
         /// <returns>An awaitable task</returns>
         public async Task ForceRefreshGameArea(bool force = false)
         {
-            var window = MainGlueWindow.Self;
+            var window = MainPanelControl.Self;
             var areSame = window.Width == lastWidth && window.Height == lastHeight;
             var are0 = lastWidth == 0 && lastHeight == 0;
 

FRBDK/Glue/Glue/AutomatedGlue/GlueGui.cs

@@ -57,31 +57,20 @@ public static void ShowMessageBox(string text, string caption)
             {
                 GlueCommands.Self.DoOnUiThread(() =>
                 {
-                    MessageBox.Show(MainGlueWindow.Self, text, caption);
+                    // todo when we convert over:
+                    //System.Windows.MessageBox.Show(MainWpfWindow, text, caption);
+                    MessageBox.Show(GlueCommands.Self.DialogCommands.Win32Window, text, caption);
                 });
             }
         }
 
-        public static void ShowMessageBox(string text)
-        {
-            if (ShowGui)
-            {
-                GlueCommands.Self.DoOnUiThread(() =>
-                {
-                    MessageBox.Show(MainGlueWindow.Self, text);
-                });
-            }
-        }
+        public static void ShowMessageBox(string text) => ShowMessageBox(text, string.Empty);
 
         public static void ShowException(string text, string caption, Exception ex)
         {
             if (ShowGui)
             {
-                GlueCommands.Self.DoOnUiThread(() =>
-                {
-                    // We want to show the exception here so we can diagnose it better.
-                    MessageBox.Show(MainGlueWindow.Self, text + "\n\n\nDetails:\n\n" + ex, caption);
-                });
+                ShowMessageBox(text + "\n\n\nDetails:\n\n" + ex, caption);
             }
             else
             {

FRBDK/Glue/Glue/Build/BuildToolAssociationManager.cs

@@ -137,7 +137,7 @@ public BuildToolAssociation GetBuildToolAssocationAndNameFor(string fileName, ou
         nfw.ResultName = FileManager.RemoveExtension(FileManager.RemovePath(fileName));
         DialogResult result = DialogResult.Cancel;
 
-        GlueCommands.Self.DoOnUiThread(() => result = nfw.ShowDialog(MainGlueWindow.Self));
+        GlueCommands.Self.DoOnUiThread(() => result = nfw.ShowDialog(GlueCommands.Self.DialogCommands.Win32Window));
         //result = nfw.ShowDialog();
         extraCommandLineArguments = "";