mroot/lazydocker
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazydocker.git synced 2026-07-25 08:31:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gui: implement PreviousViews stack

Browse source
This commit is contained in:
Dawid Dziurla 2019-08-31 12:02:27 +02:00
parent b12414907b
commit 897d47d0cc
No known key found for this signature in database
GPG key ID: 7B6D8368172E9B0B
4 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkg/gui/gui.go
View file

@ -1,6 +1,7 @@
package gui package gui
import ( import (
"github.com/golang-collections/collections/stack"
"strings" "strings"
"sync" "sync"
@ -117,7 +118,7 @@ type panelStates struct {
type guiState struct { type guiState struct {
MenuItemCount int // can't store the actual list because it's of interface{} type MenuItemCount int // can't store the actual list because it's of interface{} type
PreviousView string PreviousViews *stack.Stack
Platform commands.Platform Platform commands.Platform
Panels *panelStates Panels *panelStates
SubProcessOutput string SubProcessOutput string
@ -131,6 +132,10 @@ type guiState struct {
// NewGui builds a new gui handler // NewGui builds a new gui handler
func NewGui(log *logrus.Entry, dockerCommand *commands.DockerCommand, oSCommand *commands.OSCommand, tr *i18n.TranslationSet, config *config.AppConfig, errorChan chan error) (*Gui, error) { func NewGui(log *logrus.Entry, dockerCommand *commands.DockerCommand, oSCommand *commands.OSCommand, tr *i18n.TranslationSet, config *config.AppConfig, errorChan chan error) (*Gui, error) {
previousViews := stack.New()
// push dummy initial string
previousViews.Push("")
initialState := guiState{ initialState := guiState{
Platform: *oSCommand.Platform, Platform: *oSCommand.Platform,
Panels: &panelStates{ Panels: &panelStates{
@ -144,7 +149,8 @@ func NewGui(log *logrus.Entry, dockerCommand *commands.DockerCommand, oSCommand
}, },
Project: &projectState{ContextIndex: 0}, Project: &projectState{ContextIndex: 0},
}, },
SessionIndex: 0, SessionIndex: 0,
PreviousViews: previousViews,
} }
cyclableViews := []string{"project", "containers", "images", "volumes"} cyclableViews := []string{"project", "containers", "images", "volumes"}

6
pkg/gui/layout.go
View file

@ -94,7 +94,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
} }
currView := gui.g.CurrentView() currView := gui.g.CurrentView()
currentCyclebleView := gui.State.PreviousView currentCyclebleView := gui.State.PreviousViews.Peek().(string)
if currView != nil { if currView != nil {
viewName := currView.Name() viewName := currView.Name()
usePreviouseView := true usePreviouseView := true
@ -106,7 +106,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
} }
} }
if usePreviouseView { if usePreviouseView {
currentCyclebleView = gui.State.PreviousView currentCyclebleView = gui.State.PreviousViews.Peek().(string)
} }
} }
@ -273,7 +273,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
} }
if gui.g.CurrentView() == nil { if gui.g.CurrentView() == nil {
v, err := gui.g.View(gui.State.PreviousView) v, err := gui.g.View(gui.State.PreviousViews.Peek().(string))
if err != nil { if err != nil {
viewName := gui.initiallyFocusedViewName() viewName := gui.initiallyFocusedViewName()
v, err = gui.g.View(viewName) v, err = gui.g.View(viewName)

2
pkg/gui/subprocess.go
View file

@ -22,7 +22,7 @@ func (gui *Gui) RunWithSubprocesses() error {
break break
} else if err == gui.Errors.ErrSubProcess { } else if err == gui.Errors.ErrSubProcess {
// preparing the state for when we return // preparing the state for when we return
gui.State.PreviousView = gui.currentViewName() gui.State.PreviousViews.Push(gui.currentViewName())
// giving goEvery goroutines time to finish // giving goEvery goroutines time to finish
gui.State.SessionIndex++ gui.State.SessionIndex++

5
pkg/gui/view_helpers.go
View file

@ -103,7 +103,8 @@ func (gui *Gui) newLineFocused(v *gocui.View) error {
} }
func (gui *Gui) returnFocus(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) returnFocus(g *gocui.Gui, v *gocui.View) error {
previousView, err := g.View(gui.State.PreviousView) previousViewName := gui.State.PreviousViews.Pop().(string)
previousView, err := g.View(previousViewName)
if err != nil { if err != nil {
// always fall back to services view if there's no 'previous' view stored // always fall back to services view if there's no 'previous' view stored
previousView, err = g.View(gui.initiallyFocusedViewName()) previousView, err = g.View(gui.initiallyFocusedViewName())
@ -120,7 +121,7 @@ func (gui *Gui) switchFocus(g *gocui.Gui, oldView, newView *gocui.View) error {
// we assume we'll never want to return focus to a popup panel i.e. // we assume we'll never want to return focus to a popup panel i.e.
// we should never stack popup panels // we should never stack popup panels
if oldView != nil && !gui.isPopupPanel(oldView.Name()) { if oldView != nil && !gui.isPopupPanel(oldView.Name()) {
gui.State.PreviousView = oldView.Name() gui.State.PreviousViews.Push(oldView.Name())
} }
gui.Log.Info("setting highlight to true for view " + newView.Name()) gui.Log.Info("setting highlight to true for view " + newView.Name())