michael/lf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add a ruler to statline to show current position

Browse Source
This commit is contained in:
Gokcehan 2018-01-11 20:46:07 +03:00
parent fd3a983b29
commit 58538c8020
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ui.go
View File

@ -221,10 +221,14 @@ func (win *win) printf(x, y int, fg, bg termbox.Attribute, format string, a ...i
win.print(x, y, fg, bg, fmt.Sprintf(format, a...)) win.print(x, y, fg, bg, fmt.Sprintf(format, a...))
} }
func (win *win) printl(x, y int, fg, bg termbox.Attribute, s string) { func (win *win) printLine(x, y int, fg, bg termbox.Attribute, s string) {
win.printf(x, y, fg, bg, "%s%*s", s, win.w-len(s), "") win.printf(x, y, fg, bg, "%s%*s", s, win.w-len(s), "")
} }
func (win *win) printRight(y int, fg, bg termbox.Attribute, s string) {
win.print(win.w-len(s), y, fg, bg, s)
}
func (win *win) printReg(reg []string) { func (win *win) printReg(reg []string) {
fg, bg := termbox.ColorDefault, termbox.ColorDefault fg, bg := termbox.ColorDefault, termbox.ColorDefault
@ -539,6 +543,21 @@ func (ui *ui) loadFileInfo(nav *nav) {
ui.msg = fmt.Sprintf("%v %4s %v", curr.Mode(), humanize(curr.Size()), curr.ModTime().Format(gOpts.timefmt)) ui.msg = fmt.Sprintf("%v %4s %v", curr.Mode(), humanize(curr.Size()), curr.ModTime().Format(gOpts.timefmt))
} }
func (ui *ui) drawStatLine(nav *nav) {
fg, bg := termbox.ColorDefault, termbox.ColorDefault
currDir := nav.currDir()
ui.msgWin.print(0, 0, fg, bg, ui.msg)
tot := len(currDir.fi)
ind := min(currDir.ind+1, tot)
ruler := fmt.Sprintf("%d/%d", ind, tot)
ui.msgWin.printRight(0, fg, bg, ruler)
}
func (ui *ui) draw(nav *nav) { func (ui *ui) draw(nav *nav) {
fg, bg := termbox.ColorDefault, termbox.ColorDefault fg, bg := termbox.ColorDefault, termbox.ColorDefault
@ -567,12 +586,12 @@ func (ui *ui) draw(nav *nav) {
} }
if ui.cmdPrefix != "" { if ui.cmdPrefix != "" {
ui.msgWin.printl(0, 0, fg, bg, ui.cmdPrefix) ui.msgWin.printLine(0, 0, fg, bg, ui.cmdPrefix)
ui.msgWin.print(len(ui.cmdPrefix), 0, fg, bg, string(ui.cmdAccLeft)) ui.msgWin.print(len(ui.cmdPrefix), 0, fg, bg, string(ui.cmdAccLeft))
ui.msgWin.print(len(ui.cmdPrefix)+runeSliceWidth(ui.cmdAccLeft), 0, fg, bg, string(ui.cmdAccRight)) ui.msgWin.print(len(ui.cmdPrefix)+runeSliceWidth(ui.cmdAccLeft), 0, fg, bg, string(ui.cmdAccRight))
termbox.SetCursor(ui.msgWin.x+len(ui.cmdPrefix)+runeSliceWidth(ui.cmdAccLeft), ui.msgWin.y) termbox.SetCursor(ui.msgWin.x+len(ui.cmdPrefix)+runeSliceWidth(ui.cmdAccLeft), ui.msgWin.y)
} else { } else {
ui.msgWin.print(0, 0, fg, bg, ui.msg) ui.drawStatLine(nav)
termbox.HideCursor() termbox.HideCursor()
} }
@ -597,9 +616,9 @@ func (ui *ui) draw(nav *nav) {
ui.menuWin.h = len(lines) - 1 ui.menuWin.h = len(lines) - 1
ui.menuWin.y = ui.wins[0].h - ui.menuWin.h ui.menuWin.y = ui.wins[0].h - ui.menuWin.h
ui.menuWin.printl(0, 0, termbox.AttrBold, termbox.AttrBold, lines[0]) ui.menuWin.printLine(0, 0, termbox.AttrBold, termbox.AttrBold, lines[0])
for i, line := range lines[1:] { for i, line := range lines[1:] {
ui.menuWin.printl(0, i+1, fg, bg, "") ui.menuWin.printLine(0, i+1, fg, bg, "")
ui.menuWin.print(0, i+1, fg, bg, line) ui.menuWin.print(0, i+1, fg, bg, line)
} }
} }