From fedb8b03da60750cdf5f536075baad530dbf4abd Mon Sep 17 00:00:00 2001 From: Zachary Yedidia Date: Fri, 22 Apr 2016 18:50:01 -0400 Subject: [PATCH] Fix horizontal scrolling Fixes #59 --- cmd/micro/view.go | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/cmd/micro/view.go b/cmd/micro/view.go index 42cd178e..2684e05f 100644 --- a/cmd/micro/view.go +++ b/cmd/micro/view.go @@ -670,23 +670,19 @@ func (v *View) DisplayView() { } // Write the line tabchars := 0 - runes := []rune(line) - for colN := v.leftCol; colN < v.leftCol+v.width; colN++ { - if colN >= len(runes) { - break - } - ch := runes[colN] + for colN, ch := range line { var lineStyle tcell.Style + if settings.Syntax { // Syntax highlighting is enabled highlightStyle = v.matches[lineN][colN] } if v.cursor.HasSelection() && - (charNum >= v.cursor.curSelection[0] && charNum < v.cursor.curSelection[1] || - charNum < v.cursor.curSelection[0] && charNum >= v.cursor.curSelection[1]) { + (charNum >= v.cursor.curSelection[0] && charNum <= v.cursor.curSelection[1] || + charNum <= v.cursor.curSelection[0] && charNum >= v.cursor.curSelection[1]) { - lineStyle = defStyle.Reverse(true) + lineStyle = tcell.StyleDefault.Reverse(true) if style, ok := colorscheme["selection"]; ok { lineStyle = style @@ -730,7 +726,6 @@ func (v *View) DisplayView() { charNum++ } - // v.lastMatches = matches } // Display renders the view, the cursor, and statusline