summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunegunn Choi <junegunn.c@gmail.com>2020-10-31 02:53:10 +0900
committerJunegunn Choi <junegunn.c@gmail.com>2020-10-31 02:53:10 +0900
commitf8aaeef218174989c9631f5d5fc6cebaac4b8c66 (patch)
tree8dcad8b06f0e661a22e266dc199e6052f2aa07e4
parent7915e365b364af4c4287e35f4697f6e3cfe33284 (diff)
Revert "Prefer LightRenderer on Windows if it's available"
This reverts commit 7915e365b364af4c4287e35f4697f6e3cfe33284 due to https://github.com/junegunn/fzf.vim/issues/1152#issuecomment-719696495.
-rw-r--r--src/terminal.go6
-rw-r--r--src/tui/dummy.go4
-rw-r--r--src/tui/tcell.go4
3 files changed, 11 insertions, 3 deletions
diff --git a/src/terminal.go b/src/terminal.go
index eaf6e6bd..778665aa 100644
--- a/src/terminal.go
+++ b/src/terminal.go
@@ -408,11 +408,11 @@ func NewTerminal(opts *Options, eventBox *util.EventBox) *Terminal {
var renderer tui.Renderer
fullscreen := opts.Height.size == 0 || opts.Height.percent && opts.Height.size == 100
if fullscreen {
- if tui.IsLightRendererSupported() {
+ if tui.HasFullscreenRenderer() {
+ renderer = tui.NewFullscreenRenderer(opts.Theme, opts.Black, opts.Mouse)
+ } else {
renderer = tui.NewLightRenderer(opts.Theme, opts.Black, opts.Mouse, opts.Tabstop, opts.ClearOnExit,
true, func(h int) int { return h })
- } else {
- renderer = tui.NewFullscreenRenderer(opts.Theme, opts.Black, opts.Mouse)
}
} else {
maxHeightFunc := func(termHeight int) int {
diff --git a/src/tui/dummy.go b/src/tui/dummy.go
index f78a1c27..ca50e655 100644
--- a/src/tui/dummy.go
+++ b/src/tui/dummy.go
@@ -6,6 +6,10 @@ package tui
type Attr int
+func HasFullscreenRenderer() bool {
+ return false
+}
+
func (a Attr) Merge(b Attr) Attr {
return a | b
}
diff --git a/src/tui/tcell.go b/src/tui/tcell.go
index 3fd81323..4f80d069 100644
--- a/src/tui/tcell.go
+++ b/src/tui/tcell.go
@@ -15,6 +15,10 @@ import (
"github.com/mattn/go-runewidth"
)
+func HasFullscreenRenderer() bool {
+ return true
+}
+
func (p ColorPair) style() tcell.Style {
style := tcell.StyleDefault
return style.Foreground(tcell.Color(p.Fg())).Background(tcell.Color(p.Bg()))