Add example image, remove some debug stuff.

This commit is contained in:
Camille Scholtz 2017-07-13 20:57:42 +02:00
parent 62e0f7f5f9
commit 36cbfd3d3f
4 changed files with 6 additions and 5 deletions

@ -2,6 +2,8 @@
melonbar - A concurrent, hackable bar/panel for X written in Go. melonbar - A concurrent, hackable bar/panel for X written in Go.
![](https://punpun.xyz/54c7.png)
## INSTALLATION ## INSTALLATION

3
bar.go

@ -127,7 +127,6 @@ func initBar(x, y, w, h int, font string, fontSize float64) (*Bar,
var block *Block var block *Block
bar.block.Range(func(val, i interface{}) bool { bar.block.Range(func(val, i interface{}) bool {
block = i.(*Block) block = i.(*Block)
fmt.Println(val)
if ev.EventX > int16(block.x) && ev.EventX < int16( if ev.EventX > int16(block.x) && ev.EventX < int16(
block.x+block.w) { block.x+block.w) {
return false return false
@ -142,7 +141,7 @@ func initBar(x, y, w, h int, font string, fontSize float64) (*Bar,
return bar, nil return bar, nil
} }
func (bar *Bar) paint(block *Block) error { func (bar *Bar) draw(block *Block) error {
// Calculate the required x coordinate for the different // Calculate the required x coordinate for the different
// aligments. // aligments.
tw, _ := xgraphics.Extents(bar.font, bar.fontSize, block.txt) tw, _ := xgraphics.Extents(bar.font, bar.fontSize, block.txt)

@ -259,7 +259,7 @@ func (bar *Bar) workspaceFun() {
blockwww := bar.initBlock("www", "www", 74, 'c', 0, "#5394C9", blockwww := bar.initBlock("www", "www", 74, 'c', 0, "#5394C9",
"#FFFFFF") "#FFFFFF")
blockwww.actions["button1"] = func() { blockwww.actions["button1"] = func() {
if err := ewmh.CurrentDesktopReq(bar.xu, 1); err != nil { if err := ewmh.CurrentDesktopReq(bar.xu, 0); err != nil {
log.Println(err) log.Println(err)
} }
} }
@ -275,7 +275,7 @@ func (bar *Bar) workspaceFun() {
blocksrc := bar.initBlock("src", "src", 70, 'c', 0, "#5394C9", blocksrc := bar.initBlock("src", "src", 70, 'c', 0, "#5394C9",
"#FFFFFF") "#FFFFFF")
blocksrc.actions["button1"] = func() { blocksrc.actions["button1"] = func() {
if err := ewmh.CurrentDesktopReq(bar.xu, 1); err != nil { if err := ewmh.CurrentDesktopReq(bar.xu, 2); err != nil {
log.Println(err) log.Println(err)
} }
} }

@ -30,7 +30,7 @@ func main() {
time.Sleep(time.Millisecond) time.Sleep(time.Millisecond)
for { for {
if err := bar.paint(<-bar.redraw); err != nil { if err := bar.draw(<-bar.redraw); err != nil {
log.Fatal(err) log.Fatal(err)
} }
} }