Updated hat shapes

data/playground/hat-test.txt

@@ -6,3 +6,5 @@ g g g g g g g g g g g g g g g g g g g g g g g g g g g g g g g g g g g g g g g g
 | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
 {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
 {}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}
+
+- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

packages/cursorless-vscode/src/ide/vscode/hats/VscodeHatRenderer.ts

@@ -196,15 +196,16 @@ export default class VscodeHatRenderer {
 
   private constructColoredSvgDataUri(originalSvg: string, color: string) {
     if (
-      originalSvg.match(/fill="[^"]+"/) == null &&
-      originalSvg.match(/fill:[^;]+;/) == null
+      originalSvg.match(/fill="(?!none)[^"]+"/) == null &&
+      originalSvg.match(/fill:(?!none)[^;]+;/) == null
     ) {
       throw Error("Raw svg doesn't have fill");
     }
 
     const svg = originalSvg
-      .replace(/fill="[^"]+"/, `fill="${color}"`)
-      .replace(/fill:[^;]+;/, `fill:${color};`);
+      .replace(/fill="(?!none)[^"]+"/g, `fill="${color}"`)
+      .replace(/fill:(?!none)[^;]+;/g, `fill:${color};`)
+      .replace(/\r?\n/g, " ");
 
     const encoded = encodeURIComponent(svg);
 

packages/cursorless-vscode/src/ide/vscode/hats/shapeAdjustments.ts

@@ -7,49 +7,52 @@ export interface HatAdjustments {
 
 export type IndividualHatAdjustmentMap = Record<HatShape, HatAdjustments>;
 
-export const DEFAULT_HAT_HEIGHT_EM = 0.29;
+export const DEFAULT_HAT_HEIGHT_EM = 0.38;
 export const DEFAULT_VERTICAL_OFFSET_EM = 0.032;
 
 export const defaultShapeAdjustments: IndividualHatAdjustmentMap = {
   default: {
-    sizeAdjustment: -14,
-    verticalOffset: -0.35,
+    sizeAdjustment: -15,
+    verticalOffset: 0,
   },
   ex: {
-    sizeAdjustment: 10,
+    sizeAdjustment: 0,
+    verticalOffset: 0,
   },
   fox: {
-    sizeAdjustment: 10,
+    sizeAdjustment: 0,
+    verticalOffset: 0,
   },
   wing: {
-    sizeAdjustment: 15.5,
-    verticalOffset: 1.1,
+    sizeAdjustment: 0,
+    verticalOffset: 0,
   },
   hole: {
-    sizeAdjustment: 32.5,
-    verticalOffset: -2,
+    sizeAdjustment: 0,
+    verticalOffset: 0,
   },
   frame: {
-    sizeAdjustment: -15,
-    verticalOffset: -2.25,
+    sizeAdjustment: -10,
+    verticalOffset: 0,
   },
   curve: {
-    sizeAdjustment: -21,
-    verticalOffset: -3.15,
+    sizeAdjustment: 0,
+    verticalOffset: -5,
   },
   eye: {
-    sizeAdjustment: -6.5,
-    verticalOffset: -1,
+    sizeAdjustment: 0,
+    verticalOffset: 0,
   },
   play: {
-    sizeAdjustment: -8,
-    verticalOffset: -0.5,
+    sizeAdjustment: 0,
+    verticalOffset: 0,
   },
   bolt: {
-    sizeAdjustment: 22.5,
+    sizeAdjustment: 0,
+    verticalOffset: 0,
   },
   crosshairs: {
-    sizeAdjustment: 29.5,
-    verticalOffset: -1,
+    sizeAdjustment: 0,
+    verticalOffset: 0,
   },
 };

packages/cursorless-vscode/src/scripts/preprocessSvgHats.ts

@@ -9,6 +9,7 @@ async function main() {
   const dumper = new parser.XMLBuilder({
     ignoreAttributes: false,
     suppressEmptyNode: true,
+    format: true,
   });
 
   readdirSync(directory, { withFileTypes: true }).forEach(async (dirent) => {
@@ -30,8 +31,8 @@ async function main() {
 
     const outputSvg = dumper
       .build(svgJson)
-      .replace(/fill="[^"]+"/, `fill="#666666"`)
-      .replace(/fill:[^;]+;/, `fill:#666666;`);
+      .replace(/fill="(?!none)[^"]+"/g, 'fill="#666666"')
+      .replace(/fill:(?!none)[^;]+;/g, "fill:#666666;");
 
     await fsp.writeFile(filePath, outputSvg);
   });