joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-06 18:05:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

text: allow disabling space trimming

Browse Source 
This commit adds a shaping parameter that disables the trimming of trailing
whitespace from lines. Text editors and similar use-cases want trailing whitspace
glyphs to be selectable, which means they must occupy space.

Signed-off-by: Chris Waldon <christopher.waldon.dev@gmail.com>
This commit is contained in:
Chris Waldon
2024-12-17 10:00:32 -05:00
parent 1d0d5f0383
commit b576252963
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
text/gotext.go
+5 -4
View File
@@ -490,10 +490,11 @@ func wrapPolicyToGoText(p WrapPolicy) shaping.LineBreakPolicy {
// shapeAndWrapText invokes the text shaper and returns wrapped lines in the shaper's native format. // shapeAndWrapText invokes the text shaper and returns wrapped lines in the shaper's native format.
func (s *shaperImpl) shapeAndWrapText(params Parameters, txt []rune) (_ []shaping.Line, truncated int) { func (s *shaperImpl) shapeAndWrapText(params Parameters, txt []rune) (_ []shaping.Line, truncated int) {
wc := shaping.WrapConfig{ wc := shaping.WrapConfig{
Direction: mapDirection(params.Locale.Direction), Direction: mapDirection(params.Locale.Direction),
TruncateAfterLines: params.MaxLines, TruncateAfterLines: params.MaxLines,
TextContinues: params.forceTruncate, TextContinues: params.forceTruncate,
BreakPolicy: wrapPolicyToGoText(params.WrapPolicy), BreakPolicy: wrapPolicyToGoText(params.WrapPolicy),
DisableTrailingWhitespaceTrim: params.DisableSpaceTrim,
} }
families := s.defaultFaces families := s.defaultFaces
if params.Font.Typeface != "" { if params.Font.Typeface != "" {
text/shaper.go
+5
View File
@@ -76,6 +76,11 @@ type Parameters struct {
// text with a MaxLines. It is unexported because this behavior only makes sense for the // text with a MaxLines. It is unexported because this behavior only makes sense for the
// shaper to control when it iterates paragraphs of text. // shaper to control when it iterates paragraphs of text.
forceTruncate bool forceTruncate bool
// DisableSpaceTrim prevents the width of the final whitespace glyph on a line from being zeroed.
// This is desirable for text editors (so that the whitespace can be selected), but is undesirable
// for ordinary display text.
DisableSpaceTrim bool
} }
type FontFace = giofont.FontFace type FontFace = giofont.FontFace