Merge pull request #1321 from zonuexe/add/php-fn-keyword

[micro.git] / internal / display / tabwindow.go

diff --git a/internal/display/tabwindow.go b/internal/display/tabwindow.go
index 3d25a42caa646b54e927e46049dd7c953727473f..182e675d1400fa287ca0378f308dc363229a6494 100644 (file)
--- a/internal/display/tabwindow.go
+++ b/internal/display/tabwindow.go
@@ -25,6 +25,10 @@ func NewTabWindow(w int, y int) *TabWindow {
        return tw
 }
 
+func (w *TabWindow) Resize(width, height int) {
+       w.width = width
+}
+
 func (w *TabWindow) LocFromVisual(vloc buffer.Loc) int {
        x := -w.hscroll
 
@@ -45,13 +49,18 @@ func (w *TabWindow) LocFromVisual(vloc buffer.Loc) int {
 
 func (w *TabWindow) Scroll(amt int) {
        w.hscroll += amt
-       w.hscroll = util.Clamp(w.hscroll, 0, w.TotalSize()-w.width)
+       s := w.TotalSize()
+       w.hscroll = util.Clamp(w.hscroll, 0, s-w.width)
+
+       if s-w.width <= 0 {
+               w.hscroll = 0
+       }
 }
 
 func (w *TabWindow) TotalSize() int {
        sum := 2
        for _, n := range w.Names {
-               sum += utf8.RuneCountInString(n) + 4
+               sum += runewidth.StringWidth(n) + 4
        }
        return sum - 4
 }
@@ -64,6 +73,7 @@ func (w *TabWindow) SetActive(a int) {
        w.active = a
        x := 2
        s := w.TotalSize()
+
        for i, n := range w.Names {
                c := utf8.RuneCountInString(n)
                if i == a {
@@ -76,6 +86,10 @@ func (w *TabWindow) SetActive(a int) {
                }
                x += c + 4
        }
+
+       if s-w.width <= 0 {
+               w.hscroll = 0
+       }
 }
 
 func (w *TabWindow) Display() {
@@ -91,13 +105,13 @@ func (w *TabWindow) Display() {
                                        c = ' '
                                }
                                if x == w.width-1 && !done {
-                                       screen.Screen.SetContent(w.width-1, w.Y, '>', nil, config.DefStyle.Reverse(true))
+                                       screen.SetContent(w.width-1, w.Y, '>', nil, config.DefStyle.Reverse(true))
                                        x++
                                        break
                                } else if x == 0 && w.hscroll > 0 {
-                                       screen.Screen.SetContent(0, w.Y, '<', nil, config.DefStyle.Reverse(true))
+                                       screen.SetContent(0, w.Y, '<', nil, config.DefStyle.Reverse(true))
                                } else if x >= 0 && x < w.width {
-                                       screen.Screen.SetContent(x, w.Y, c, nil, config.DefStyle.Reverse(true))
+                                       screen.SetContent(x, w.Y, c, nil, config.DefStyle.Reverse(true))
                                }
                                x++
                        }