From b28b32f502cc2ea7339d3795f8d1e4dec5a40b62 Mon Sep 17 00:00:00 2001
From: Misaki <misaki_39@outlook.com>
Date: Sun, 29 Mar 2026 19:55:05 +0900
Subject: [PATCH] feat(ui): migrate ProjectBrowser to GridView, improve cleanup

Refactored ProjectBrowser to use GridView instead of ItemsView for file display, updated selection logic, and set a minimum grid height. FloatingWindow now manages DockingLayout cleanup on close to prevent resource leaks. Simplified DockDocument and DockGroup instantiations in EngineEditorWindow. Updated GetDirectoryNameConverter to use Path.GetDirectoryName directly. App shutdown now calls EditorApplication.Shutdown(). Added Ghost.Engine reference in ActivationHandler.
---
 src/Editor/Ghost.Editor/ActivationHandler.cs  |  8 +++----
 src/Editor/Ghost.Editor/App.xaml.cs           |  2 +-
 .../Converters/GetDirectoryNameConverter .cs  |  2 +-
 .../View/Controls/Docking/FloatingWindow.cs   | 20 ++++++++++++----
 .../View/Controls/ProjectBrowser.xaml         | 24 +++++++------------
 .../View/Controls/ProjectBrowser.xaml.cs      |  8 +++----
 .../View/Windows/EngineEditorWindow.xaml.cs   | 22 ++++++++---------
 7 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/src/Editor/Ghost.Editor/ActivationHandler.cs b/src/Editor/Ghost.Editor/ActivationHandler.cs
index 5e1ae47..c3d019f 100644
--- a/src/Editor/Ghost.Editor/ActivationHandler.cs
+++ b/src/Editor/Ghost.Editor/ActivationHandler.cs
@@ -1,5 +1,6 @@
 using Ghost.Editor.Core.Utilities;
 using Ghost.Editor.Models;
+using Ghost.Engine;
 using Misaki.HighPerformance.LowLevel.Buffer;
 using System.Reflection;
 
@@ -62,11 +63,8 @@ internal static class ActivationHandler
 
         AllocationManager.Initialize(opts);
         TypeCache.Initialize();
-
-        // await ((Core.AssetHandle.AssetService)App.GetService<IAssetService>()).Init();
-
-        // TODO: Init other subsystems here.
-        // await Task.Delay(10000); // Wait 10 seconds to simulate work.
+        
+        //App.GetService<EngineCore>();
 
         return ValueTask.CompletedTask;
     }
diff --git a/src/Editor/Ghost.Editor/App.xaml.cs b/src/Editor/Ghost.Editor/App.xaml.cs
index 87a6bad..d1f6a1b 100644
--- a/src/Editor/Ghost.Editor/App.xaml.cs
+++ b/src/Editor/Ghost.Editor/App.xaml.cs
@@ -151,7 +151,7 @@ public partial class App : Application
             Host.StopAsync().GetAwaiter().GetResult();
             Host.Dispose();
 
-            //EditorApplication.Shutdown();
+            EditorApplication.Shutdown();
             ActivationHandler.Shutdown();
         }
         catch (Exception ex)
