From cb926cd20a0f6d3a345cdadcc8e947c35d3fc946 Mon Sep 17 00:00:00 2001 From: mjarkk Date: Tue, 2 Jul 2019 09:14:22 +0200 Subject: [PATCH] Fixed an escape bug --- pkg/gui/main_panel.go | 6 +++++- pkg/gui/view_helpers.go | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/gui/main_panel.go b/pkg/gui/main_panel.go index 38127d25..ca3cb1b1 100644 --- a/pkg/gui/main_panel.go +++ b/pkg/gui/main_panel.go @@ -97,7 +97,11 @@ func (gui *Gui) handleMainClick(g *gocui.Gui, v *gocui.View) error { currentView := gui.g.CurrentView() - v.ParentView = currentView + if currentView != nil && currentView.Name() == "main" { + currentView = nil + } else { + v.ParentView = currentView + } return gui.switchFocus(gui.g, currentView, v) } diff --git a/pkg/gui/view_helpers.go b/pkg/gui/view_helpers.go index ba5d0441..dfbe2acf 100644 --- a/pkg/gui/view_helpers.go +++ b/pkg/gui/view_helpers.go @@ -126,7 +126,7 @@ func (gui *Gui) switchFocus(g *gocui.Gui, oldView, newView *gocui.View) error { gui.State.PreviousView = oldView.Name() } - gui.Log.Info("setting highlight to true for view" + newView.Name()) + gui.Log.Info("setting highlight to true for view " + newView.Name()) gui.Log.Info("new focused view is " + newView.Name()) if _, err := g.SetCurrentView(newView.Name()); err != nil { return err