mirror of
				https://github.com/jesseduffield/lazygit.git
				synced 2025-10-25 05:37:37 +03:00 
			
		
		
		
	start refactoring gui
This commit is contained in:
		| @@ -1,11 +1,16 @@ | ||||
| package gui | ||||
|  | ||||
| import ( | ||||
| 	"github.com/jesseduffield/lazygit/pkg/gui/popup" | ||||
| 	"github.com/jesseduffield/lazygit/pkg/gui/types" | ||||
| ) | ||||
|  | ||||
| func (gui *Gui) validateNotInFilterMode() (bool, error) { | ||||
| 	if gui.State.Modes.Filtering.Active() { | ||||
| 		err := gui.ask(askOpts{ | ||||
| 			title:         gui.Tr.MustExitFilterModeTitle, | ||||
| 			prompt:        gui.Tr.MustExitFilterModePrompt, | ||||
| 			handleConfirm: gui.exitFilterMode, | ||||
| 		err := gui.PopupHandler.Ask(popup.AskOpts{ | ||||
| 			Title:         gui.Tr.MustExitFilterModeTitle, | ||||
| 			Prompt:        gui.Tr.MustExitFilterModePrompt, | ||||
| 			HandleConfirm: gui.exitFilterMode, | ||||
| 		}) | ||||
|  | ||||
| 		return false, err | ||||
| @@ -23,7 +28,7 @@ func (gui *Gui) clearFiltering() error { | ||||
| 		gui.State.ScreenMode = SCREEN_NORMAL | ||||
| 	} | ||||
|  | ||||
| 	return gui.refreshSidePanels(refreshOptions{scope: []RefreshableView{COMMITS}}) | ||||
| 	return gui.refreshSidePanels(types.RefreshOptions{Scope: []types.RefreshableView{types.COMMITS}}) | ||||
| } | ||||
|  | ||||
| func (gui *Gui) setFiltering(path string) error { | ||||
| @@ -36,7 +41,7 @@ func (gui *Gui) setFiltering(path string) error { | ||||
| 		return err | ||||
| 	} | ||||
|  | ||||
| 	return gui.refreshSidePanels(refreshOptions{scope: []RefreshableView{COMMITS}, then: func() { | ||||
| 	return gui.refreshSidePanels(types.RefreshOptions{Scope: []types.RefreshableView{types.COMMITS}, Then: func() { | ||||
| 		gui.State.Contexts.BranchCommits.GetPanelState().SetSelectedLineIdx(0) | ||||
| 	}}) | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user