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.

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

Multiple font sizes #235

Closed
wants to merge 4 commits into from
Closed

Multiple font sizes #235

wants to merge 4 commits into from

Conversation

nicoburns
Copy link
Contributor

@nicoburns nicoburns commented Feb 19, 2024 •
edited
Loading

Implement specifying multiple font sizes and/or line heights.

Current status

Basic layout functionality is working, but it needs a bit of a rework (possibly involving some API design work). Additionally, scrolling / editing are not currently working correctly.

Todo

  • fix scrolling
  • implement enum LineHeight
  • cache line_heights()
  • retire Metrics
  • rebase main merged into branch. Will need to squash prior to merge.
  • migrate tests
  • migrate benches
  • migrate example terminal (NOTE: does not compile on Windows with termion, see Update terminal example using colored` #129)
  • Fix:
    • Empty lines not displaying (due to no styles / line height applying)
    • Scrolling when buffer is smaller than number of lines (may be a bug in resize / shape functions)
    • Editor example: fix rescaling font sizes on demand (perhaps via mutable access to spans of Attrs)
    • Functionality using the visible_lines functionality (shape_until_scroll, shape_until_cursor)
    • Vi Editor
    • Editor action Vertical (may now be working but need to check)
  • Add:
    • scale_factor field to Buffer (this is necessary to deal with scale factor changes (e.g. when moving windows between displays) ergonomically now that font_size is not buffer-global)
    • Default Attrs for a Buffer
  • Docs

Questions:

  • Should the Hash impl of Attrs include line height?

This was referenced Feb 19, 2024
Closed
Merged
@nicoburns nicoburns force-pushed the multi-size-rebased branch 2 times, most recently from cd5ffb5 to eeb90e9 Compare March 3, 2024 23:22
nicoburns added 4 commits March 7, 2024 10:39
@nicoburns
Rebase WIP (todo: buffer + edit)
9c69d4b 
Fix conflicts

cargo fmt

Fix terminal example

Make rich-text example compile

Make multiview example compile

WIP

Fix scaling in multiview example

Add rich-text-winit example

Swap color channels

Remove unused code in rich-text-winit example

cargo fmt

Fix LayoutRunIter

Fix size_hint method of LayoutRunIter

Cargo fmt

Fix wrap tests

Fix doctests

Set font size in editor-orbclient example

Port editor example to winit

Implement scroll logic + add shape_as_needed

request redraw on click

Handle text input using named keys

cargo fmt

Implement dragging

Refactor winit event handlers to avoid duplication

Remove commented code

Remove dbg and printlns

Fix unused import/variable warnings

Revert editor changes
@nicoburns
Fix editor example
e97a5b8
@nicoburns
Fix rich-text example
0b73528
@nicoburns
Add font_size styles to rich-text example
096bdb4
@nicoburns nicoburns force-pushed the multi-size-rebased branch from 508a298 to 096bdb4 Compare March 6, 2024 21:39
@nicoburns nicoburns mentioned this pull request Mar 25, 2024
Open
@Cyborus04 Cyborus04 mentioned this pull request Apr 16, 2024
Open
@jackpot51 jackpot51 mentioned this pull request Jun 6, 2024
Merged
@jackpot51 jackpot51 closed this Jun 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Spans of font sizes
2 participants
@nicoburns @jackpot51