brian/boltbrowser
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Fix a few things

Browse Source
This commit is contained in:
Brian Buller 2015-12-01 15:24:43 -06:00
parent e27925d5e9
commit ff02fa104d
1 changed files with 7 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
screen_browser.go
View File

@ -533,21 +533,10 @@ func (screen *BrowserScreen) drawBucket(bkt *BoltBucket, style Style, y int) int
prefixSpaces := strings.Repeat(" ", len(bkt.GetPath())*2) prefixSpaces := strings.Repeat(" ", len(bkt.GetPath())*2)
bktString := prefixSpaces bktString := prefixSpaces
prefixSpaces = prefixSpaces + " " prefixSpaces = prefixSpaces + " "
if bkt.expanded { if bkt.expanded {
bktString = bktString + "- " + bkt.name bktString = bktString + "- " + bkt.name
if len(bktString) > w { usedLines = screen.drawMultilineText(bktString, (len(bkt.GetPath())*2 + 2), 0, y, (w - 1), bucketFg, bucketBg)
// Long bucket name, wrap it
for len(bktString) > w {
termboxUtil.DrawStringAtPoint(bktString[:(w-1)], 0, (y + usedLines), bucketFg, bucketBg)
bktString = prefixSpaces + bktString[(w-1):]
usedLines++
}
}
if (w - len(bktString)) > 0 {
bktString = fmt.Sprintf("%s%s", bktString, strings.Repeat(" ", (w-len(bktString))))
}
termboxUtil.DrawStringAtPoint(bktString, 0, (y + usedLines), bucketFg, bucketBg)
usedLines++
for i := range bkt.buckets { for i := range bkt.buckets {
usedLines += screen.drawBucket(&bkt.buckets[i], style, y+usedLines) usedLines += screen.drawBucket(&bkt.buckets[i], style, y+usedLines)
@ -557,19 +546,7 @@ func (screen *BrowserScreen) drawBucket(bkt *BoltBucket, style Style, y int) int
} }
} else { } else {
bktString = bktString + "+ " + bkt.name bktString = bktString + "+ " + bkt.name
if len(bktString) > w { usedLines = screen.drawMultilineText(bktString, (len(bkt.GetPath())*2 + 2), 0, y, (w - 1), bucketFg, bucketBg)
// Long bucket name, wrap it
for len(bktString) > w {
termboxUtil.DrawStringAtPoint(bktString[:(w-1)], 0, (y + usedLines), bucketFg, bucketBg)
bktString = prefixSpaces + bktString[(w-1):]
usedLines++
}
}
if (w - len(bktString)) > 0 {
bktString = fmt.Sprintf("%s%s", bktString, strings.Repeat(" ", (w-len(bktString))))
}
termboxUtil.DrawStringAtPoint(bktString, 0, (y + usedLines), bucketFg, bucketBg)
usedLines++
} }
return usedLines return usedLines
} }
@ -596,28 +573,15 @@ func (screen *BrowserScreen) drawPair(bp *BoltPair, style Style, y int) int {
// We're going to try to wrap it at the :, if we can // We're going to try to wrap it at the :, if we can
if len(bp.GetPath())*2+len(bp.key)+1 > w { if len(bp.GetPath())*2+len(bp.key)+1 > w {
// We can't... So just wrap it // We can't... So just wrap it
for len(pairString) > w { usedLines = screen.drawMultilineText(pairString, (len(bp.GetPath()) * 2), 0, y, (w - 1), style.defaultFg, style.defaultBg)
termboxUtil.DrawStringAtPoint(pairString[:(w-1)], 0, (y + usedLines), bucketFg, bucketBg)
pairString = strings.Repeat(" ", len(bp.GetPath())*2) + pairString[(w-1):]
usedLines++
}
termboxUtil.DrawStringAtPoint(pairString, 0, (y + usedLines), bucketFg, bucketBg)
usedLines++
} else { } else {
// That's convenient, wrap at the : // That's convenient, wrap at the :
pairString := strings.Repeat(" ", len(bp.GetPath())*2) pairString := strings.Repeat(" ", len(bp.GetPath())*2)
pairString = fmt.Sprintf("%s%s:", pairString, bp.key, bp.val) pairString = fmt.Sprintf("%s%s:", pairString, bp.key)
termboxUtil.DrawStringAtPoint(pairString, 0, y, bucketFg, bucketBg) termboxUtil.DrawStringAtPoint(pairString, 0, y, bucketFg, bucketBg)
usedLines++ usedLines++
pairString = bp.val pairString = strings.Repeat(" ", len(bp.GetPath())*2+2) + bp.val
for len(pairString) > w { usedLines += screen.drawMultilineText(pairString, (len(bp.GetPath())*2)+2, 0, y+1, (w - 1), bucketFg, bucketBg)
// Gotta chunk it up
termboxUtil.DrawStringAtPoint(pairString[:(w-1)], 0, (y + usedLines), bucketFg, bucketBg)
pairString = strings.Repeat(" ", len(bp.GetPath())*2) + pairString[(w-1):]
usedLines++
}
termboxUtil.DrawStringAtPoint(pairString, 0, (y + usedLines), bucketFg, bucketBg)
usedLines++
} }
} else { } else {
if w-len(pairString) > 0 { if w-len(pairString) > 0 {