Working some things out
This commit is contained in:
@@ -46,17 +46,8 @@ type BorderedWidget struct {
|
||||
|
||||
var _ Widget = (*BorderedWidget)(nil)
|
||||
|
||||
func (w *BorderedWidget) SetLogger(l func(string)) { w.logger = l }
|
||||
func (w *BorderedWidget) Log(txt string) {
|
||||
if w.logger != nil {
|
||||
w.logger(txt)
|
||||
}
|
||||
}
|
||||
|
||||
func NewBorderedWidget(id string, wd Widget, s tcell.Style) *BorderedWidget {
|
||||
ret := &BorderedWidget{
|
||||
widget: wd,
|
||||
}
|
||||
func NewBorderedWidget(id string, s tcell.Style, wd Widget) *BorderedWidget {
|
||||
ret := &BorderedWidget{widget: wd}
|
||||
ret.Init(id, s)
|
||||
return ret
|
||||
}
|
||||
@@ -73,19 +64,13 @@ func (w *BorderedWidget) Id() string { return w.id }
|
||||
func (w *BorderedWidget) HandleResize(ev *tcell.EventResize) {
|
||||
// Trim space for border and pass the resize to the widget
|
||||
w.w, w.h = ev.Size()
|
||||
// w.w = wh.Min(w.w, w.WantW())
|
||||
// w.h = wh.Min(w.h, w.WantH())
|
||||
|
||||
w.widget.SetPos(Coord{X: 1, Y: 1})
|
||||
w.widget.HandleResize(tcell.NewEventResize(w.w-2, w.h-2))
|
||||
}
|
||||
|
||||
func (w *BorderedWidget) HandleKey(ev *tcell.EventKey) bool {
|
||||
return w.HandleKey(ev)
|
||||
}
|
||||
func (w *BorderedWidget) HandleKey(ev *tcell.EventKey) bool { return w.HandleKey(ev) }
|
||||
|
||||
func (w *BorderedWidget) HandleTime(ev *tcell.EventTime) {
|
||||
w.HandleTime(ev)
|
||||
}
|
||||
func (w *BorderedWidget) HandleTime(ev *tcell.EventTime) { w.HandleTime(ev) }
|
||||
|
||||
func (w *BorderedWidget) Draw(screen tcell.Screen) {
|
||||
if !w.visible {
|
||||
@@ -96,7 +81,6 @@ 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.widget.SetPos(Coord{X: w.x + 1, Y: w.y + 1})
|
||||
w.GetPos().DrawOffset(w, screen)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user