Updated hat shapes #1868

AndreasArvidsson · 2023-09-08T05:23:35Z

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

pr1868

matt 2.1

matt 2.3

pr1868 vs 2.1 vs 2.3

Checklist

Do a pass through looking at the hat sorting to see if we want to reorder them
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
[/] I have updated the docs and cheatsheet
[/] I have not broken the cheatsheet

pokey

Nice! How long were you guys at it yesterday?

images/hats/wing.svg

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

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

pokey · 2023-09-08T15:59:22Z

Also, I believe the same changes need to be made to the pre processor, and you'll want to run the preprocessor on these hats. Notice how all the hats in the docs deploy preview are now red

Ideally we'd run the preprocessor in pre-commit or meta-updater

pokey · 2023-09-08T16:01:39Z

In terms of shapes, at quick glance they all look nice except I don't love how wing and fox are nearly direct mirror images. As discussed, that has been an issue for users (myself included 😅)

AndreasArvidsson · 2023-09-08T16:49:09Z

I feel the same, but it's hard to make wing have more area and still be distinct in shape.

pokey

Getting there. See inline comment, and icymi #1868 (comment)

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

AndreasArvidsson · 2023-09-09T07:36:36Z

Preprocessor and other comments are now dealt with. I only have another crack at redesigning wing left.

edit: I don't really have a better suggestion for wing at the moment.

pokey

Looks good! Maybe we should drive it for a couple days before merging?

Btw how'd you get the SVGs so clean? They were much messier before

AndreasArvidsson · 2023-09-09T09:21:39Z

Sounds reasonable to run with this for a few days

I disabled the frame/clip rectangle from being exported in Figma

pokey · 2023-09-09T13:21:18Z

Just reposting my comments from Figma here for visibility:

default feels a bit chunky relative to other hats (maybe easiest to solve this one in code)
hole and frame look like they could be tough to distinguish. hole and eye may also be an issue. I'll see how this one plays out after a couple days' use.
crosshairs kinda just looks like a blob when it's that small. I'm not sure that's necessarily a showstopper, but we'll see if that messes with usability
frame feels a little bit chunky relative to eg fox. Maybe the answer is slightly beef up fox? 🤷‍♂️
worried about curve vs wing; maybe the pointiness on the top of wing will help things
curve sits a bit high, esp compared to eg wing (maybe easiest to solve this one in code)

pokey · 2023-09-09T13:25:15Z

If anyone wants to try these hats out locally and is comfortable piping curl to bash, here's a magic incantation to install them locally:

curl -sSf https://raw.githubusercontent.com/cursorless-dev/cursorless/main/packages/cursorless-vscode/scripts/install-from-pr.sh | bash -s -- 1868

Alternately, if you prefer not to curl into bash, check out this PR locally and run pnpm -F cursorless-vscode install-local

cc/ @jmegner

AndreasArvidsson · 2023-09-10T07:04:28Z

Just reposting my comments from Figma here for visibility:

* `default` feels a bit chunky relative to other hats (maybe easiest to solve this one in code)

* `hole` and `frame` look like they could be tough to distinguish. `hole` and `eye` may also be an issue. I'll see how this one plays out after a couple days' use.

* `crosshairs` kinda just looks like a blob when it's that small. I'm not sure that's necessarily a showstopper, but we'll see if that messes with usability

* `frame` feels a little bit chunky relative to eg `fox`. Maybe the answer is slightly beef up `fox`? 🤷‍♂️

* worried about `curve` vs `wing`; maybe the pointiness on the top of wing will help things

* `curve` sits a bit high, esp compared to eg `wing` (maybe easiest to solve this one in code)

It definitely is hard to do comparisons like this in Figma for a couple of reasons. 1 vscode doesn't actually render them in small sizes the same way that Figma does and 2 I have already applied size and vertical offset in code for a few hats. default and frame have been reduced in size and curve have been moved down. Looking at the two images in this pr and of course trying them out for yourself is more indicative of actual experience.

We definitely need to discuss this on the meetup

AndreasArvidsson · 2023-10-17T17:12:22Z

That new default light color looks way to bright for me

pokey · 2023-10-17T19:04:00Z

There should be no new default light color. It's only for dark

pokey · 2023-10-19T10:10:54Z

update from meet-up:

use this hat order:

default
bolt
curve
fox
frame
play
wing
hole
ex
crosshairs
eye

Then:

increase fox and ex by 5%
decrease crosshairs by 10%
send to matt
send to users for feedback

AndreasArvidsson · 2023-10-23T06:08:46Z

@pokey ex, fox, frame have been increased in size.

This reverts commit 0b684a9.

AndreasArvidsson · 2023-10-23T10:27:55Z

@pokey last commit reverted

pokey · 2023-10-23T17:42:17Z

ok @AndreasArvidsson this should now show a message if the user has shapes enabled and has any active adjustments. It checks once on first update, and then never checks again, so that subsequent shape tweaks won't trigger a message. Lmk if it works for you locally

pokey

ok this looks good to me! @AndreasArvidsson lmk once you've had a chance to look at my hat adjustment message code and try it locally, then I'll ship it so I can coordinate with a message and be there in case a fire breaks out or something 😄

AndreasArvidsson · 2023-10-24T06:10:22Z

@pokey Looks fine

pokey · 2023-10-24T09:33:50Z

Great! When you run it locally, you should get one pop up, then no more, assuming you have global hat adjustments but no individual adjustments. And then the button should take you to the hat adjustments. Is that what happened?

AndreasArvidsson · 2023-10-24T09:42:04Z

Correct

* 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]>

Updated hat shape svg and associated settings

447e0ca

AndreasArvidsson requested a review from pokey as a code owner September 8, 2023 05:23

