Mirrored_Repos/ctop
1
0
Fork 0
mirror of https://github.com/bcicen/ctop.git synced 2024-08-30 18:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor menu widget, add menuitem struct

Browse Source
This commit is contained in:
Bradley Cicenas 2017-02-15 04:44:03 +00:00
parent 97a561260a
commit d031433ec4
2 changed files with 47 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
menus.go
View File

@ -58,8 +58,8 @@ func SortMenu() {
// set cursor position to current sort field
current := config.Get("sortField")
for n, field := range m.Items {
if field == current {
for n, item := range m.Items {
if item.Val == current {
m.CursorPos = n
}
}
@ -67,7 +67,7 @@ func SortMenu() {
ui.Render(m)
m.NavigationHandlers()
ui.Handle("/sys/kbd/<enter>", func(ui.Event) {
config.Update("sortField", m.Items[m.CursorPos])
config.Update("sortField", m.Items[m.CursorPos].Val)
ui.StopLoop()
})
ui.Loop()

49
widgets/menu.go
View File

@ -6,10 +6,14 @@ import (
type Padding [2]int // x,y padding
type MenuItem struct {
Val string
Text string
}
type Menu struct {
ui.Block
Items []string
DisplayItems []string
Items []MenuItem
TextFgColor ui.Attribute
TextBgColor ui.Attribute
Selectable bool
@ -18,10 +22,13 @@ type Menu struct {
}
func NewMenu(items []string) *Menu {
var mItems []MenuItem
for _, s := range items {
mItems = append(mItems, MenuItem{Val: s})
}
m := &Menu{
Block: *ui.NewBlock(),
Items: items,
DisplayItems: []string{},
Items: mItems,
TextFgColor: ui.ThemeAttr("par.text.fg"),
TextBgColor: ui.ThemeAttr("par.text.bg"),
Selectable: false,
@ -32,13 +39,22 @@ func NewMenu(items []string) *Menu {
return m
}
func (m *Menu) SetItems(items []MenuItem) {
m.Items = items
m.calcSize()
}
func (m *Menu) SelectedItem() MenuItem {
return m.Items[m.CursorPos]
}
func (m *Menu) Buffer() ui.Buffer {
var cell ui.Cell
buf := m.Block.Buffer()
for n, item := range m.displayItems() {
for n, item := range m.Items {
x := m.padding[0]
for _, ch := range item {
for _, ch := range getDisplayText(item) {
// invert bg/fg colors on currently selected row
if m.Selectable && n == m.CursorPos {
cell = ui.Cell{Ch: ch, Fg: m.TextBgColor, Bg: m.TextFgColor}
@ -74,20 +90,13 @@ func (m *Menu) NavigationHandlers() {
ui.Handle("/sys/kbd/q", func(ui.Event) { ui.StopLoop() })
}
// override display of items, if given
func (m *Menu) displayItems() []string {
if len(m.DisplayItems) == len(m.Items) {
return m.DisplayItems
}
return m.Items
}
// Set width and height based on menu items
func (m *Menu) calcSize() {
m.Width = 8 // minimum width
items := m.displayItems()
for _, s := range items {
items := m.Items
for _, i := range m.Items {
s := getDisplayText(i)
if len(s) > m.Width {
m.Width = len(s)
}
@ -96,3 +105,11 @@ func (m *Menu) calcSize() {
m.Width += (m.padding[0] * 2)
m.Height = len(items) + (m.padding[1] * 2)
}
// override display text of item, if given
func getDisplayText(m MenuItem) string {
if m.Text != "" {
return m.Text
}
return m.Val
}