From 32fc8ea3e286716ee5a8ff9d025211099a84feed Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sat, 29 Jun 2019 15:47:15 +1000 Subject: [PATCH] defaulting to not wrap now that we can navigate horizontally in the main view --- pkg/gui/containers_panel.go | 4 ++-- pkg/gui/layout.go | 2 +- pkg/gui/status_panel.go | 6 +++--- pkg/gui/view_helpers.go | 2 +- pkg/gui/volumes_panel.go | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/gui/containers_panel.go b/pkg/gui/containers_panel.go index 671c2fdd..3f101979 100644 --- a/pkg/gui/containers_panel.go +++ b/pkg/gui/containers_panel.go @@ -92,7 +92,7 @@ func (gui *Gui) handleContainerSelect(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) renderContainerConfig(container *commands.Container) error { mainView := gui.getMainView() mainView.Autoscroll = false - mainView.Wrap = true + mainView.Wrap = false padding := 10 output := "" @@ -174,7 +174,7 @@ func (gui *Gui) renderContainerTop(container *commands.Container) error { func (gui *Gui) renderContainerLogs(container *commands.Container) error { mainView := gui.getMainView() mainView.Autoscroll = true - mainView.Wrap = true + mainView.Wrap = false return gui.T.NewTickerTask(time.Millisecond*200, nil, func(stop, notifyStopped chan struct{}) { gui.clearMainView() diff --git a/pkg/gui/layout.go b/pkg/gui/layout.go index 2d21dae5..98476108 100644 --- a/pkg/gui/layout.go +++ b/pkg/gui/layout.go @@ -169,7 +169,7 @@ func (gui *Gui) layout(g *gocui.Gui) error { if err.Error() != "unknown view" { return err } - v.Wrap = true + v.Wrap = false v.FgColor = gocui.ColorWhite // when you run a docker container with the -it flags (interactive mode) it adds carriage returns for some reason. This is not docker's fault, it's an os-level default. diff --git a/pkg/gui/status_panel.go b/pkg/gui/status_panel.go index e4d215a5..9017af80 100644 --- a/pkg/gui/status_panel.go +++ b/pkg/gui/status_panel.go @@ -91,7 +91,7 @@ func (gui *Gui) renderCredits() error { return gui.T.NewTask(func(stop chan struct{}) { mainView := gui.getMainView() mainView.Autoscroll = false - mainView.Wrap = true + mainView.Wrap = false var configBuf bytes.Buffer yaml.NewEncoder(&configBuf, yaml.IncludeOmitted).Encode(gui.Config.UserConfig) @@ -116,7 +116,7 @@ func (gui *Gui) renderAllLogs() error { return gui.T.NewTask(func(stop chan struct{}) { mainView := gui.getMainView() mainView.Autoscroll = true - mainView.Wrap = true + mainView.Wrap = false gui.clearMainView() @@ -148,7 +148,7 @@ func (gui *Gui) renderDockerComposeConfig() error { return gui.T.NewTask(func(stop chan struct{}) { mainView := gui.getMainView() mainView.Autoscroll = false - mainView.Wrap = true + mainView.Wrap = false config := gui.DockerCommand.DockerComposeConfig() gui.renderString(gui.g, "main", config) diff --git a/pkg/gui/view_helpers.go b/pkg/gui/view_helpers.go index 9e9ccb66..08a72f6d 100644 --- a/pkg/gui/view_helpers.go +++ b/pkg/gui/view_helpers.go @@ -74,7 +74,7 @@ func (gui *Gui) previousView(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) resetMainView() { gui.State.Panels.Main.ObjectKey = "" - gui.getMainView().Wrap = true + gui.getMainView().Wrap = false } func (gui *Gui) newLineFocused(v *gocui.View) error { diff --git a/pkg/gui/volumes_panel.go b/pkg/gui/volumes_panel.go index d3bef6a7..dceab127 100644 --- a/pkg/gui/volumes_panel.go +++ b/pkg/gui/volumes_panel.go @@ -74,7 +74,7 @@ func (gui *Gui) handleVolumeSelect(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) renderVolumeConfig(mainView *gocui.View, volume *commands.Volume) error { return gui.T.NewTask(func(stop chan struct{}) { mainView.Autoscroll = false - mainView.Wrap = true + mainView.Wrap = false padding := 15 output := ""