diff --git a/src/Editor/Ghost.Editor/Utilities/Converters/GetDirectoryNameConverter .cs b/src/Editor/Ghost.Editor/Utilities/Converters/GetDirectoryNameConverter .cs
index 9606e60..0d69fa5 100644
--- a/src/Editor/Ghost.Editor/Utilities/Converters/GetDirectoryNameConverter .cs	
+++ b/src/Editor/Ghost.Editor/Utilities/Converters/GetDirectoryNameConverter .cs	
@@ -6,7 +6,7 @@ public partial class GetDirectoryNameConverter : IValueConverter
 {
     public object? Convert(object value, Type targetType, object parameter, string language)
     {
-        return value is string path ? System.IO.Path.GetDirectoryName(path) : null;
+        return value is string path ? Path.GetDirectoryName(path) : null;
     }
 
     public object? ConvertBack(object value, Type targetType, object parameter, string language)
diff --git a/src/Editor/Ghost.Editor/View/Controls/Docking/FloatingWindow.cs b/src/Editor/Ghost.Editor/View/Controls/Docking/FloatingWindow.cs
index f22cb6e..0a1f796 100644
--- a/src/Editor/Ghost.Editor/View/Controls/Docking/FloatingWindow.cs
+++ b/src/Editor/Ghost.Editor/View/Controls/Docking/FloatingWindow.cs
@@ -7,6 +7,8 @@ namespace Ghost.Editor.View.Controls.Docking;
 /// </summary>
 public class FloatingWindow : Window
 {
+    private readonly DockingLayout _layout;
+
     /// <summary>
     /// Initializes a new instance of the <see cref="FloatingWindow"/> class with the specified document.
     /// </summary>
@@ -15,16 +17,26 @@ public class FloatingWindow : Window
     {
         ArgumentNullException.ThrowIfNull(document);
 
-        var layout = new DockingLayout();
+        _layout = new DockingLayout();
         var group = new DockGroup();
         group.AddChild(document);
         
-        layout.RootModule = group;
-        layout.LayoutEmpty += (s, e) => Close();
+        _layout.RootModule = group;
+        _layout.LayoutEmpty += (s, e) => Close();
 
-        Content = layout;
+        Content = _layout;
         
         // Basic window setup
         AppWindow.Resize(new global::Windows.Graphics.SizeInt32(800, 600));
+
+        // When the user manually closes the window, ensure we clean up the documents inside
+        this.Closed += FloatingWindow_Closed;
+    }
+
+    private void FloatingWindow_Closed(object sender, WindowEventArgs args)
+    {
+        // Force cleanup of the visual tree so we don't leak anything from this window
+        _layout.RootModule = null;
+        Content = null;
     }
 }
diff --git a/src/Editor/Ghost.Editor/View/Controls/ProjectBrowser.xaml b/src/Editor/Ghost.Editor/View/Controls/ProjectBrowser.xaml
index 8bc1a27..e77b5bb 100644
--- a/src/Editor/Ghost.Editor/View/Controls/ProjectBrowser.xaml
+++ b/src/Editor/Ghost.Editor/View/Controls/ProjectBrowser.xaml
@@ -17,7 +17,7 @@
         <converter:ExplorerItemToIconUriConverter x:Key="ExplorerItemToIconUriConverter" />
     </UserControl.Resources>
 
-    <Grid>
+    <Grid MinHeight="50">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
@@ -137,19 +137,20 @@
                     <BreadcrumbBar />
                 </Border>-->
 
-                <ItemsView
+                <GridView
                     x:Name="PART_FilesView"
                     Grid.Row="0"
                     Padding="8"
                     DoubleTapped="PART_FilesView_DoubleTapped"
                     IsDoubleTapEnabled="True"
-                    ItemsSource="{x:Bind ViewModel.Files, Mode=OneWay}"
+                    ItemsSource="{x:Bind ViewModel.Files}"
                     SelectionChanged="PART_FilesView_SelectionChanged"
                     SelectionMode="Single">
-                    <ItemsView.ItemTemplate>
+                    <GridView.ItemTemplate>
                         <DataTemplate x:DataType="model:ExplorerItem">
                             <ItemContainer>
                                 <Grid
+                                    Width="72"
                                     Padding="8"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
@@ -186,18 +187,11 @@
                                 </Grid>
                             </ItemContainer>
                         </DataTemplate>
-                    </ItemsView.ItemTemplate>
-                    <ItemsView.Layout>
-                        <UniformGridLayout
-                            ItemsStretch="None"
-                            MinColumnSpacing="4"
-                            MinItemWidth="72"
-                            MinRowSpacing="4" />
-                    </ItemsView.Layout>
-                    <ItemsView.ContextFlyout>
+                    </GridView.ItemTemplate>
+                    <GridView.ContextFlyout>
                         <ghost:ContextFlyout Tag="project-browser" />
-                    </ItemsView.ContextFlyout>
-                </ItemsView>
+                    </GridView.ContextFlyout>
+                </GridView>
 
                 <Border
                     Grid.Row="1"
diff --git a/src/Editor/Ghost.Editor/View/Controls/ProjectBrowser.xaml.cs b/src/Editor/Ghost.Editor/View/Controls/ProjectBrowser.xaml.cs
index 3552172..195dde1 100644
--- a/src/Editor/Ghost.Editor/View/Controls/ProjectBrowser.xaml.cs
+++ b/src/Editor/Ghost.Editor/View/Controls/ProjectBrowser.xaml.cs
@@ -1,3 +1,4 @@
+using CommunityToolkit.WinUI;
 using Ghost.Editor.Core.Contracts;
 using Ghost.Editor.Models;
 using Ghost.Editor.ViewModels.Controls;
@@ -49,9 +50,6 @@ internal sealed partial class ProjectBrowser : UserControl
     private void ProjectBrowser_Loaded(object sender, RoutedEventArgs e)
     {
         _inspectorService.OnSelectionChanged += _inspectorService_OnSelectionChanged;
-
-        // HACK: Scroll a little bit to trigger ScrollView to update it's scrollbar visibility. Otherwise the scrollbar will show a incorrect state when docking layout changes.
-        PART_FilesView.ScrollView.ScrollBy(1, 0);
     }
 
     private void ProjectBrowser_Unloaded(object sender, RoutedEventArgs e)
@@ -92,7 +90,7 @@ internal sealed partial class ProjectBrowser : UserControl
         _isUpdatingSelection = false;
     }
 
