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

widget{,/material}: rebuild label and editor with textView

Browse Source 
This commit rebuilds the editor and label types on the common
foundation provided by textView. This enables labels to have
optional state that makes them selectable, and allows the
two widgets to share the code for managing cursor positions,
displaying selections, and soforth. Labels now have an additional
Layout function which can be invoked if they have a Selectable.
It accepts a layout.Widget used to paint their contents. Stateless
labels should still use the old Layout method.

Signed-off-by: Chris Waldon <christopher.waldon.dev@gmail.com>
This commit is contained in:
Chris Waldon
2022-12-23 07:54:27 -05:00
committed by Elias Naur
parent f99aff96ee
commit e98c8955bb
8 changed files with 780 additions and 761 deletions
Download Patch File Download Diff File Expand all files Collapse all files
widget/label.go
+19 -1
View File
@@ -18,12 +18,30 @@ import (
// Label is a widget for laying out and drawing text.
type Label struct {
// Alignment specify the text alignment.
// Alignment specifies the text alignment.
Alignment text.Alignment
// MaxLines limits the number of lines. Zero means no limit.
MaxLines int
// Selectable optionally provides text selection state. If nil,
// text will not be selectable.
Selectable *Selectable
}
// Layout the label with the given shaper, font, size, and text. Content is a function that will be invoked
// with the label's clip area applied, and should be used to set colors and paint the text/selection.
// content will only be invoked for labels with a non-nil Selectable. For stateless labels, the paint color
// should be set prior to calling Layout.
func (l Label) LayoutSelectable(gtx layout.Context, lt *text.Shaper, font text.Font, size unit.Sp, txt string, content layout.Widget) layout.Dimensions {
if l.Selectable == nil {
return l.Layout(gtx, lt, font, size, txt)
}
l.Selectable.text.Alignment = l.Alignment
l.Selectable.text.MaxLines = l.MaxLines
l.Selectable.SetText(txt)
return l.Selectable.Layout(gtx, lt, font, size, content)
}
// Layout the text as non-interactive.
func (l Label) Layout(gtx layout.Context, lt *text.Shaper, font text.Font, size unit.Sp, txt string) layout.Dimensions {
cs := gtx.Constraints
textSize := fixed.I(gtx.Sp(size))