mirror of
https://git.sr.ht/~eliasnaur/gio
synced 2026-07-01 07:35:40 +00:00
Larry Clapp
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>
85 lines
2.1 KiB
Go
85 lines
2.1 KiB
Go
// SPDX-License-Identifier: Unlicense OR MIT
|
|
|
|
package material
|
|
|
|
import (
|
|
"image/color"
|
|
|
|
"gioui.org/internal/f32color"
|
|
"gioui.org/layout"
|
|
"gioui.org/op"
|
|
"gioui.org/op/paint"
|
|
"gioui.org/text"
|
|
"gioui.org/unit"
|
|
"gioui.org/widget"
|
|
)
|
|
|
|
type EditorStyle struct {
|
|
Font text.Font
|
|
TextSize unit.Value
|
|
// Color is the text color.
|
|
Color color.NRGBA
|
|
// Hint contains the text displayed when the editor is empty.
|
|
Hint string
|
|
// HintColor is the color of hint text.
|
|
HintColor color.NRGBA
|
|
// SelectionColor is the color of the background for selected text.
|
|
SelectionColor color.NRGBA
|
|
Editor *widget.Editor
|
|
|
|
shaper text.Shaper
|
|
}
|
|
|
|
func Editor(th *Theme, editor *widget.Editor, hint string) EditorStyle {
|
|
return EditorStyle{
|
|
Editor: editor,
|
|
TextSize: th.TextSize,
|
|
Color: th.Palette.Fg,
|
|
shaper: th.Shaper,
|
|
Hint: hint,
|
|
HintColor: f32color.MulAlpha(th.Palette.Fg, 0xbb),
|
|
SelectionColor: th.Palette.ContrastBg,
|
|
}
|
|
}
|
|
|
|
func (e EditorStyle) Layout(gtx layout.Context) layout.Dimensions {
|
|
defer op.Save(gtx.Ops).Load()
|
|
macro := op.Record(gtx.Ops)
|
|
paint.ColorOp{Color: e.HintColor}.Add(gtx.Ops)
|
|
var maxlines int
|
|
if e.Editor.SingleLine {
|
|
maxlines = 1
|
|
}
|
|
tl := widget.Label{Alignment: e.Editor.Alignment, MaxLines: maxlines}
|
|
dims := tl.Layout(gtx, e.shaper, e.Font, e.TextSize, e.Hint)
|
|
call := macro.Stop()
|
|
if w := dims.Size.X; gtx.Constraints.Min.X < w {
|
|
gtx.Constraints.Min.X = w
|
|
}
|
|
if h := dims.Size.Y; gtx.Constraints.Min.Y < h {
|
|
gtx.Constraints.Min.Y = h
|
|
}
|
|
dims = e.Editor.Layout(gtx, e.shaper, e.Font, e.TextSize)
|
|
disabled := gtx.Queue == nil
|
|
if e.Editor.Len() > 0 {
|
|
paint.ColorOp{Color: blendDisabledColor(disabled, e.SelectionColor)}.Add(gtx.Ops)
|
|
e.Editor.PaintSelection(gtx)
|
|
paint.ColorOp{Color: blendDisabledColor(disabled, e.Color)}.Add(gtx.Ops)
|
|
e.Editor.PaintText(gtx)
|
|
} else {
|
|
call.Add(gtx.Ops)
|
|
}
|
|
if !disabled {
|
|
paint.ColorOp{Color: e.Color}.Add(gtx.Ops)
|
|
e.Editor.PaintCaret(gtx)
|
|
}
|
|
return dims
|
|
}
|
|
|
|
func blendDisabledColor(disabled bool, c color.NRGBA) color.NRGBA {
|
|
if disabled {
|
|
return f32color.Disabled(c)
|
|
}
|
|
return c
|
|
}
|