Skip to content

Commit 4de8f02

Browse files
AndreasArvidssonpre-commit-ci-lite[bot]phillcopokey
authored andcommitted
Updated hat shapes (#1868)
* Updated hat shape svg for increased area * svg all now have the same size and proportions which means that we don't have to do as much tweaking in typescript * hats have an increased default height main ![image](https://github.com/cursorless-dev/cursorless/assets/3511326/86a9a80b-fbd4-477f-8c6f-082adbc7f4dd) pr1868 ![image](https://github.com/cursorless-dev/cursorless/assets/3511326/5431585d-e722-4645-982a-536d0a0d3b18) matt 2.1 ![image](https://github.com/cursorless-dev/cursorless/assets/3511326/4708606d-4228-4863-91db-54d56c684741) matt 2.3 ![image](https://github.com/cursorless-dev/cursorless/assets/3511326/edd19b7f-4f11-4c8d-a2fe-369ce290f280) pr1868 vs 2.1 vs 2.3 ![image](https://github.com/cursorless-dev/cursorless/assets/3511326/e681962c-9166-4983-9fc3-c8b0e3b29a2c) ![image](https://github.com/cursorless-dev/cursorless/assets/3511326/ed33ff22-f08d-4d02-8234-a4f664da7ffd) ![image](https://github.com/cursorless-dev/cursorless/assets/3511326/f5512cb7-291b-4ffe-9ff3-3a2a7eb47a22) ## Checklist - [x] Do a pass through looking at the hat sorting to see if we want to reorder them - [x] Check that the order of hats in constants is same as order in package.json - [ ] Send message to users indicating that if they have used the individual hat adjustments setting, they may want to reset it and start over because things have changed - [/] I have added [tests](https://www.cursorless.org/docs/contributing/test-case-recorder/) - [/] I have updated the [docs](https://github.com/cursorless-dev/cursorless/tree/main/docs) and [cheatsheet](https://github.com/cursorless-dev/cursorless/tree/main/cursorless-talon/src/cheatsheet) - [/] I have not broken the cheatsheet --------- Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Co-authored-by: Phil Cohen <[email protected]> Co-authored-by: Pokey Rule <[email protected]>
1 parent 2ad5f06 commit 4de8f02

24 files changed

+269
-109
lines changed

changelog/2023-09-updatedHatShapes.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
tags: [enhancement]
3+
pullRequest: 1868
4+
---
5+
6+
- Updated the default Cursorless hat shapes. All the hat shapes have been reworked with the goal to improve visibility. Many of the shapes have been made thicker to enhance color recognition. See the [shape docs](https://www.cursorless.org/docs/#shapes) for more info.

data/playground/hat-test.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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
66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
77
{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
88
{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}
9+
10+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

docs/user/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,16 @@ The following shapes are supported. Note that to target the default (dot) shape
8282
| Spoken form | Shape | Internal ID | Enabled by default? |
8383
| ----------- | ----------------------------------------------- | ------------ | ------------------- |
8484
| N/A | ![Default](../../images/hats/default.svg) | `default` ||
85-
| `"ex"` | ![Ex](../../images/hats/ex.svg) | `ex` ||
85+
| `"bolt"` | ![Bolt](../../images/hats/bolt.svg) | `bolt` ||
86+
| `"curve"` | ![Curve](../../images/hats/curve.svg) | `curve` ||
8687
| `"fox"` | ![Fox](../../images/hats/fox.svg) | `fox` ||
87-
| `"wing"` | ![Wing](../../images/hats/wing.svg) | `wing` ||
88-
| `"hole"` | ![Hole](../../images/hats/hole.svg) | `hole` ||
8988
| `"frame"` | ![Frame](../../images/hats/frame.svg) | `frame` ||
90-
| `"curve"` | ![Curve](../../images/hats/curve.svg) | `curve` ||
91-
| `"eye"` | ![Eye](../../images/hats/eye.svg) | `eye` ||
9289
| `"play"` | ![Play](../../images/hats/play.svg) | `play` ||
90+
| `"wing"` | ![Wing](../../images/hats/wing.svg) | `wing` ||
91+
| `"hole"` | ![Hole](../../images/hats/hole.svg) | `hole` ||
92+
| `"ex"` | ![Ex](../../images/hats/ex.svg) | `ex` ||
9393
| `"cross"` | ![Crosshairs](../../images/hats/crosshairs.svg) | `crosshairs` ||
94-
| `"bolt"` | ![Bolt](../../images/hats/bolt.svg) | `bolt` ||
94+
| `"eye"` | ![Eye](../../images/hats/eye.svg) | `eye` ||
9595

9696
You can enable or disable shapes in your VSCode settings, by searching for `cursorless.hatEnablement.shapes` and checking the box next to the internal ID for the given shape as listed above. To navigate to your VSCode settings, either say "show settings", or go to File --> Preferences --> Settings.
9797

images/hats/bolt.svg

Lines changed: 3 additions & 1 deletion
Loading

images/hats/crosshairs.svg

Lines changed: 3 additions & 1 deletion
Loading

images/hats/curve.svg

Lines changed: 3 additions & 1 deletion
Loading

images/hats/default.svg

Lines changed: 3 additions & 1 deletion
Loading

images/hats/ex.svg

Lines changed: 3 additions & 1 deletion
Loading

images/hats/eye.svg

Lines changed: 3 additions & 1 deletion
Loading

images/hats/fox.svg

Lines changed: 3 additions & 1 deletion
Loading

0 commit comments

Comments
 (0)