Merge pull request #411 from Harry-Hopkinson/fix-panel-not-active-err…

…or-message-for-#389 Fix panel not active message.
tonybaloney · Jul 4, 2023 · 67d51c4 · 67d51c4
2 parents 05c12e1 + 418f4e8
commit 67d51c4
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/src/extension/extension.ts b/src/extension/extension.ts
@@ -187,7 +187,6 @@ export function storeCollectionAsMemento(
     ]);
 }
 
-let petPlaygroundStatusBar: vscode.StatusBarItem;
 let spawnPetStatusBar: vscode.StatusBarItem;
 
 interface IPetInfo {
@@ -309,14 +308,6 @@ export function activate(context: vscode.ExtensionContext) {
         }),
     );
 
-    // status bar item
-    petPlaygroundStatusBar = vscode.window.createStatusBarItem(
-        vscode.StatusBarAlignment.Right,
-        100,
-    );
-    petPlaygroundStatusBar.command = 'vscode-pets.start';
-    context.subscriptions.push(petPlaygroundStatusBar);
-
     spawnPetStatusBar = vscode.window.createStatusBarItem(
         vscode.StatusBarAlignment.Right,
         100,
@@ -491,6 +482,12 @@ export function activate(context: vscode.ExtensionContext) {
     context.subscriptions.push(
         vscode.commands.registerCommand('vscode-pets.spawn-pet', async () => {
             const panel = getPetPanel();
+            if (
+                getConfigurationPosition() === ExtPosition.explorer &&
+                webviewViewProvider
+            ) {
+                vscode.commands.executeCommand('petsView.focus');
+            }
             if (panel) {
                 const selectedPetType = await vscode.window.showQuickPick(
                     localize.stringListAsQuickPickItemList<PetType>(ALL_PETS),
@@ -643,10 +640,6 @@ function updateStatusBar(): void {
     spawnPetStatusBar.show();
 }
 
-export function petPlaygroundDeactivate() {
-    petPlaygroundStatusBar.dispose();
-}
-
 export function spawnPetDeactivate() {
     spawnPetStatusBar.dispose();
 }