-    private void PART_FilesView_SelectionChanged(ItemsView sender, ItemsViewSelectionChangedEventArgs args)
+    private void PART_FilesView_SelectionChanged(object sender, SelectionChangedEventArgs args)
     {
         if (_isUpdatingSelection)
         {
@@ -139,7 +137,7 @@ internal sealed partial class ProjectBrowser : UserControl
                 else if (navigatedItem.Item2 == 1)
                 {
                     var index = ViewModel.Files.IndexOf(navigatedItem.Item1);
-                    PART_FilesView.Select(index);
+                    PART_FilesView.SelectedIndex = index;
                 }
             }
 
diff --git a/src/Editor/Ghost.Editor/View/Windows/EngineEditorWindow.xaml.cs b/src/Editor/Ghost.Editor/View/Windows/EngineEditorWindow.xaml.cs
index 8c9bb9e..c888285 100644
--- a/src/Editor/Ghost.Editor/View/Windows/EngineEditorWindow.xaml.cs
+++ b/src/Editor/Ghost.Editor/View/Windows/EngineEditorWindow.xaml.cs
@@ -49,31 +49,31 @@ internal sealed partial class EngineEditorWindow : WindowEx
 
     private void InitializeDockingLayout()
     {
-        var sceneDoc = new Ghost.Editor.View.Controls.Docking.DockDocument { Title = "Scene", Content = new Ghost.Editor.View.Pages.EngineEditor.ScenePage() };
-        var hierarchyDoc = new Ghost.Editor.View.Controls.Docking.DockDocument { Title = "Hierarchy", Content = new Ghost.Editor.View.Controls.Hierarchy() };
-        var inspectorDoc = new Ghost.Editor.View.Controls.Docking.DockDocument { Title = "Inspector", Content = new Ghost.Editor.View.Pages.EngineEditor.InspectorPage() };
-        var projectDoc = new Ghost.Editor.View.Controls.Docking.DockDocument { Title = "Project", Content = new Ghost.Editor.View.Controls.ProjectBrowser() };
-        var consoleDoc = new Ghost.Editor.View.Controls.Docking.DockDocument { Title = "Console", Content = new Ghost.Editor.View.Pages.EngineEditor.ConsolePage() };
+        var sceneDoc = new Controls.Docking.DockDocument { Title = "Scene", Content = new Pages.EngineEditor.ScenePage() };
+        var hierarchyDoc = new Controls.Docking.DockDocument { Title = "Hierarchy", Content = new Controls.Hierarchy() };
+        var inspectorDoc = new Controls.Docking.DockDocument { Title = "Inspector", Content = new Pages.EngineEditor.InspectorPage() };
+        var projectDoc = new Controls.Docking.DockDocument { Title = "Project", Content = new Controls.ProjectBrowser() };
+        var consoleDoc = new Controls.Docking.DockDocument { Title = "Console", Content = new Pages.EngineEditor.ConsolePage() };
 
-        var leftGroup = new Ghost.Editor.View.Controls.Docking.DockGroup();
+        var leftGroup = new Controls.Docking.DockGroup();
         leftGroup.AddChild(hierarchyDoc);
 
-        var centerGroup = new Ghost.Editor.View.Controls.Docking.DockGroup();
+        var centerGroup = new Controls.Docking.DockGroup();
         centerGroup.AddChild(sceneDoc);
 
-        var rightGroup = new Ghost.Editor.View.Controls.Docking.DockGroup();
+        var rightGroup = new Controls.Docking.DockGroup();
         rightGroup.AddChild(inspectorDoc);
 
-        var bottomGroup = new Ghost.Editor.View.Controls.Docking.DockGroup();
+        var bottomGroup = new Controls.Docking.DockGroup();
         bottomGroup.AddChild(projectDoc);
         bottomGroup.AddChild(consoleDoc);
 
-        var topPanel = new Ghost.Editor.View.Controls.Docking.DockPanel { Orientation = Microsoft.UI.Xaml.Controls.Orientation.Horizontal };
+        var topPanel = new Controls.Docking.DockPanel { Orientation = Microsoft.UI.Xaml.Controls.Orientation.Horizontal };
         topPanel.AddChild(leftGroup);
         topPanel.AddChild(centerGroup);
         topPanel.AddChild(rightGroup);
 
-        var rootPanel = new Ghost.Editor.View.Controls.Docking.DockPanel { Orientation = Microsoft.UI.Xaml.Controls.Orientation.Vertical };
+        var rootPanel = new Controls.Docking.DockPanel { Orientation = Microsoft.UI.Xaml.Controls.Orientation.Vertical };
         rootPanel.AddChild(topPanel);
         rootPanel.AddChild(bottomGroup);