Bug Fixes
This commit is contained in:
@@ -52,7 +52,6 @@ type LinearLayout struct {
|
||||
|
||||
active bool
|
||||
visible bool
|
||||
focusable bool
|
||||
disableTab bool
|
||||
insetBorder bool
|
||||
|
||||
@@ -80,7 +79,6 @@ func (w *LinearLayout) Init(id string, s tcell.Style) {
|
||||
w.id = id
|
||||
w.style = s
|
||||
w.visible = true
|
||||
w.focusable = true
|
||||
w.defFlags = LayoutFlag(LFAlignHCenter | LFAlignVCenter)
|
||||
w.layoutFlags = make(map[Widget]LayoutFlag)
|
||||
w.layoutWeights = make(map[Widget]int)
|
||||
@@ -89,8 +87,7 @@ func (w *LinearLayout) Init(id string, s tcell.Style) {
|
||||
if active == nil && len(w.widgets) > 0 {
|
||||
// No widget is active, but we do have some
|
||||
for i := range w.widgets {
|
||||
if w.widgets[i].Focusable() {
|
||||
w.widgets[i].SetActive(true)
|
||||
if w.widgets[i].SetActive(true) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
@@ -103,8 +100,7 @@ func (w *LinearLayout) Init(id string, s tcell.Style) {
|
||||
if active == nil && len(w.widgets) > 0 {
|
||||
// No widget is active, but we do have some
|
||||
for i := len(w.widgets) - 1; i >= 0; i-- {
|
||||
if w.widgets[i].Focusable() {
|
||||
w.widgets[i].SetActive(true)
|
||||
if w.widgets[i].SetActive(true) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
@@ -172,22 +168,20 @@ func (w *LinearLayout) SetActive(a bool) bool {
|
||||
}
|
||||
return w.active
|
||||
}
|
||||
func (w *LinearLayout) Visible() bool { return w.visible }
|
||||
func (w *LinearLayout) SetVisible(a bool) { w.visible = a }
|
||||
func (w *LinearLayout) Focusable() bool { return w.focusable }
|
||||
func (w *LinearLayout) SetFocusable(b bool) { w.focusable = b }
|
||||
func (w *LinearLayout) SetX(x int) { w.x = x }
|
||||
func (w *LinearLayout) SetY(y int) { w.y = y }
|
||||
func (w *LinearLayout) GetX() int { return w.x }
|
||||
func (w *LinearLayout) GetY() int { return w.y }
|
||||
func (w *LinearLayout) GetPos() Coord { return Coord{X: w.x, Y: w.y} }
|
||||
func (w *LinearLayout) SetPos(c Coord) { w.x, w.y = c.X, c.Y }
|
||||
func (w *LinearLayout) GetW() int { return w.w }
|
||||
func (w *LinearLayout) GetH() int { return w.h }
|
||||
func (w *LinearLayout) SetW(wd int) { w.w = wd }
|
||||
func (w *LinearLayout) SetH(h int) { w.h = h }
|
||||
func (w *LinearLayout) getSize() Coord { return Coord{X: w.w, Y: w.h} }
|
||||
func (w *LinearLayout) SetSize(c Coord) { w.w, w.h = c.X, c.Y }
|
||||
func (w *LinearLayout) Visible() bool { return w.visible }
|
||||
func (w *LinearLayout) SetVisible(a bool) { w.visible = a }
|
||||
func (w *LinearLayout) SetX(x int) { w.x = x }
|
||||
func (w *LinearLayout) SetY(y int) { w.y = y }
|
||||
func (w *LinearLayout) GetX() int { return w.x }
|
||||
func (w *LinearLayout) GetY() int { return w.y }
|
||||
func (w *LinearLayout) GetPos() Coord { return Coord{X: w.x, Y: w.y} }
|
||||
func (w *LinearLayout) SetPos(c Coord) { w.x, w.y = c.X, c.Y }
|
||||
func (w *LinearLayout) GetW() int { return w.w }
|
||||
func (w *LinearLayout) GetH() int { return w.h }
|
||||
func (w *LinearLayout) SetW(wd int) { w.w = wd }
|
||||
func (w *LinearLayout) SetH(h int) { w.h = h }
|
||||
func (w *LinearLayout) getSize() Coord { return Coord{X: w.w, Y: w.h} }
|
||||
func (w *LinearLayout) SetSize(c Coord) { w.w, w.h = c.X, c.Y }
|
||||
func (w *LinearLayout) WantW() int {
|
||||
var wantW int
|
||||
for _, wd := range w.widgets {
|
||||
|
||||
Reference in New Issue
Block a user