move more actions into controller

pkg/gui/controllers/global_controller.go

@@ -31,9 +31,34 @@ func (self *GlobalController) GetKeybindings(opts types.KeybindingsOpts) []*type
 			Description: self.c.Tr.ViewPatchOptions,
 			OpensMenu:   true,
 		},
+		{
+			Key:         opts.GetKey(opts.Config.Universal.CreateRebaseOptionsMenu),
+			Handler:     self.c.Helpers().MergeAndRebase.CreateRebaseOptionsMenu,
+			Description: self.c.Tr.ViewMergeRebaseOptions,
+			OpensMenu:   true,
+		},
+		{
+			Key:         opts.GetKey(opts.Config.Universal.Refresh),
+			Handler:     self.refresh,
+			Description: self.c.Tr.LcRefresh,
+		},
+		{
+			Key:         opts.GetKey(opts.Config.Universal.NextScreenMode),
+			Handler:     self.nextScreenMode,
+			Description: self.c.Tr.LcNextScreenMode,
+		},
+		{
+			Key:         opts.GetKey(opts.Config.Universal.PrevScreenMode),
+			Handler:     self.prevScreenMode,
+			Description: self.c.Tr.LcPrevScreenMode,
+		},
 	}
 }
 
+func (self *GlobalController) Context() types.Context {
+	return nil
+}
+
 func (self *GlobalController) customCommand() error {
 	return (&CustomCommandAction{c: self.c}).Call()
 }
@@ -42,6 +67,14 @@ func (self *GlobalController) createCustomPatchOptionsMenu() error {
 	return (&CustomPatchOptionsMenuAction{c: self.c}).Call()
 }
 
-func (self *GlobalController) Context() types.Context {
-	return nil
+func (self *GlobalController) refresh() error {
+	return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC})
+}
+
+func (self *GlobalController) nextScreenMode() error {
+	return (&ScreenModeActions{c: self.c}).Next()
+}
+
+func (self *GlobalController) prevScreenMode() error {
+	return (&ScreenModeActions{c: self.c}).Prev()
 }

pkg/gui/controllers/screen_mode_actions.go

@@ -0,0 +1,79 @@
+package controllers
+
+import (
+	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gui/types"
+)
+
+type ScreenModeActions struct {
+	c *ControllerCommon
+}
+
+func (self *ScreenModeActions) Next() error {
+	self.c.State().GetRepoState().SetScreenMode(
+		nextIntInCycle(
+			[]types.WindowMaximisation{types.SCREEN_NORMAL, types.SCREEN_HALF, types.SCREEN_FULL},
+			self.c.State().GetRepoState().GetScreenMode(),
+		),
+	)
+
+	return self.rerenderViewsWithScreenModeDependentContent()
+}
+
+func (self *ScreenModeActions) Prev() error {
+	self.c.State().GetRepoState().SetScreenMode(
+		prevIntInCycle(
+			[]types.WindowMaximisation{types.SCREEN_NORMAL, types.SCREEN_HALF, types.SCREEN_FULL},
+			self.c.State().GetRepoState().GetScreenMode(),
+		),
+	)
+
+	return self.rerenderViewsWithScreenModeDependentContent()
+}
+
+// these views need to be re-rendered when the screen mode changes. The commits view,
+// for example, will show authorship information in half and full screen mode.
+func (self *ScreenModeActions) rerenderViewsWithScreenModeDependentContent() error {
+	// for now we re-render all list views.
+	for _, context := range self.c.Context().AllList() {
+		if err := self.rerenderView(context.GetView()); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (self *ScreenModeActions) rerenderView(view *gocui.View) error {
+	context, ok := self.c.Helpers().View.ContextForView(view.Name())
+	if !ok {
+		self.c.Log.Errorf("no context found for view %s", view.Name())
+		return nil
+	}
+
+	return context.HandleRender()
+}
+
+func nextIntInCycle(sl []types.WindowMaximisation, current types.WindowMaximisation) types.WindowMaximisation {
+	for i, val := range sl {
+		if val == current {
+			if i == len(sl)-1 {
+				return sl[0]
+			}
+			return sl[i+1]
+		}
+	}
+	return sl[0]
+}
+
+func prevIntInCycle(sl []types.WindowMaximisation, current types.WindowMaximisation) types.WindowMaximisation {
+	for i, val := range sl {
+		if val == current {
+			if i > 0 {
+				return sl[i-1]
+			}
+			return sl[len(sl)-1]
+		}
+	}
+	return sl[len(sl)-1]
+}