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

widget: remove Editor field carWidth

Browse Source 
The caret width can be computed in the only method that needs it,
PaintCaret.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2020-02-03 23:37:46 +01:00
parent b0af85d3c3
commit c178ade323
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
widget/editor.go
+4 -5
View File
@@ -45,7 +45,6 @@ type Editor struct {
lines []text.Line lines []text.Line
shapes []line shapes []line
dims layout.Dimensions dims layout.Dimensions
carWidth fixed.Int26_6
requestFocus bool requestFocus bool
caretOn bool caretOn bool
caretScroll bool caretScroll bool
@@ -230,7 +229,6 @@ func (e *Editor) Layout(gtx *layout.Context, sh text.Shaper, font text.Font, siz
func (e *Editor) layout(gtx *layout.Context, sh text.Shaper) { func (e *Editor) layout(gtx *layout.Context, sh text.Shaper) {
cs := gtx.Constraints cs := gtx.Constraints
e.carWidth = fixed.I(gtx.Px(unit.Dp(1)))
maxWidth := cs.Width.Max maxWidth := cs.Width.Max
if e.SingleLine { if e.SingleLine {
@@ -323,15 +321,16 @@ func (e *Editor) PaintCaret(gtx *layout.Context) {
if !e.caretOn { if !e.caretOn {
return return
} }
carWidth := fixed.I(gtx.Px(unit.Dp(1)))
carLine, _, carX, carY := e.layoutCaret() carLine, _, carX, carY := e.layoutCaret()
var stack op.StackOp var stack op.StackOp
stack.Push(gtx.Ops) stack.Push(gtx.Ops)
carX -= e.carWidth / 2 carX -= carWidth / 2
carAsc, carDesc := -e.lines[carLine].Bounds.Min.Y, e.lines[carLine].Bounds.Max.Y carAsc, carDesc := -e.lines[carLine].Bounds.Min.Y, e.lines[carLine].Bounds.Max.Y
carRect := image.Rectangle{ carRect := image.Rectangle{
Min: image.Point{X: carX.Ceil(), Y: carY - carAsc.Ceil()}, Min: image.Point{X: carX.Ceil(), Y: carY - carAsc.Ceil()},
Max: image.Point{X: carX.Ceil() + e.carWidth.Ceil(), Y: carY + carDesc.Ceil()}, Max: image.Point{X: carX.Ceil() + carWidth.Ceil(), Y: carY + carDesc.Ceil()},
} }
carRect = carRect.Add(image.Point{ carRect = carRect.Add(image.Point{
X: -e.scrollOff.X, X: -e.scrollOff.X,
@@ -339,7 +338,7 @@ func (e *Editor) PaintCaret(gtx *layout.Context) {
}) })
clip := textPadding(e.lines) clip := textPadding(e.lines)
// Account for caret width to each side. // Account for caret width to each side.
whalf := (e.carWidth / 2).Ceil() whalf := (carWidth / 2).Ceil()
if clip.Max.X < whalf { if clip.Max.X < whalf {
clip.Max.X = whalf clip.Max.X = whalf
} }