sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

Show filter state in top right corner of Files panel frame

Browse Source 
This includes the "only conflicting" status that the user can't switch to
themselves. We display it anyway to give a hint that files are being filtered,
and to let them know that they can turn the filter off if they want to.
This commit is contained in:
Stefan Haller
2025-02-01 18:21:11 +01:00
parent 2f4cedd025
commit aad2622278
3 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/gui/controllers/helpers/refresh_helper.go
View File

@ -591,9 +591,11 @@ func (self *RefreshHelper) refreshStateFiles() error {
if conflictFileCount > 0 && prevConflictFileCount == 0 {
if fileTreeViewModel.GetFilter() == filetree.DisplayAll {
fileTreeViewModel.SetStatusFilter(filetree.DisplayConflicted)
self.c.Contexts().Files.GetView().Subtitle = self.c.Tr.FilterLabelConflictingFiles
}
} else if conflictFileCount == 0 && fileTreeViewModel.GetFilter() == filetree.DisplayConflicted {
fileTreeViewModel.SetStatusFilter(filetree.DisplayAll)
self.c.Contexts().Files.GetView().Subtitle = ""
}
self.c.Model().Files = files