Added Datepicker
Some other work too
This commit is contained in:
@@ -22,6 +22,9 @@ THE SOFTWARE.
|
||||
package widgets
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
wh "git.bullercodeworks.com/brian/tcell-widgets/helpers"
|
||||
"github.com/gdamore/tcell"
|
||||
)
|
||||
@@ -36,12 +39,10 @@ type BorderedWidget struct {
|
||||
widget Widget
|
||||
border []rune
|
||||
|
||||
title string
|
||||
active bool
|
||||
visible bool
|
||||
focusable bool
|
||||
title string // The 'title' string is over the top of the border
|
||||
help string // The 'help' string is over the bottom of the border
|
||||
|
||||
logger func(string)
|
||||
logger func(string, ...any)
|
||||
}
|
||||
|
||||
var _ Widget = (*BorderedWidget)(nil)
|
||||
@@ -55,9 +56,9 @@ func NewBorderedWidget(id string, s tcell.Style, wd Widget) *BorderedWidget {
|
||||
func (w *BorderedWidget) Init(id string, s tcell.Style) {
|
||||
w.id = id
|
||||
w.style = s
|
||||
w.visible = true
|
||||
w.widget.SetVisible(true)
|
||||
w.border = wh.BRD_CSIMPLE
|
||||
w.focusable = true
|
||||
w.widget.SetFocusable(true)
|
||||
}
|
||||
|
||||
func (w *BorderedWidget) Id() string { return w.id }
|
||||
@@ -68,15 +69,18 @@ func (w *BorderedWidget) HandleResize(ev *tcell.EventResize) {
|
||||
w.widget.HandleResize(tcell.NewEventResize(w.w-2, w.h-2))
|
||||
}
|
||||
|
||||
func (w *BorderedWidget) SetKeyMap(km KeyMap) { w.widget.SetKeyMap(km) }
|
||||
func (w *BorderedWidget) AddToKeyMap(km KeyMap) { w.widget.AddToKeyMap(km) }
|
||||
func (w *BorderedWidget) RemoveFromKeyMap(km KeyMap) { w.widget.RemoveFromKeyMap(km) }
|
||||
func (w *BorderedWidget) HandleKey(ev *tcell.EventKey) bool { return w.HandleKey(ev) }
|
||||
func (w *BorderedWidget) SetKeyMap(km KeyMap) { w.widget.SetKeyMap(km) }
|
||||
func (w *BorderedWidget) AddToKeyMap(km KeyMap) { w.widget.AddToKeyMap(km) }
|
||||
func (w *BorderedWidget) RemoveFromKeyMap(km KeyMap) { w.widget.RemoveFromKeyMap(km) }
|
||||
func (w *BorderedWidget) HandleKey(ev *tcell.EventKey) bool {
|
||||
w.Log("BW(%s) Active(%s) Handlekey", w.Id(), w.widget.Id())
|
||||
return w.widget.HandleKey(ev)
|
||||
}
|
||||
|
||||
func (w *BorderedWidget) HandleTime(ev *tcell.EventTime) { w.widget.HandleTime(ev) }
|
||||
|
||||
func (w *BorderedWidget) Draw(screen tcell.Screen) {
|
||||
if !w.visible {
|
||||
if !w.widget.Visible() {
|
||||
return
|
||||
}
|
||||
if len(w.title) > 0 {
|
||||
@@ -84,15 +88,18 @@ func (w *BorderedWidget) Draw(screen tcell.Screen) {
|
||||
} else {
|
||||
wh.BorderFilled(w.x, w.y, w.x+w.w, w.y+w.h, w.border, w.style, screen)
|
||||
}
|
||||
w.GetPos().DrawOffset(w, screen)
|
||||
if len(w.help) > 0 {
|
||||
wh.DrawText(w.x+w.w-len(w.help)-2, w.y+w.h, w.help, w.style, screen)
|
||||
}
|
||||
w.GetPos().DrawOffset(w.widget, screen)
|
||||
}
|
||||
|
||||
func (w *BorderedWidget) Active() bool { return w.active }
|
||||
func (w *BorderedWidget) SetActive(a bool) { w.active = a }
|
||||
func (w *BorderedWidget) Visible() bool { return w.visible }
|
||||
func (w *BorderedWidget) SetVisible(a bool) { w.visible = a }
|
||||
func (w *BorderedWidget) Focusable() bool { return w.focusable }
|
||||
func (w *BorderedWidget) SetFocusable(b bool) { w.focusable = b }
|
||||
func (w *BorderedWidget) Active() bool { return w.widget.Active() }
|
||||
func (w *BorderedWidget) SetActive(a bool) { w.widget.SetActive(a) }
|
||||
func (w *BorderedWidget) Visible() bool { return w.widget.Visible() }
|
||||
func (w *BorderedWidget) SetVisible(a bool) { w.SetVisible(a) }
|
||||
func (w *BorderedWidget) Focusable() bool { return w.widget.Focusable() }
|
||||
func (w *BorderedWidget) SetFocusable(b bool) { w.widget.SetFocusable(b) }
|
||||
func (w *BorderedWidget) SetX(x int) { w.x = x }
|
||||
func (w *BorderedWidget) SetY(y int) { w.y = y }
|
||||
func (w *BorderedWidget) GetX() int { return w.x }
|
||||
@@ -109,5 +116,13 @@ func (w *BorderedWidget) WantH() int { return w.h }
|
||||
func (w *BorderedWidget) MinW() int { return 2 + w.widget.MinW() }
|
||||
func (w *BorderedWidget) MinH() int { return 2 + w.widget.MinH() }
|
||||
|
||||
func (w *BorderedWidget) SetBorder(r []rune) { w.border = r }
|
||||
func (w *BorderedWidget) SetTitle(ttl string) { w.title = ttl }
|
||||
func (w *BorderedWidget) SetBorder(r []rune) { w.border = r }
|
||||
func (w *BorderedWidget) SetTitle(ttl string) { w.title = ttl }
|
||||
func (w *BorderedWidget) SetHelp(hlp string) { w.help = hlp }
|
||||
func (w *BorderedWidget) SetLogger(l func(string, ...any)) { w.logger = l }
|
||||
func (w *BorderedWidget) Log(txt string, args ...any) {
|
||||
if w.logger != nil {
|
||||
txt = fmt.Sprintf("%s:%s", time.Now().Format(time.TimeOnly), txt)
|
||||
w.logger(txt, args...)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user