github/zyedidia.micro
2
0
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2026-03-30 06:37:14 +09:00
Code Issues Packages Projects Releases Wiki Activity

Draw tab characters correctly

Browse Source
This commit is contained in:
Zachary Yedidia
2017-02-19 12:34:51 -05:00
parent 1ba51e4f59
commit ff5c8d7451
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/micro/view2.go
View File

@@ -3,6 +3,7 @@ package main
import "strconv"
func (v *View) DisplayView() {
tabsize := int(v.Buf.Settings["tabsize"].(float64))
if v.Type == vtLog {
// Log views should always follow the cursor...
v.Relocate()
@@ -70,6 +71,8 @@ func (v *View) DisplayView() {
screenX++
}
lineStr := v.Buf.Line(realLineN)
// If there are gutter messages we need to display the '>>' symbol here
if hasGutterMessages {
// msgOnLine stores whether or not there is a gutter message on this line in particular
@@ -156,23 +159,21 @@ func (v *View) DisplayView() {
}
var lastChar *Char
for i, char := range line {
for _, char := range line {
if char != nil {
if tabs[curTab].CurView == v.Num && !v.Cursor.HasSelection() &&
v.Cursor.Y == char.realLoc.Y && v.Cursor.X == char.realLoc.X {
screen.ShowCursor(xOffset+char.visualLoc.X, char.visualLoc.Y)
}
screen.SetContent(xOffset+char.visualLoc.X, char.visualLoc.Y, char.char, nil, char.style)
if i == len(line)-1 {
lastChar = char
}
screen.SetContent(xOffset+char.visualLoc.X, char.visualLoc.Y, char.drawChar, nil, char.style)
lastChar = char
}
}
if lastChar != nil {
if tabs[curTab].CurView == v.Num && !v.Cursor.HasSelection() &&
v.Cursor.Y == lastChar.realLoc.Y && v.Cursor.X == lastChar.realLoc.X+1 {
screen.ShowCursor(xOffset+lastChar.visualLoc.X+1, lastChar.visualLoc.Y)
screen.ShowCursor(xOffset+StringWidth(string(lineStr), tabsize), lastChar.visualLoc.Y)
}
} else if len(line) == 0 {
if tabs[curTab].CurView == v.Num && !v.Cursor.HasSelection() &&