pre-commit-ci-lite bot and others added 2 commits September 8, 2023 05:25

[pre-commit.ci lite] apply automatic fixes

a77ecc5

Update hole

c5554da

pokey reviewed Sep 8, 2023

View reviewed changes

Merge branch 'main' into updatedHatShapes

94534ac

AndreasArvidsson added 2 commits September 8, 2023 19:32

Update replace

04d8741

Replace with space

1654726

pokey reviewed Sep 8, 2023

View reviewed changes

packages/cursorless-vscode/src/ide/vscode/hats/VscodeHatRenderer.ts Outdated Show resolved Hide resolved

AndreasArvidsson added 2 commits September 9, 2023 09:14

Updated regex

a7f4661

Updated preprocess script

d5f5156

AndreasArvidsson added 3 commits September 9, 2023 09:37

Merge branch 'main' into updatedHatShapes

bc5d0e2

Removed clip rectangle

c46dafe

Update hole

0fad9b7

pokey reviewed Sep 9, 2023

View reviewed changes

Update frame size

6dae082

AndreasArvidsson added the to discuss Plan to discuss at meet-up label Sep 10, 2023

AndreasArvidsson added 3 commits September 11, 2023 08:32

Rebalance frame

8aacef0

update

97394c3

Merge branch 'main' into updatedHatShapes

880d658

AndreasArvidsson removed the to discuss Plan to discuss at meet-up label Sep 12, 2023

Added changelog

aa27b01

change alignment

6eeb84a

Update default dark theme color

887a3ae

AndreasArvidsson added 3 commits October 19, 2023 12:24

Update order and sizes

f0f65ed

Remove offsets

c03ed11

Update shapes

0b684a9

Revert "Update shapes"

ddfaf5e

This reverts commit 0b684a9.

AndreasArvidsson marked this pull request as ready for review October 23, 2023 10:27

pokey added 2 commits October 23, 2023 18:34

Initial attempt to show message

0c6cdce

tweak

3731151

pokey added 2 commits October 23, 2023 19:34

tweak

c4761ed

tweak

a4a417c

pokey reviewed Oct 23, 2023

View reviewed changes

pokey enabled auto-merge October 24, 2023 10:12

pokey approved these changes Oct 24, 2023

View reviewed changes

pokey added this pull request to the merge queue Oct 24, 2023

Merged via the queue into main with commit 71ccbdd Oct 24, 2023
13 checks passed

pokey deleted the updatedHatShapes branch October 24, 2023 10:25

This was referenced Oct 27, 2023

thicker hats #1809

Closed

support hat strokes as a hidden feature #1810

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Updated hat shapes #1868

Updated hat shapes #1868

AndreasArvidsson commented Sep 8, 2023 •

edited by pokey

Loading

pokey left a comment

pokey commented Sep 8, 2023

pokey commented Sep 8, 2023

AndreasArvidsson commented Sep 8, 2023

pokey left a comment

AndreasArvidsson commented Sep 9, 2023 •

edited

Loading

pokey left a comment

AndreasArvidsson commented Sep 9, 2023 •

edited

Loading

pokey commented Sep 9, 2023

pokey commented Sep 9, 2023 •

edited

Loading

AndreasArvidsson commented Sep 10, 2023 •

edited

Loading

AndreasArvidsson commented Oct 17, 2023

pokey commented Oct 17, 2023 •

edited

Loading

pokey commented Oct 19, 2023 •

edited by AndreasArvidsson

Loading

AndreasArvidsson commented Oct 23, 2023

AndreasArvidsson commented Oct 23, 2023

pokey commented Oct 23, 2023

pokey left a comment

AndreasArvidsson commented Oct 24, 2023

pokey commented Oct 24, 2023 •

edited

Loading

AndreasArvidsson commented Oct 24, 2023

Updated hat shapes #1868

Updated hat shapes #1868

Conversation

AndreasArvidsson commented Sep 8, 2023 • edited by pokey Loading

Checklist

pokey left a comment

Choose a reason for hiding this comment

pokey commented Sep 8, 2023

pokey commented Sep 8, 2023

AndreasArvidsson commented Sep 8, 2023

pokey left a comment

Choose a reason for hiding this comment

AndreasArvidsson commented Sep 9, 2023 • edited Loading

pokey left a comment

Choose a reason for hiding this comment

AndreasArvidsson commented Sep 9, 2023 • edited Loading

pokey commented Sep 9, 2023

pokey commented Sep 9, 2023 • edited Loading

AndreasArvidsson commented Sep 10, 2023 • edited Loading

AndreasArvidsson commented Oct 17, 2023

pokey commented Oct 17, 2023 • edited Loading

pokey commented Oct 19, 2023 • edited by AndreasArvidsson Loading

AndreasArvidsson commented Oct 23, 2023

AndreasArvidsson commented Oct 23, 2023

pokey commented Oct 23, 2023

pokey left a comment

Choose a reason for hiding this comment

AndreasArvidsson commented Oct 24, 2023

pokey commented Oct 24, 2023 • edited Loading

AndreasArvidsson commented Oct 24, 2023

AndreasArvidsson commented Sep 8, 2023 •

edited by pokey

Loading

AndreasArvidsson commented Sep 9, 2023 •

edited

Loading

AndreasArvidsson commented Sep 9, 2023 •

edited

Loading

pokey commented Sep 9, 2023 •

edited

Loading

AndreasArvidsson commented Sep 10, 2023 •

edited

Loading

pokey commented Oct 17, 2023 •

edited

Loading

pokey commented Oct 19, 2023 •

edited by AndreasArvidsson

Loading

pokey commented Oct 24, 2023 •

edited

Loading