Prefer LightRenderer on Windows if it's available

Fix #1766
This commit is contained in:
Junegunn Choi 2020-10-31 01:41:57 +09:00
parent 1c68f81c37
commit 7915e365b3
No known key found for this signature in database
GPG Key ID: 254BC280FEF9C627
3 changed files with 3 additions and 11 deletions

View File

@ -408,11 +408,11 @@ func NewTerminal(opts *Options, eventBox *util.EventBox) *Terminal {
var renderer tui.Renderer var renderer tui.Renderer
fullscreen := opts.Height.size == 0 || opts.Height.percent && opts.Height.size == 100 fullscreen := opts.Height.size == 0 || opts.Height.percent && opts.Height.size == 100
if fullscreen { if fullscreen {
if tui.HasFullscreenRenderer() { if tui.IsLightRendererSupported() {
renderer = tui.NewFullscreenRenderer(opts.Theme, opts.Black, opts.Mouse)
} else {
renderer = tui.NewLightRenderer(opts.Theme, opts.Black, opts.Mouse, opts.Tabstop, opts.ClearOnExit, renderer = tui.NewLightRenderer(opts.Theme, opts.Black, opts.Mouse, opts.Tabstop, opts.ClearOnExit,
true, func(h int) int { return h }) true, func(h int) int { return h })
} else {
renderer = tui.NewFullscreenRenderer(opts.Theme, opts.Black, opts.Mouse)
} }
} else { } else {
maxHeightFunc := func(termHeight int) int { maxHeightFunc := func(termHeight int) int {

View File

@ -6,10 +6,6 @@ package tui
type Attr int type Attr int
func HasFullscreenRenderer() bool {
return false
}
func (a Attr) Merge(b Attr) Attr { func (a Attr) Merge(b Attr) Attr {
return a | b return a | b
} }

View File

@ -15,10 +15,6 @@ import (
"github.com/mattn/go-runewidth" "github.com/mattn/go-runewidth"
) )
func HasFullscreenRenderer() bool {
return true
}
func (p ColorPair) style() tcell.Style { func (p ColorPair) style() tcell.Style {
style := tcell.StyleDefault style := tcell.StyleDefault
return style.Foreground(tcell.Color(p.Fg())).Background(tcell.Color(p.Bg())) return style.Foreground(tcell.Color(p.Fg())).Background(tcell.Color(p.Bg()))