Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add an "Active" member for Block to allow "focusable" widgets #257

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add an "Active" member for Block to allow "focusable" widgets #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 44 additions & 11 deletions _examples/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,39 +33,70 @@ func main() {
"[8] bar",
"[9] baz",
}
l.ActiveBorderStyle = ui.NewStyle(ui.ColorRed)
l.TextStyle = ui.NewStyle(ui.ColorYellow)
l.WrapText = false
l.SetRect(0, 0, 25, 8)
l.Active = true

ui.Render(l)
l2 := widgets.NewList()
l2.Title = "List 2"
l2.Rows = []string{
"foo",
"bar",
"baz",
}
l2.ActiveBorderStyle = ui.NewStyle(ui.ColorRed)
l2.TextStyle = ui.NewStyle(ui.ColorYellow)
l2.WrapText = false
l2.SetRect(28, 0, 53, 8)

uiWidgets := []*widgets.List{l, l2}

for _, w := range(uiWidgets) {
ui.Render(w)
}

var activeWidget *widgets.List

previousKey := ""
uiEvents := ui.PollEvents()
for {
for _, w := range(uiWidgets) {
if w.Active {
activeWidget = w
break
}
}

e := <-uiEvents
switch e.ID {
case "q", "<C-c>":
return
case "j", "<Down>":
l.ScrollDown()
activeWidget.ScrollDown()
case "k", "<Up>":
l.ScrollUp()
activeWidget.ScrollUp()
case "<C-d>":
l.ScrollHalfPageDown()
activeWidget.ScrollHalfPageDown()
case "<C-u>":
l.ScrollHalfPageUp()
activeWidget.ScrollHalfPageUp()
case "<C-f>":
l.ScrollPageDown()
activeWidget.ScrollPageDown()
case "<C-b>":
l.ScrollPageUp()
activeWidget.ScrollPageUp()
case "g":
if previousKey == "g" {
l.ScrollTop()
activeWidget.ScrollTop()
}
case "<Home>":
l.ScrollTop()
activeWidget.ScrollTop()
case "G", "<End>":
l.ScrollBottom()
activeWidget.ScrollBottom()
case "<Tab>":
for _, w := range(uiWidgets) {
w.Active = !w.Active
}
}

if previousKey == "g" {
Expand All @@ -74,6 +105,8 @@ func main() {
previousKey = e.ID
}

ui.Render(l)
for _, w := range(uiWidgets) {
ui.Render(w)
}
}
}
60 changes: 44 additions & 16 deletions _examples/tree.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,52 +68,78 @@ func main() {
}

l := widgets.NewTree()
l.ActiveBorderStyle = ui.NewStyle(ui.ColorRed)
l.Active = true
l.TextStyle = ui.NewStyle(ui.ColorYellow)
l.WrapText = false
l.SetNodes(nodes)

l2 := widgets.NewTree()
l2.ActiveBorderStyle = ui.NewStyle(ui.ColorRed)
l2.TextStyle = ui.NewStyle(ui.ColorYellow)
l2.WrapText = false
l2.SetNodes(nodes)

x, y := ui.TerminalDimensions()

l.SetRect(0, 0, x, y)
l.SetRect(0, 0, x/2, y)
l2.SetRect(x/2+1, 0, x, y)

uiWidgets := []*widgets.Tree{l, l2}

for _, w := range uiWidgets {
ui.Render(w)
}

ui.Render(l)
var activeWidget *widgets.Tree

