New windows load in the same monitor as octgn

Fixes octgn#977
totalgit · Aug 15, 2013 · 5099e5f · 5099e5f
1 parent 6a67fc9
commit 5099e5f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/octgnFX/Octgn/Controls/OctgnChrome.cs b/octgnFX/Octgn/Controls/OctgnChrome.cs
@@ -357,10 +357,19 @@ public OctgnChrome()
                     this.AllowsTransparency = false;
                     base.Background = new SolidColorBrush(Color.FromRgb(64, 64, 64));
                 }
+                Program.OnOptionsChanged += ProgramOnOnOptionsChanged;
+                SubscriptionModule.Get().IsSubbedChanged += OnIsSubbedChanged;
             }
 
-            Program.OnOptionsChanged += ProgramOnOnOptionsChanged;
-            SubscriptionModule.Get().IsSubbedChanged += OnIsSubbedChanged;
+            this.WindowStartupLocation = WindowStartupLocation.CenterScreen;
+
+            var mainWindow = WindowManager.Main ?? System.Windows.Application.Current.MainWindow;
+            if (mainWindow != null && mainWindow.Owner == null && !Equals(mainWindow, this) && mainWindow.IsVisible)
+            {
+                this.WindowStartupLocation = WindowStartupLocation.Manual;
+                this.Left = mainWindow.Left + 10;
+                this.Top = mainWindow.Top + 10;
+            }
 
             base.Content = this.MainBorder;
 

diff --git a/recentchanges.txt b/recentchanges.txt
@@ -1,3 +1,4 @@
 Updated some release automation tasks - Kelly
 Made game sounds async - Kelly
-Add mp3 support for sound playback - Kelly
+Add mp3 support for sound playback - Kelly
+New windows created load in the same monitor as OCTGN #977 - Kelly