Skip to content

Rework the bubble-tea scene files to provide a more consistent experience #11

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.

Sign up for GitHub

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

Jump to bottom
Merged
Vilsol merged 8 commits into from
Jun 18, 2023
Merged

Rework the bubble-tea scene files to provide a more consistent experience #11

Vilsol merged 8 commits into from
Jun 18, 2023

Conversation

@samox73
Copy link
Contributor

@samox73 samox73 commented Jan 16, 2023 •
edited
Loading

fixes #10

  • Add button mapping for quit/back on all scenes
  • Follow symlinks when creating a new installation
  • Show custom help bindings for the mods scene
  • Refactor scene pkg to several smaller, independent subpackages
  • Text input has unavailable key hints (e.g. new installation shows "j"/"k" as aliases to ArrowDown/ArrowUp even though j/k are caught by the input field
  • Various AdditionalShortHelpKeys/AdditionalFullHelpKeys are not shown correctly (or are obsolete)

@samox73 samox73 mentioned this pull request Jan 16, 2023
Closed
@samox73 samox73 marked this pull request as draft January 16, 2023 20:52
@samox73 samox73 changed the title Add button mapping for quit/back on all scenes Rework the bubble-tea scene files to provide a more consistent experience Jan 16, 2023
@samox73 samox73 marked this pull request as ready for review January 16, 2023 22:52
@dpw13 dpw13 requested a review from Vilsol January 16, 2023 22:52
SoMuchForSubtlety
SoMuchForSubtlety suggested changes Jan 16, 2023
View reviewed changes
tea/scenes/apply.go
Comment on lines +153 to +159
case keys.KeyControlC:
return m, tea.Quit
case KeyEscape:
case keys.KeyEscape:
m.cancelled = true
m.cancelChannel <- true
return m, nil
case KeyEnter:
case keys.KeyEnter:
Copy link

@SoMuchForSubtlety SoMuchForSubtlety Jan 16, 2023

Choose a reason for hiding this comment

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

bubbletea provides constants for key codes1. Simply switch on msg.Type.

Footnotes

  1. https://pkg.go.dev/github.com/charmbracelet/bubbletea#KeyType ↩

@budak7273
Copy link
Member

budak7273 commented Jun 12, 2023

Fixes #16

Vilsol
Vilsol previously approved these changes Jun 12, 2023
View reviewed changes
@Vilsol
Copy link
Member

Vilsol commented Jun 12, 2023

Please sync your PR to latest master @samox73

@samox73 samox73 requested a review from Vilsol June 15, 2023 08:50
@Vilsol Vilsol merged commit daa6fba into satisfactorymodding:master Jun 18, 2023
@budak7273
Copy link
Member

budak7273 commented Jun 18, 2023

Thanks for your contributions!

@budak7273 budak7273 mentioned this pull request Jun 19, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Vilsol Vilsol Vilsol approved these changes

+1 more reviewer

@SoMuchForSubtlety SoMuchForSubtlety SoMuchForSubtlety requested changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

Mod Manager (SMM) and CLI
Status: ✅ Completed

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Scene views inconsistent behaviour

4 participants

@samox73 @budak7273 @Vilsol @SoMuchForSubtlety