Maks1mS/bubbles
1
0
Fork 0
mirror of https://github.com/Maks1mS/bubbles.git synced 2024-12-25 07:04:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Correct slice bounding

Browse Source
This commit is contained in:
Christian Rocha 2020-06-18 16:29:05 -04:00
parent 09ae5da7c3
commit 34ac608122
No known key found for this signature in database
GPG Key ID: D6CC7A16E5878018
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
viewport/viewport.go
View File

@ -149,8 +149,9 @@ func (m *Model) LineUp(n int) {
// COMMANDS // COMMANDS
func Sync(m Model) tea.Cmd { func Sync(m Model) tea.Cmd {
top := clamp(m.YOffset, 0, len(m.lines)) top := max(m.YOffset, 0)
bottom := clamp(m.YOffset+m.Height, 0, len(m.lines)) bottom := min(m.YOffset+m.Height, len(m.lines)-1)
return tea.SyncScrollArea( return tea.SyncScrollArea(
m.lines[top:bottom], m.lines[top:bottom],
m.YPosition, m.YPosition,
@ -179,7 +180,7 @@ func ViewUp(m Model) tea.Cmd {
} }
top := max(m.YOffset-m.Height, 0) top := max(m.YOffset-m.Height, 0)
bottom := min(m.YOffset, len(m.lines)) bottom := min(m.YOffset, len(m.lines)-1)
return tea.ScrollUp( return tea.ScrollUp(
m.lines[top:bottom], m.lines[top:bottom],
@ -209,7 +210,7 @@ func HalfViewUp(m Model) tea.Cmd {
} }
top := max(m.YOffset-m.Height/2, 0) top := max(m.YOffset-m.Height/2, 0)
bottom := clamp(m.YOffset, top, len(m.lines)) bottom := clamp(m.YOffset, top, len(m.lines)-1)
return tea.ScrollUp( return tea.ScrollUp(
m.lines[top:bottom], m.lines[top:bottom],
@ -223,7 +224,7 @@ func LineDown(m Model, n int) tea.Cmd {
return nil return nil
} }
bottom := min(m.YOffset+m.Height+n, len(m.lines)) bottom := min(m.YOffset+m.Height+n, len(m.lines)-1)
top := max(bottom-n, 0) top := max(bottom-n, 0)
return tea.ScrollDown( return tea.ScrollDown(
@ -239,7 +240,7 @@ func LineUp(m Model, n int) tea.Cmd {
} }
top := max(m.YOffset-n, 0) top := max(m.YOffset-n, 0)
bottom := min(top+n, len(m.lines)) bottom := min(top+n, len(m.lines)-1)
return tea.ScrollUp( return tea.ScrollUp(
m.lines[top:bottom], m.lines[top:bottom],
@ -250,8 +251,9 @@ func LineUp(m Model, n int) tea.Cmd {
// UPDATE // UPDATE
// Update runs the update loop with default keybindings. To define your own // Update runs the update loop with default keybindings similar to popular
// keybindings use the methods on Model and define your own update function. // pagers. To define your own keybindings use the methods on Model (i.e.
// Model.LineDown()) and define your own update function.
func Update(msg tea.Msg, m Model) (Model, tea.Cmd) { func Update(msg tea.Msg, m Model) (Model, tea.Cmd) {
var cmd tea.Cmd var cmd tea.Cmd