Merge pull request #1653 from vchelaru/vicdotexe/1640-loosing-focus

1640 - focus disjoint on treenode movement
vchelaru · Nov 23, 2024 · dc4f784 · dc4f784
2 parents 4c1c113 + 9f747ad
commit dc4f784
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/FRBDK/Glue/Glue/FormHelpers/RightClickHelper.cs b/FRBDK/Glue/Glue/FormHelpers/RightClickHelper.cs
@@ -2204,8 +2204,11 @@ private static void PostMoveActivity(object objectMoved, int oldIndex, int newIn
         }
 
         PluginManager.ReactToObjectReordered(objectMoved, oldIndex, newIndex);
+        ObjectMoved?.Invoke(objectMoved);
     }
 
+    public static event Action<object> ObjectMoved;
+
     public static void SetExternallyBuiltFileIfHigherThanCurrent(string directoryOfFile, bool performSave)
     {
         if (directoryOfFile == null)

diff --git a/FRBDK/Glue/OfficialPlugins/TreeViewPlugin/Views/MainTreeViewControl.xaml.cs b/FRBDK/Glue/OfficialPlugins/TreeViewPlugin/Views/MainTreeViewControl.xaml.cs
@@ -1,4 +1,4 @@
-using FlatRedBall.Glue.Events;
+using FlatRedBall.Glue.Events;
 using FlatRedBall.Glue.FormHelpers;
 using FlatRedBall.Glue.Managers;
 using FlatRedBall.Glue.Navigation;
@@ -15,6 +15,7 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
+using PropertyTools.Wpf;
 
 namespace OfficialPlugins.TreeViewPlugin.Views;
 
@@ -46,6 +47,15 @@ public enum LeftOrRight
     public MainTreeViewControl()
     {
         InitializeComponent();
+        RightClickHelper.ObjectMoved += movedObject =>
+        {
+            if (GlueState.Self.Find.TreeNodeByTag(movedObject) is { } treeNode &&
+                MainTreeView.ItemContainerGenerator.ContainerFromItem(treeNode) is TreeListBoxItem treeItem)
+            {
+                Dispatcher.BeginInvoke(treeItem.Focus);
+            }
+        };
+
     }
 
     #region Hotkey