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

Enable line wrapping #709

Merged
merged 6 commits into from
Mar 16, 2024
Merged

Enable line wrapping #709

merged 6 commits into from
Mar 16, 2024

Conversation

jensenr30
Copy link
Contributor

@jensenr30 jensenr30 commented Mar 7, 2024

Line wrapping can be enabled/disabled with a setting in Tools->Options->Diff->Wrap Lines. This closes #706.

All credit to Scintilla.

This addresses the second half of #514. The second half of issue 514 was: bad user experience when scrolling down through the DiffView. But with line wrapping enabled, the horizontal scroll bars disappear. That prevents the mouse scroll wheel from being captured by the horizontal scroll bar.

Demo:

wrap-lines.webm
wrap-lines-scroll.webm

@Murmele
Copy link
Owner

Murmele commented Mar 7, 2024

Thank you very much for the change!

Can you add an entry to the changelog: https://github.com/Murmele/Gittyup/blob/master/docs/changelog.md
You can add your gif also to the website when you add an entry at: https://github.com/Murmele/Gittyup/blob/master/docs/index.md.

src/conf/Settings.cpp Show resolved Hide resolved
src/editor/TextEditor.cpp Outdated Show resolved Hide resolved
@jensenr30
Copy link
Contributor Author

@Murmele

Can you add an entry to the changelog: https://github.com/Murmele/Gittyup/blob/master/docs/changelog.md You can add your gif also to the website when you add an entry at: https://github.com/Murmele/Gittyup/blob/master/docs/index.md.

Done! I recorded a better video for the website:

line-wrap-demo-2.webm

@Murmele
Copy link
Owner

Murmele commented Mar 15, 2024

Thanks I hope I can have a look into it next days.

docs/changelog.md Outdated Show resolved Hide resolved
jensenr30 and others added 2 commits March 16, 2024 01:25
@Murmele Murmele merged commit dac0647 into Murmele:master Mar 16, 2024
11 checks passed
@jensenr30 jensenr30 deleted the line-wrapping branch March 16, 2024 07:26
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.

Allow word wrap in git diff middle panel.
2 participants