fix(toolwindow): simplify tool window registration and UI

- Remove auto-show logic that was causing window to close
- Remove conflicting visibility attributes
- Simplify XAML to basic placeholder for debugging
- Window now opens only via View menu

Author: CalvinAllen

src/CodingWithCalvin.LaunchyBar/LaunchyBarPackage.cs

@@ -16,21 +16,10 @@ namespace CodingWithCalvin.LaunchyBar;
 [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
 [Guid(VSCommandTableVsct.guidLaunchyBarPackageString)]
 [ProvideMenuResource("Menus.ctmenu", 1)]
-[ProvideToolWindow(
-    typeof(LaunchyBarWindow),
-    Style = VsDockStyle.MDI,
-    Orientation = ToolWindowOrientation.Left,
-    Width = 60,
-    Height = 600,
-    Window = "3ae79031-e1bc-11d0-8f78-00a0c9110057")]
-[ProvideToolWindowVisibility(typeof(LaunchyBarWindow), VSConstants.UICONTEXT.NoSolution_string)]
-[ProvideToolWindowVisibility(typeof(LaunchyBarWindow), VSConstants.UICONTEXT.SolutionExists_string)]
-[ProvideToolWindowVisibility(typeof(LaunchyBarWindow), VSConstants.UICONTEXT.EmptySolution_string)]
+[ProvideToolWindow(typeof(LaunchyBarWindow))]
 [ProvideAutoLoad(VSConstants.UICONTEXT.ShellInitialized_string, PackageAutoLoadFlags.BackgroundLoad)]
-[ProvideAutoLoad(VSConstants.UICONTEXT.NoSolution_string, PackageAutoLoadFlags.BackgroundLoad)]
-[ProvideAutoLoad(VSConstants.UICONTEXT.SolutionExists_string, PackageAutoLoadFlags.BackgroundLoad)]
 [ProvideOptionPage(typeof(OptionsProvider.GeneralOptionsPage), "LaunchyBar", "General", 0, 0, true)]
-public sealed class LaunchyBarPackage : AsyncPackage
+public sealed class LaunchyBarPackage : ToolkitPackage
 {
     public static LaunchyBarPackage? Instance { get; private set; }
 
@@ -63,24 +52,6 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
         LaunchService = new LaunchService(this);
 
         await this.RegisterCommandsAsync();
-
-        await ShowToolWindowAsync(cancellationToken);
-    }
-
-    private async Task ShowToolWindowAsync(CancellationToken cancellationToken)
-    {
-        await JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
-
-        var window = await FindToolWindowAsync(
-            typeof(LaunchyBarWindow),
-            0,
-            create: true,
-            cancellationToken);
-
-        if (window?.Frame is IVsWindowFrame windowFrame)
-        {
-            Microsoft.VisualStudio.ErrorHandler.ThrowOnFailure(windowFrame.Show());
-        }
     }
 
     protected override void Dispose(bool disposing)

src/CodingWithCalvin.LaunchyBar/ToolWindow/LaunchyBarControl.xaml

@@ -4,64 +4,15 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:vs="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.15.0"
-             xmlns:catalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog"
-             xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
-             xmlns:theming="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
              mc:Ignorable="d"
              d:DesignHeight="600" d:DesignWidth="48"
-             Background="{DynamicResource {x:Static vs:VsBrushes.ToolWindowBackgroundKey}}"
-             theming:ImageThemingUtilities.ImageBackgroundColor="{DynamicResource {x:Static vs:VsColors.ToolWindowBackgroundKey}}">
-
-  <UserControl.Resources>
-    <ResourceDictionary>
-      <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="../Themes/LaunchyBarStyles.xaml"/>
-      </ResourceDictionary.MergedDictionaries>
-    </ResourceDictionary>
-  </UserControl.Resources>
+             Background="{DynamicResource {x:Static vs:VsBrushes.ToolWindowBackgroundKey}}">
 
   <Grid>
-    <Grid.RowDefinitions>
-      <RowDefinition Height="*"/>
-      <RowDefinition Height="Auto"/>
-    </Grid.RowDefinitions>
-
-    <!-- Top Items (flow down) -->
-    <ItemsControl Grid.Row="0"
-                  ItemsSource="{Binding TopItems}"
-                  VerticalAlignment="Top">
-      <ItemsControl.ItemTemplate>
-        <DataTemplate>
-          <Button Style="{StaticResource LaunchyBarButtonStyle}"
-                  Command="{Binding DataContext.LaunchCommand, RelativeSource={RelativeSource AncestorType=UserControl}}"
-                  CommandParameter="{Binding}"
-                  ToolTip="{Binding Name}"
-                  IsEnabled="{Binding IsEnabled}">
-            <imaging:CrispImage x:Name="ButtonImage"
-                                Width="24" Height="24"
-                                Moniker="{Binding IconMoniker}" />
-          </Button>
-        </DataTemplate>
-      </ItemsControl.ItemTemplate>
-    </ItemsControl>
-
-    <!-- Bottom Items (flow up) -->
-    <ItemsControl Grid.Row="1"
-                  ItemsSource="{Binding BottomItems}"
-                  VerticalAlignment="Bottom">
-      <ItemsControl.ItemTemplate>
-        <DataTemplate>
-          <Button Style="{StaticResource LaunchyBarButtonStyle}"
-                  Command="{Binding DataContext.LaunchCommand, RelativeSource={RelativeSource AncestorType=UserControl}}"
-                  CommandParameter="{Binding}"
-                  ToolTip="{Binding Name}"
-                  IsEnabled="{Binding IsEnabled}">
-            <imaging:CrispImage x:Name="ButtonImage"
-                                Width="24" Height="24"
-                                Moniker="{Binding IconMoniker}" />
-          </Button>
-        </DataTemplate>
-      </ItemsControl.ItemTemplate>
-    </ItemsControl>
+    <TextBlock Text="LaunchyBar"
+               Foreground="{DynamicResource {x:Static vs:VsBrushes.ToolWindowTextKey}}"
+               VerticalAlignment="Center"
+               HorizontalAlignment="Center"
+               TextWrapping="Wrap"/>
   </Grid>
 </UserControl>

src/CodingWithCalvin.LaunchyBar/ToolWindow/LaunchyBarControl.xaml.cs

@@ -1,6 +1,4 @@
 using System.Windows.Controls;
-using CodingWithCalvin.LaunchyBar.ViewModels;
-using Microsoft.VisualStudio.Shell;
 
 namespace CodingWithCalvin.LaunchyBar.ToolWindow;
 
@@ -12,25 +10,5 @@ public partial class LaunchyBarControl : UserControl
     public LaunchyBarControl()
     {
         InitializeComponent();
-
-        Loaded += OnLoaded;
-    }
-
-    private async void OnLoaded(object sender, System.Windows.RoutedEventArgs e)
-    {
-        var package = LaunchyBarPackage.Instance;
-        if (package?.ConfigurationService != null && package?.LaunchService != null)
-        {
-            var viewModel = new LaunchyBarViewModel(
-                package.ConfigurationService,
-                package.LaunchService);
-
-            DataContext = viewModel;
-
-            await ThreadHelper.JoinableTaskFactory.RunAsync(async () =>
-            {
-                await viewModel.InitializeAsync();
-            });
-        }
     }
 }

src/CodingWithCalvin.LaunchyBar/ToolWindow/LaunchyBarWindow.cs

@@ -28,6 +28,20 @@ public LaunchyBarWindow() : base(null)
     /// </summary>
     public static async Task ShowAsync()
     {
-        await VS.Windows.ShowToolWindowAsync(new Guid(VSCommandTableVsct.guidLaunchyBarToolWindowString));
+        await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
+
+        var package = LaunchyBarPackage.Instance;
+        if (package == null) return;
+
+        var window = await package.FindToolWindowAsync(
+            typeof(LaunchyBarWindow),
+            0,
+            create: true,
+            package.DisposalToken);
+
+        if (window?.Frame is Microsoft.VisualStudio.Shell.Interop.IVsWindowFrame frame)
+        {
+            Microsoft.VisualStudio.ErrorHandler.ThrowOnFailure(frame.Show());
+        }
     }
 }