widget,widget/material: add selection to the editor

- 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>
This commit is contained in:
Larry Clapp
2021-01-20 20:57:49 -05:00
committed by Elias Naur
parent e78bd15564
commit 34273940a0
5 changed files with 735 additions and 193 deletions
+20 -12
View File
@@ -23,19 +23,22 @@ type EditorStyle struct {
Hint string
// HintColor is the color of hint text.
HintColor color.NRGBA
Editor *widget.Editor
// 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),
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,
}
}
@@ -59,11 +62,9 @@ func (e EditorStyle) Layout(gtx layout.Context) layout.Dimensions {
dims = e.Editor.Layout(gtx, e.shaper, e.Font, e.TextSize)
disabled := gtx.Queue == nil
if e.Editor.Len() > 0 {
textColor := e.Color
if disabled {
textColor = f32color.Disabled(textColor)
}
paint.ColorOp{Color: textColor}.Add(gtx.Ops)
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)
@@ -74,3 +75,10 @@ func (e EditorStyle) Layout(gtx layout.Context) layout.Dimensions {
}
return dims
}
func blendDisabledColor(disabled bool, c color.NRGBA) color.NRGBA {
if disabled {
return f32color.Disabled(c)
}
return c
}