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

ui/text: use default colors to guard against empty materials

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-07-05 17:11:17 +02:00
parent e3629cc0fb
commit 0f576cf625
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/text/editor.go
+4
View File
@@ -4,6 +4,7 @@ package text
import (
"image"
"image/color"
"math"
"time"
"unicode/utf8"
@@ -203,9 +204,12 @@ func (e *Editor) Layout(ops *ui.Ops, cs layout.Constraints) layout.Dimens {
Offset: off,
}
ui.PushOp{}.Add(ops)
// Apply material. Set a default color in case the material is empty.
if e.rr.len() > 0 {
draw.ColorOp{Col: color.RGBA{A: 0xff}}.Add(ops)
e.Material.Add(ops)
} else {
draw.ColorOp{Col: color.RGBA{A: 0xaa}}.Add(ops)
e.HintMaterial.Add(ops)
}
for {
ui/text/label.go
+3
View File
@@ -4,6 +4,7 @@ package text
import (
"image"
"image/color"
"math"
"unicode/utf8"
@@ -109,6 +110,8 @@ func (l Label) Layout(ops *ui.Ops, cs layout.Constraints) layout.Dimens {
ui.PushOp{}.Add(ops)
ui.TransformOp{Transform: ui.Offset(off)}.Add(ops)
l.Face.Path(str).Add(ops)
// Set a default color in case the material is empty.
draw.ColorOp{Col: color.RGBA{A: 0xff}}.Add(ops)
l.Material.Add(ops)
draw.DrawOp{Rect: lclip}.Add(ops)
ui.PopOp{}.Add(ops)