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

widget{,/material}: [API] split interactive and non-interactive text widgets

Browse Source 
This commit separates the types for interactive and non-interactive text within
package widget. widget.Selectable is used for all interactive text. widget.Label
is used for all non-interactive text. There is no longer a field on widget.Label
to provide it with a Selectable. If you want selectable text and are not relying
upon the material pacakge API, you need to create widget.Selectables instead of
widget.Labels. The material package's LabelStyle API is unchanged.

Signed-off-by: Chris Waldon <christopher.waldon.dev@gmail.com>
This commit is contained in:
Chris Waldon
2023-03-27 12:35:01 -04:00
committed by Elias Naur
parent 5e6e1217da
commit 9d0a53fc9f
7 changed files with 28 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
widget/selectable_test.go
+8 -12
View File
@@ -46,9 +46,8 @@ func TestSelectableMove(t *testing.T) {
gtx.Queue = newQueue(key.FocusEvent{Focus: true})
s := new(Selectable)
Label{
Selectable: s,
}.Layout(gtx, cache, text.Font{}, fontSize, str, op.CallOp{}, op.CallOp{})
s.SetText(str)
s.Layout(gtx, cache, text.Font{}, fontSize, op.CallOp{}, op.CallOp{})
testKey := func(keyName string) {
// Select 345
@@ -62,9 +61,8 @@ func TestSelectableMove(t *testing.T) {
// Press the key
gtx.Queue = newQueue(key.Event{State: key.Press, Name: keyName})
Label{
Selectable: s,
}.Layout(gtx, cache, font, fontSize, str, op.CallOp{}, op.CallOp{})
s.SetText(str)
s.Layout(gtx, cache, font, fontSize, op.CallOp{}, op.CallOp{})
if expected, got := "", s.SelectedText(); expected != got {
t.Errorf("KeyName %s, expected %q, got %q", keyName, expected, got)
@@ -102,12 +100,10 @@ func TestSelectableConfigurations(t *testing.T) {
gtx.Constraints.Min = gtx.Constraints.Max
}
s := new(Selectable)
label := Label{
Alignment: alignment,
Selectable: s,
}
interactiveDims := label.Layout(gtx, cache, font, fontSize, sentence, op.CallOp{}, op.CallOp{})
staticDims := label.Layout(gtx, cache, font, fontSize, sentence, op.CallOp{}, op.CallOp{})
s.text.Alignment = alignment
s.SetText(sentence)
interactiveDims := s.Layout(gtx, cache, font, fontSize, op.CallOp{}, op.CallOp{})
staticDims := Label{Alignment: alignment}.Layout(gtx, cache, font, fontSize, sentence, op.CallOp{})
if interactiveDims != staticDims {
t.Errorf("expected consistent dimensions, static returned %#+v, interactive returned %#+v", staticDims, interactiveDims)