editor: Adjust how gutter width is calculated to work with proportional fonts #24009
Conversation
…lement.rs lines 6403, 6485, and 6491 from an 'm' to '0'
|
We require contributors to sign our Contributor License Agreement, and we don't have @TimmyMcPickles on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'. |
|
@cla-bot check |
cla-bot
bot
added
the
cla-signed
|
The cla-bot has been summoned, and re-checked this pull request! |
crates/editor/src/editor.rs
Outdated
| @@ -14111,7 +14111,7 @@ impl Editor { | |||
|
|
|||
| let em_width = window | |||
There was a problem hiding this comment.
If we're changing the measured glyph from an m to something else, it is no longer an "em width".
We should rename the surrounding bindings to be named something else. Maybe digit_width or numeral_width.
There was a problem hiding this comment.
Would we change this for em_advance too?
There was a problem hiding this comment.
In CSS they refer to this as a ch:
Represents the width or, more precisely, the advance measure of the glyph
0(zero, the Unicode character U+0030) in the element'sfont. In cases where determining the measure of the0glyph is impossible or impractical, it must be assumed to be0.5emwide by1emtall.— https://developer.mozilla.org/en-US/docs/Web/CSS/length#ch
There was a problem hiding this comment.
Would we change this for em_advance too?
Yes, we would.
Let's go with ch_width and ch_advance.
crates/editor/src/element.rs
Outdated
| @@ -6482,13 +6482,13 @@ impl Element for EditorElement { | |||
| let line_height = style.text.line_height_in_pixels(window.rem_size()); | |||
| let em_width = window | |||
| .text_system() | |||
| .typographic_bounds(font_id, font_size, 'm') | |||
| .typographic_bounds(font_id, font_size, '0') | |||
There was a problem hiding this comment.
Changing the em values here seems incorrect, because while it will impact the gutter dimensions, we also use the em width down below when computing the editor width and the wrap, which needs to stay in ems.
There was a problem hiding this comment.
If we want to do this then I think we need to compute both an em and a ch and use the ch just for the gutter measurements and the em for everything else.
There was a problem hiding this comment.
I'm fairly new to rust. How would we calculate ch and em here?
maxdeviant
changed the title
|
Hey @maxdeviant, would you please consider checking my (local for now) PR instead? |
Edited editor.rs line 14114, element.rs lines 6403, 6485, and 6491 from an 'm' to '0'
Closes #21860
This is my first real pull request, so please let me know how I can improve if you'd like
Release Notes: