From a4a417c1bbac7997d2cc9a3ed3f418d5713f0fbc Mon Sep 17 00:00:00 2001
From: Pokey Rule <755842+pokey@users.noreply.github.com>
Date: Mon, 23 Oct 2023 20:34:36 +0100
Subject: [PATCH] tweak

---
 .../vscode/hats/performPr1868ShapeUpdateInit.ts    | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/cursorless-vscode/src/ide/vscode/hats/performPr1868ShapeUpdateInit.ts b/packages/cursorless-vscode/src/ide/vscode/hats/performPr1868ShapeUpdateInit.ts
index b8170ac483..dbcd4d388a 100644
--- a/packages/cursorless-vscode/src/ide/vscode/hats/performPr1868ShapeUpdateInit.ts
+++ b/packages/cursorless-vscode/src/ide/vscode/hats/performPr1868ShapeUpdateInit.ts
@@ -46,13 +46,6 @@ export async function performPr1868ShapeUpdateInit(
     true,
   );
 
-  if (
-    // Don't show it if they don't have any shapes enabled
-    !hasAnyShapesEnabled(hatStyleMap)
-  ) {
-    return;
-  }
-
   let shownMessage = false;
 
   // If they have any individual adjustments, we should tell them to reset them
@@ -87,7 +80,12 @@ export async function performPr1868ShapeUpdateInit(
   }
 
   // If they have any global adjustments, they may want to tweak them
-  if (userSizeAdjustment !== 0 || userVerticalOffset !== 0) {
+  if (
+    (userSizeAdjustment !== 0 || userVerticalOffset !== 0) &&
+    // Don't bother if they have no shapes enabled, as the default shape
+    // is similar enough in size / offset to the old default shape
+    hasAnyShapesEnabled(hatStyleMap)
+  ) {
     const TAKE_ME_THERE = "Take me there";
     const message = shownMessage
       ? "You may also want to tweak your global hat settings."