Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Force select #63

Merged
merged 4 commits into from
Oct 12, 2020
Merged

Force select #63

merged 4 commits into from
Oct 12, 2020

Conversation

tmccombs
Copy link
Collaborator

This PR contains three related changes:

  1. Fix a bug where if you hover over a choice box, then move away the choice box stays highlighted
  2. Always render choice boxes as a different color, to make it easier to identify them, and add an option to specify the color (this is what I'm least sure about).
  3. Add an option to force the user to select a choicebox (disallow custom rectangles). This will interact with Add output selection #60 and whichever one is merged last will probably need to be updated to at least add documentation on how they interact.

If you'd prefer, I can split these out into seperate PRs.

main.c Outdated Show resolved Hide resolved
render.c Outdated Show resolved Hide resolved
slurp.1.scd Outdated Show resolved Hide resolved
render.c Outdated Show resolved Hide resolved
slurp.1.scd Show resolved Hide resolved
@emersion
Copy link
Owner

emersion commented Sep 7, 2020

This needs a rebase.

Commit 74a7cff removed a condition where we checked if has_selection
was true before rendering the selection. This puts it back.
To make it easier for the user to see what the available options are,
also make the color for the choice boxes configurable.
This test probably results in not rendering selection on touch devices.
@tmccombs
Copy link
Collaborator Author

tmccombs commented Sep 8, 2020

This needs a rebase.

done.

Copy link
Owner

@emersion emersion left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks! Sorry for the long delay.

@emersion emersion merged commit 1625404 into emersion:master Oct 12, 2020
@tmccombs tmccombs deleted the force-select branch October 12, 2020 20:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants