mirror of
https://git.sr.ht/~eliasnaur/gio
synced 2026-07-01 15:45:38 +00:00
34273940a0
- Allow dragging to be on both horizontal and vertical axes at once. - Split Editor.caret.pos into caret.start and caret.stop. caret.start is the old caret.pos, and is both the position of the caret, and also the start of selected text. caret.end is the end of the selected text. Start can be after end, e.g. after after Shift-DownArrow. - Update caret.end after a mouse drag, and various shifted keys (Shift-UpArrow, Shift-DownArrow, etc). - Change Shortcut-C to copy only the selected text, not the whole editor text. - Add Shortcut-X to copy and delete selected text, and Shortcut-A to select all text. - The various Insert/Delete/etc functions now overwrite or delete the selection, as appropriate. - Change MoveCaret to accept a distance for selection end, as well. Change SetCaret to accept a selection end offset. - Add SelectionLen to get the selection length, Selection to get selection offsets, SelectedText to get the selected text, and ClearSelection to clear the selection. - Add a rudimentary selection unit test, and extend the deleteWord unit test with some text selection cases. - Add SelectionColor to material.EditorStyle, which defaults to Theme.Palette.ContrastBg. Signed-off-by: Larry Clapp <larry@theclapp.org>
249 lines
6.0 KiB
Go
249 lines
6.0 KiB
Go
// SPDX-License-Identifier: Unlicense OR MIT
|
|
|
|
package widget
|
|
|
|
import (
|
|
"fmt"
|
|
"image"
|
|
"unicode/utf8"
|
|
|
|
"gioui.org/layout"
|
|
"gioui.org/op"
|
|
"gioui.org/op/clip"
|
|
"gioui.org/op/paint"
|
|
"gioui.org/text"
|
|
"gioui.org/unit"
|
|
|
|
"golang.org/x/image/math/fixed"
|
|
)
|
|
|
|
// Label is a widget for laying out and drawing text.
|
|
type Label struct {
|
|
// Alignment specify the text alignment.
|
|
Alignment text.Alignment
|
|
// MaxLines limits the number of lines. Zero means no limit.
|
|
MaxLines int
|
|
}
|
|
|
|
// screenPos describes a character position (in text line and column numbers,
|
|
// not pixels): Y = line number, X = rune column.
|
|
type screenPos image.Point
|
|
|
|
type segmentIterator struct {
|
|
Lines []text.Line
|
|
Clip image.Rectangle
|
|
Alignment text.Alignment
|
|
Width int
|
|
Offset image.Point
|
|
startSel screenPos
|
|
endSel screenPos
|
|
|
|
pos screenPos // current position
|
|
line text.Line // current line
|
|
layout text.Layout // current line's Layout
|
|
|
|
// pixel positions
|
|
off fixed.Point26_6
|
|
y, prevDesc fixed.Int26_6
|
|
}
|
|
|
|
const inf = 1e6
|
|
|
|
func (l *segmentIterator) Next() (text.Layout, image.Point, bool, int, image.Point, bool) {
|
|
for l.pos.Y < len(l.Lines) {
|
|
if l.pos.X == 0 {
|
|
l.line = l.Lines[l.pos.Y]
|
|
|
|
// Calculate X & Y pixel coordinates of left edge of line. We need y
|
|
// for the next line, so it's in l, but we only need x here, so it's
|
|
// not.
|
|
x := align(l.Alignment, l.line.Width, l.Width) + fixed.I(l.Offset.X)
|
|
l.y += l.prevDesc + l.line.Ascent
|
|
l.prevDesc = l.line.Descent
|
|
// Align baseline and line start to the pixel grid.
|
|
l.off = fixed.Point26_6{X: fixed.I(x.Floor()), Y: fixed.I(l.y.Ceil())}
|
|
l.y = l.off.Y
|
|
l.off.Y += fixed.I(l.Offset.Y)
|
|
if (l.off.Y + l.line.Bounds.Min.Y).Floor() > l.Clip.Max.Y {
|
|
break
|
|
}
|
|
|
|
if (l.off.Y + l.line.Bounds.Max.Y).Ceil() < l.Clip.Min.Y {
|
|
// This line is outside/before the clip area; go on to the next line.
|
|
l.pos.Y++
|
|
continue
|
|
}
|
|
|
|
// Copy the line's Layout, since we slice it up later.
|
|
l.layout = l.line.Layout
|
|
|
|
// Find the left edge of the text visible in the l.Clip clipping
|
|
// area.
|
|
for len(l.layout.Advances) > 0 {
|
|
_, n := utf8.DecodeRuneInString(l.layout.Text)
|
|
adv := l.layout.Advances[0]
|
|
if (l.off.X + adv + l.line.Bounds.Max.X - l.line.Width).Ceil() >= l.Clip.Min.X {
|
|
break
|
|
}
|
|
l.off.X += adv
|
|
l.layout.Text = l.layout.Text[n:]
|
|
l.layout.Advances = l.layout.Advances[1:]
|
|
l.pos.X++
|
|
}
|
|
}
|
|
|
|
selected := l.inSelection()
|
|
endx := l.off.X
|
|
rune := 0
|
|
nextLine := true
|
|
retLayout := l.layout
|
|
for n := range l.layout.Text {
|
|
selChanged := selected != l.inSelection()
|
|
beyondClipEdge := (endx + l.line.Bounds.Min.X).Floor() > l.Clip.Max.X
|
|
if selChanged || beyondClipEdge {
|
|
retLayout.Advances = l.layout.Advances[:rune]
|
|
retLayout.Text = l.layout.Text[:n]
|
|
if selChanged {
|
|
// Save the rest of the line
|
|
l.layout.Advances = l.layout.Advances[rune:]
|
|
l.layout.Text = l.layout.Text[n:]
|
|
nextLine = false
|
|
}
|
|
break
|
|
}
|
|
endx += l.layout.Advances[rune]
|
|
rune++
|
|
l.pos.X++
|
|
}
|
|
offFloor := image.Point{X: l.off.X.Floor(), Y: l.off.Y.Floor()}
|
|
|
|
// Calculate the width & height if the returned text.
|
|
//
|
|
// If there's a better way to do this, I'm all ears.
|
|
var d fixed.Int26_6
|
|
for _, adv := range retLayout.Advances {
|
|
d += adv
|
|
}
|
|
size := image.Point{
|
|
X: d.Ceil(),
|
|
Y: (l.line.Ascent + l.line.Descent).Ceil(),
|
|
}
|
|
|
|
if nextLine {
|
|
l.pos.Y++
|
|
l.pos.X = 0
|
|
} else {
|
|
l.off.X = endx
|
|
}
|
|
|
|
return retLayout, offFloor, selected, l.prevDesc.Ceil() - size.Y, size, true
|
|
}
|
|
return text.Layout{}, image.Point{}, false, 0, image.Point{}, false
|
|
}
|
|
|
|
func (l *segmentIterator) inSelection() bool {
|
|
return l.startSel.LessOrEqual(l.pos) &&
|
|
l.pos.Less(l.endSel)
|
|
}
|
|
|
|
func (p1 screenPos) LessOrEqual(p2 screenPos) bool {
|
|
return p1.Y < p2.Y || (p1.Y == p2.Y && p1.X <= p2.X)
|
|
}
|
|
|
|
func (p1 screenPos) Less(p2 screenPos) bool {
|
|
return p1.Y < p2.Y || (p1.Y == p2.Y && p1.X < p2.X)
|
|
}
|
|
|
|
func (l Label) Layout(gtx layout.Context, s text.Shaper, font text.Font, size unit.Value, txt string) layout.Dimensions {
|
|
cs := gtx.Constraints
|
|
textSize := fixed.I(gtx.Px(size))
|
|
lines := s.LayoutString(font, textSize, cs.Max.X, txt)
|
|
if max := l.MaxLines; max > 0 && len(lines) > max {
|
|
lines = lines[:max]
|
|
}
|
|
dims := linesDimens(lines)
|
|
dims.Size = cs.Constrain(dims.Size)
|
|
cl := textPadding(lines)
|
|
cl.Max = cl.Max.Add(dims.Size)
|
|
it := segmentIterator{
|
|
Lines: lines,
|
|
Clip: cl,
|
|
Alignment: l.Alignment,
|
|
Width: dims.Size.X,
|
|
}
|
|
for {
|
|
l, off, _, _, _, ok := it.Next()
|
|
if !ok {
|
|
break
|
|
}
|
|
stack := op.Save(gtx.Ops)
|
|
op.Offset(layout.FPt(off)).Add(gtx.Ops)
|
|
s.Shape(font, textSize, l).Add(gtx.Ops)
|
|
clip.Rect(cl.Sub(off)).Add(gtx.Ops)
|
|
paint.PaintOp{}.Add(gtx.Ops)
|
|
stack.Load()
|
|
}
|
|
return dims
|
|
}
|
|
|
|
func textPadding(lines []text.Line) (padding image.Rectangle) {
|
|
if len(lines) == 0 {
|
|
return
|
|
}
|
|
first := lines[0]
|
|
if d := first.Ascent + first.Bounds.Min.Y; d < 0 {
|
|
padding.Min.Y = d.Ceil()
|
|
}
|
|
last := lines[len(lines)-1]
|
|
if d := last.Bounds.Max.Y - last.Descent; d > 0 {
|
|
padding.Max.Y = d.Ceil()
|
|
}
|
|
if d := first.Bounds.Min.X; d < 0 {
|
|
padding.Min.X = d.Ceil()
|
|
}
|
|
if d := first.Bounds.Max.X - first.Width; d > 0 {
|
|
padding.Max.X = d.Ceil()
|
|
}
|
|
return
|
|
}
|
|
|
|
func linesDimens(lines []text.Line) layout.Dimensions {
|
|
var width fixed.Int26_6
|
|
var h int
|
|
var baseline int
|
|
if len(lines) > 0 {
|
|
baseline = lines[0].Ascent.Ceil()
|
|
var prevDesc fixed.Int26_6
|
|
for _, l := range lines {
|
|
h += (prevDesc + l.Ascent).Ceil()
|
|
prevDesc = l.Descent
|
|
if l.Width > width {
|
|
width = l.Width
|
|
}
|
|
}
|
|
h += lines[len(lines)-1].Descent.Ceil()
|
|
}
|
|
w := width.Ceil()
|
|
return layout.Dimensions{
|
|
Size: image.Point{
|
|
X: w,
|
|
Y: h,
|
|
},
|
|
Baseline: h - baseline,
|
|
}
|
|
}
|
|
|
|
func align(align text.Alignment, width fixed.Int26_6, maxWidth int) fixed.Int26_6 {
|
|
mw := fixed.I(maxWidth)
|
|
switch align {
|
|
case text.Middle:
|
|
return fixed.I(((mw - width) / 2).Floor())
|
|
case text.End:
|
|
return fixed.I((mw - width).Floor())
|
|
case text.Start:
|
|
return 0
|
|
default:
|
|
panic(fmt.Errorf("unknown alignment %v", align))
|
|
}
|
|
}
|