previousKey := ""
uiEvents := ui.PollEvents()
for {
for _, w := range(uiWidgets) {
if w.Active {
activeWidget = w
break
}
}

e := <-uiEvents
switch e.ID {
case "q", "<C-c>":
return
case "j", "<Down>":
l.ScrollDown()
activeWidget.ScrollDown()
case "k", "<Up>":
l.ScrollUp()
activeWidget.ScrollUp()
case "<C-d>":
l.ScrollHalfPageDown()
activeWidget.ScrollHalfPageDown()
case "<C-u>":
l.ScrollHalfPageUp()
activeWidget.ScrollHalfPageUp()
case "<C-f>":
l.ScrollPageDown()
activeWidget.ScrollPageDown()
case "<C-b>":
l.ScrollPageUp()
activeWidget.ScrollPageUp()
case "g":
if previousKey == "g" {
l.ScrollTop()
activeWidget.ScrollTop()
}
case "<Home>":
l.ScrollTop()
activeWidget.ScrollTop()
case "<Enter>":
l.ToggleExpand()
activeWidget.ToggleExpand()
case "G", "<End>":
l.ScrollBottom()
activeWidget.ScrollBottom()
case "E":
l.ExpandAll()
activeWidget.ExpandAll()
case "C":
l.CollapseAll()
activeWidget.CollapseAll()
case "<Resize>":
x, y := ui.TerminalDimensions()
l.SetRect(0, 0, x, y)
l.SetRect(0, 0, x/2, y)
l2.SetRect(0, 0, x/2+1, y)
case "<Tab>":
l.Active = !l.Active
l2.Active = !l2.Active
}

if previousKey == "g" {
Expand All @@ -122,6 +148,8 @@ func main() {
previousKey = e.ID
}

ui.Render(l)
for _, w := range uiWidgets {
ui.Render(w)
}
}
}
38 changes: 24 additions & 14 deletions v3/block.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@ import (
// It implements all 3 of the methods needed for the `Drawable` interface.
// Custom widgets will override the Draw method.
type Block struct {
Border bool
BorderStyle Style
Active bool
ActiveBorderStyle Style

Border bool
BorderStyle Style

BorderLeft, BorderRight, BorderTop, BorderBottom bool

Expand All @@ -32,20 +35,27 @@ type Block struct {

func NewBlock() *Block {
return &Block{
Border: true,
BorderStyle: Theme.Block.Border,
BorderLeft: true,
BorderRight: true,
BorderTop: true,
BorderBottom: true,
Active: false,
ActiveBorderStyle: Theme.Block.Border,
Border: true,
BorderStyle: Theme.Block.Border,
BorderLeft: true,
BorderRight: true,
BorderTop: true,
BorderBottom: true,

TitleStyle: Theme.Block.Title,
}
}

func (self *Block) drawBorder(buf *Buffer) {
verticalCell := Cell{VERTICAL_LINE, self.BorderStyle}
horizontalCell := Cell{HORIZONTAL_LINE, self.BorderStyle}
borderStyle := self.BorderStyle
if self.Active {
borderStyle = self.ActiveBorderStyle
}

verticalCell := Cell{VERTICAL_LINE, borderStyle}
horizontalCell := Cell{HORIZONTAL_LINE, borderStyle}

// draw lines
if self.BorderTop {
Expand All @@ -63,16 +73,16 @@ func (self *Block) drawBorder(buf *Buffer) {

// draw corners
if self.BorderTop && self.BorderLeft {
buf.SetCell(Cell{TOP_LEFT, self.BorderStyle}, self.Min)
buf.SetCell(Cell{TOP_LEFT, borderStyle}, self.Min)
}
if self.BorderTop && self.BorderRight {
buf.SetCell(Cell{TOP_RIGHT, self.BorderStyle}, image.Pt(self.Max.X-1, self.Min.Y))
buf.SetCell(Cell{TOP_RIGHT, borderStyle}, image.Pt(self.Max.X-1, self.Min.Y))
}
if self.BorderBottom && self.BorderLeft {
buf.SetCell(Cell{BOTTOM_LEFT, self.BorderStyle}, image.Pt(self.Min.X, self.Max.Y-1))
buf.SetCell(Cell{BOTTOM_LEFT, borderStyle}, image.Pt(self.Min.X, self.Max.Y-1))
}
if self.BorderBottom && self.BorderRight {
buf.SetCell(Cell{BOTTOM_RIGHT, self.BorderStyle}, self.Max.Sub(image.Pt(1, 1)))
buf.SetCell(Cell{BOTTOM_RIGHT, borderStyle}, self.Max.Sub(image.Pt(1, 1)))
}
}

Expand Down