fixes #105

I know this is more of a patch than a proper solution, I should have looked up better what's causing the race condition of something not loading before calling editor.Focus(), but this should do, and rarely would break.

Author: maxijabase

UI/MainWindow/MainWindow.xaml.cs

@@ -36,6 +36,9 @@ public partial class MainWindow
         private readonly Storyboard EnableServerAnim;
         public readonly List<MenuItem> MenuItems;
 
+        private EditorElement EditorToFocus;
+        private readonly DispatcherTimer SelectDocumentTimer;
+
         private bool ClosingBuffer;
         private readonly bool FullyInitialized;
 
@@ -68,33 +71,53 @@ public MainWindow(SplashScreen sc)
                     ThemeManager.GetAppTheme(Program.OptionsObject.Program_Theme));
             }
 
-            ObjectBrowserColumn.Width =
-                new GridLength(Program.OptionsObject.Program_ObjectbrowserWidth, GridUnitType.Pixel);
-            var heightDescriptor =
-                DependencyPropertyDescriptor.FromProperty(ColumnDefinition.WidthProperty, typeof(ItemsControl));
-            heightDescriptor.AddValueChanged(EditorObjectBrowserGrid.ColumnDefinitions[1],
-                EditorObjectBrowserGridRow_WidthChanged);
+            // Timer to select the newly opened editor 200ms after it has been opened
+            SelectDocumentTimer = new DispatcherTimer()
+            {
+                Interval = TimeSpan.FromMilliseconds(200),
+            };
+
+            SelectDocumentTimer.Tick += (s, e) =>
+            {
+                SelectDocumentTimer.Stop();
+                EditorToFocus.editor.Focus();
+            };
+
+            // Restore sizes of panels and separators
+            ObjectBrowserColumn.Width = new GridLength(Program.OptionsObject.Program_ObjectbrowserWidth, GridUnitType.Pixel);
+            var heightDescriptor = DependencyPropertyDescriptor.FromProperty(ColumnDefinition.WidthProperty, typeof(ItemsControl));
+            heightDescriptor.AddValueChanged(EditorObjectBrowserGrid.ColumnDefinitions[1], EditorObjectBrowserGridRow_WidthChanged);
+
+            // Fill the configs menu and some toolbar combobox items
             FillConfigMenu();
             CompileButton.ItemsSource = CompileButtonDict;
             CompileButton.SelectedIndex = 0;
             CActionButton.ItemsSource = ActionButtonDict;
             CActionButton.SelectedIndex = 0;
 
+            // Enable/disable toolbar on startup
             if (Program.OptionsObject.UI_ShowToolBar)
             {
                 Win_ToolBar.Height = double.NaN;
             }
 
+            // Fill OB scripting directories combobox from the bottom
             OBDirList.ItemsSource = Program.Configs[Program.SelectedConfig].SMDirectories;
             OBDirList.SelectedIndex = 0;
 
+            // Set some visual effects
             MetroDialogOptions.AnimateHide = MetroDialogOptions.AnimateShow = false;
             BlendOverEffect = (Storyboard)Resources["BlendOverEffect"];
             EnableServerAnim = (Storyboard)Resources["EnableServerAnim"];
             DisableServerAnim = (Storyboard)Resources["DisableServerAnim"];
+
+            // Start OB
             ChangeObjectBrowserToDirectory(Program.OptionsObject.Program_ObjectBrowserDirectory);
+
+            // Translate
             Language_Translate(true);
 
+            // Load previously opened files
             if (Program.OptionsObject.LastOpenFiles != null)
             {
                 foreach (var file in Program.OptionsObject.LastOpenFiles)
@@ -103,6 +126,7 @@ public MainWindow(SplashScreen sc)
                 }
             }
 
+            // Take startup commands in consideration
             var args = Environment.GetCommandLineArgs();
             for (var i = 0; i < args.Length; ++i)
             {
@@ -112,9 +136,11 @@ public MainWindow(SplashScreen sc)
                 }
             }
 
+            // Close SplashScreen
             sc.Close(TimeSpan.FromMilliseconds(500.0));
             FullyInitialized = true;
 
+            // Enclose menuitems in an accesible list to set their InputGestureTexts easier
             MenuItems = new()
             {
                 MenuI_File,
@@ -127,16 +153,24 @@ public MainWindow(SplashScreen sc)
             };
 
             LoadInputGestureTexts();
+
+            // Load the commands dictionary in memory
             LoadCommandsDictionary();
+
+            // Load the recent files list
             LoadRecentsList();
 
+            // Disable the Reopen last closed tab button on startup for obvious reasons
             MenuI_ReopenLastClosedTab.IsEnabled = false;
 
+            // Updates the status of the File tab of the OB
             UpdateOBFileButton();
 
+            // Sets up the OB search cooldown timer
             SearchCooldownTimer = new DispatcherTimer { Interval = TimeSpan.FromMilliseconds(300) };
             SearchCooldownTimer.Tick += OnSearchCooldownTimerTick;
 
+            // Passes the Logging Box to the LoggingControl class
             LoggingControl.LogBox = LogTextbox;
         }
         #endregion
@@ -390,6 +424,8 @@ private void AddEditorElement(FileInfo fInfo, string editorTitle, bool SelectMe,
             {
                 layoutDocument.IsSelected = true;
                 editor.editor.TextArea.Caret.Show();
+                EditorToFocus = editor;
+                SelectDocumentTimer.Start();
             }
         }