Archives
/
lazydocker
mirror of https://github.com/jesseduffield/lazydocker
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove redundant function

Browse Source
pull/392/head
Jesse Duffield 2 years ago
parent f7beb6e83f
commit 9b58b8188a
7 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File

4
pkg/gui/container_logs.go
Unescape Escape View File

@ -16,7 +16,7 @@ import (
)
func (gui *Gui) renderContainerLogsToMain(container *commands.Container) error {
mainView := gui.getMainView()
mainView := gui.Views.Main
mainView.Autoscroll = true
mainView.Wrap = gui.Config.UserConfig.Gui.WrapMainPanel
@ -37,7 +37,7 @@ func (gui *Gui) renderContainerLogsToMainAux(container *commands.Container, stop
ctxCancel()
}()
mainView := gui.getMainView()
mainView := gui.Views.Main
if err := gui.writeContainerLogs(container, ctx, mainView); err != nil {
gui.Log.Error(err)

8
pkg/gui/containers_panel.go
Unescape Escape View File

@ -125,7 +125,7 @@ func (gui *Gui) renderContainerEnv(container *commands.Container) error {
})
}
mainView := gui.getMainView()
mainView := gui.Views.Main
mainView.Autoscroll = false
mainView.Wrap = gui.Config.UserConfig.Gui.WrapMainPanel
@ -168,7 +168,7 @@ func (gui *Gui) renderContainerConfig(container *commands.Container) error {
})
}
mainView := gui.getMainView()
mainView := gui.Views.Main
mainView.Autoscroll = false
mainView.Wrap = gui.Config.UserConfig.Gui.WrapMainPanel
@ -219,7 +219,7 @@ func (gui *Gui) renderContainerConfig(container *commands.Container) error {
}
func (gui *Gui) renderContainerStats(container *commands.Container) error {
mainView := gui.getMainView()
mainView := gui.Views.Main
mainView.Autoscroll = false
mainView.Wrap = gui.Config.UserConfig.Gui.WrapMainPanel
@ -236,7 +236,7 @@ func (gui *Gui) renderContainerStats(container *commands.Container) error {
}
func (gui *Gui) renderContainerTop(container *commands.Container) error {
mainView := gui.getMainView()
mainView := gui.Views.Main
mainView.Autoscroll = false
mainView.Wrap = gui.Config.UserConfig.Gui.WrapMainPanel

2
pkg/gui/gui.go
Unescape Escape View File

@ -353,7 +353,7 @@ func (gui *Gui) checkForContextChange() error {
}
func (gui *Gui) reRenderMain() error {
mainView := gui.getMainView()
mainView := gui.Views.Main
if mainView == nil {
return nil
}

20
pkg/gui/main_panel.go
Unescape Escape View File

@ -7,7 +7,7 @@ import (
)
func (gui *Gui) scrollUpMain(g *gocui.Gui, v *gocui.View) error {
mainView := gui.getMainView()
mainView := gui.Views.Main
mainView.Autoscroll = false
ox, oy := mainView.Origin()
newOy := int(math.Max(0, float64(oy-gui.Config.UserConfig.Gui.ScrollHeight)))
@ -15,7 +15,7 @@ func (gui *Gui) scrollUpMain(g *gocui.Gui, v *gocui.View) error {
}
func (gui *Gui) scrollDownMain(g *gocui.Gui, v *gocui.View) error {
mainView := gui.getMainView()
mainView := gui.Views.Main
mainView.Autoscroll = false
ox, oy := mainView.Origin()
@ -34,7 +34,7 @@ func (gui *Gui) scrollDownMain(g *gocui.Gui, v *gocui.View) error {
}
func (gui *Gui) scrollLeftMain(g *gocui.Gui, v *gocui.View) error {
mainView := gui.getMainView()
mainView := gui.Views.Main
ox, oy := mainView.Origin()
newOx := int(math.Max(0, float64(ox-gui.Config.UserConfig.Gui.ScrollHeight)))
@ -42,7 +42,7 @@ func (gui *Gui) scrollLeftMain(g *gocui.Gui, v *gocui.View) error {
}
func (gui *Gui) scrollRightMain(g *gocui.Gui, v *gocui.View) error {
mainView := gui.getMainView()
mainView := gui.Views.Main
ox, oy := mainView.Origin()
content := mainView.ViewBufferLines()
@ -62,14 +62,14 @@ func (gui *Gui) scrollRightMain(g *gocui.Gui, v *gocui.View) error {
}
func (gui *Gui) autoScrollMain(g *gocui.Gui, v *gocui.View) error {
gui.getMainView().Autoscroll = true
gui.Views.Main.Autoscroll = true
return nil
}
func (gui *Gui) jumpToTopMain(g *gocui.Gui, v *gocui.View) error {
gui.getMainView().Autoscroll = false
_ = gui.getMainView().SetOrigin(0, 0)
_ = gui.getMainView().SetCursor(0, 0)
gui.Views.Main.Autoscroll = false
_ = gui.Views.Main.SetOrigin(0, 0)
_ = gui.Views.Main.SetCursor(0, 0)
return nil
}
@ -78,7 +78,7 @@ func (gui *Gui) onMainTabClick(tabIndex int) error {
viewName := gui.currentViewName()
mainView := gui.getMainView()
mainView := gui.Views.Main
if viewName == "main" && mainView.ParentView != nil {
viewName = mainView.ParentView.Name()
}
@ -94,7 +94,7 @@ func (gui *Gui) onMainTabClick(tabIndex int) error {
}
func (gui *Gui) handleEnterMain(g *gocui.Gui, v *gocui.View) error {
mainView := gui.getMainView()
mainView := gui.Views.Main
mainView.ParentView = v
return gui.switchFocus(mainView)

6
pkg/gui/project_panel.go
Unescape Escape View File

@ -89,7 +89,7 @@ func (gui *Gui) getProjectName() string {
func (gui *Gui) renderCredits(_project *commands.Project) error {
return gui.T.NewTask(func(stop chan struct{}) {
mainView := gui.getMainView()
mainView := gui.Views.Main
mainView.Autoscroll = false
mainView.Wrap = gui.Config.UserConfig.Gui.WrapMainPanel
@ -114,7 +114,7 @@ func (gui *Gui) renderCredits(_project *commands.Project) error {
func (gui *Gui) renderAllLogs(_project *commands.Project) error {
return gui.T.NewTask(func(stop chan struct{}) {
mainView := gui.getMainView()
mainView := gui.Views.Main
mainView.Autoscroll = true
mainView.Wrap = gui.Config.UserConfig.Gui.WrapMainPanel
@ -146,7 +146,7 @@ func (gui *Gui) renderAllLogs(_project *commands.Project) error {
func (gui *Gui) renderDockerComposeConfig(_project *commands.Project) error {
return gui.T.NewTask(func(stop chan struct{}) {
mainView := gui.getMainView()
mainView := gui.Views.Main
mainView.Autoscroll = false
mainView.Wrap = gui.Config.UserConfig.Gui.WrapMainPanel

2
pkg/gui/services_panel.go
Unescape Escape View File

@ -118,7 +118,7 @@ func (gui *Gui) renderServiceStats(service *commands.Service) error {
}
func (gui *Gui) renderServiceTop(service *commands.Service) error {
mainView := gui.getMainView()
mainView := gui.Views.Main
mainView.Autoscroll = false
mainView.Wrap = gui.Config.UserConfig.Gui.WrapMainPanel

10
pkg/gui/view_helpers.go
Unescape Escape View File

@ -63,7 +63,7 @@ func (gui *Gui) previousView(g *gocui.Gui, v *gocui.View) error {
func (gui *Gui) resetMainView() {
gui.State.Panels.Main.ObjectKey = ""
gui.getMainView().Wrap = gui.Config.UserConfig.Gui.WrapMainPanel
gui.Views.Main.Wrap = gui.Config.UserConfig.Gui.WrapMainPanel
}
// if the cursor down past the last item, move it to the last line
@ -185,12 +185,8 @@ func (gui *Gui) renderOptionsMap(optionsMap map[string]string) error {
return gui.renderString(gui.g, "options", gui.optionsMapToString(optionsMap))
}
func (gui *Gui) getMainView() *gocui.View {
return gui.Views.Main
}
func (gui *Gui) GetMainView() *gocui.View {
return gui.getMainView()
return gui.Views.Main
}
func (gui *Gui) trimmedContent(v *gocui.View) string {
@ -268,7 +264,7 @@ func (gui *Gui) PopupPanelFocused() bool {
}
func (gui *Gui) clearMainView() {
mainView := gui.getMainView()
mainView := gui.Views.Main
mainView.Clear()
_ = mainView.SetOrigin(0, 0)
_ = mainView.SetCursor(0, 0)

Write Preview
Loading…
Cancel
Save