fixup! Add WithWaitingStatusSync

pkg/gui/controllers/helpers/app_status_helper.go

@@ -82,13 +82,16 @@ func (self *AppStatusHelper) renderAppStatus() {
 func (self *AppStatusHelper) renderAppStatusSync(stop chan struct{}) {
 	ticker := time.NewTicker(time.Millisecond * 50)
 	go func() {
+		self.c.SetFreezeInformationView(true)
+		defer func() { self.c.SetFreezeInformationView(false) }()
+
 	outer:
 		for {
 			select {
 			case <-ticker.C:
 				appStatus := self.statusMgr().GetStatusString()
 				self.c.SetViewContent(self.c.Views().AppStatus, " "+appStatus)
-				_ = self.c.GocuiGui().ForceRedrawView(self.c.Views().AppStatus)
+				_ = self.c.GocuiGui().ForceRedrawViews(self.c.Views().AppStatus, self.c.Views().Options)
 			case <-stop:
 				break outer
 			}

pkg/gui/gui.go

@@ -129,6 +129,10 @@ type Gui struct {
 	c       *helpers.HelperCommon
 	helpers *helpers.Helpers
 
+	// freeze what's displayed in the Information view to this string. Empty
+	// when not frozen
+	frozenInformationStr string
+
 	integrationTest integrationTypes.IntegrationTest
 
 	afterLayoutFuncs chan func() error

pkg/gui/gui_common.go

@@ -157,6 +157,14 @@ func (self *guiCommon) MainViewPairs() types.MainViewPairs {
 	}
 }
 
+func (self *guiCommon) SetFreezeInformationView(freeze bool) {
+	if freeze {
+		self.gui.frozenInformationStr = self.gui.informationStr()
+	} else {
+		self.gui.frozenInformationStr = ""
+	}
+}
+
 func (self *guiCommon) State() types.IStateAccessor {
 	return self.gui.stateAccessor
 }

pkg/gui/information_panel.go

@@ -10,6 +10,10 @@ import (
 )
 
 func (gui *Gui) informationStr() string {
+	if gui.frozenInformationStr != "" {
+		return gui.frozenInformationStr
+	}
+
 	if activeMode, ok := gui.helpers.Mode.GetActiveMode(); ok {
 		return activeMode.Description()
 	}

pkg/gui/types/common.go

@@ -49,6 +49,11 @@ type IGuiCommon interface {
 	// used purely for the sake of RenderToMainViews to provide the pair of main views we want to render to
 	MainViewPairs() MainViewPairs
 
+	// set the information view (right side of the status bar) to frozen so that
+	// it doesn't change when modes change. Useful during blocking operations
+	// that want to redraw the status view (WithWaitingStatusSync) to avoid flicker.
+	SetFreezeInformationView(freeze bool)
+
 	// returns true if command completed successfully
 	RunSubprocess(cmdObj oscommands.ICmdObj) (bool, error)
 	RunSubprocessAndRefresh(oscommands.ICmdObj) error