1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-04-23 12:18:51 +02:00

feat: let the staging secondary panel change view mode

This commit is contained in:
AzraelSec 2024-06-05 02:52:11 +02:00 committed by Stefan Haller
parent 03a075c223
commit 06496ccd17
3 changed files with 58 additions and 1 deletions

View File

@ -216,6 +216,15 @@ func mainSectionChildren(args WindowArrangementArgs) []*boxlayout.Box {
}
}
if args.CurrentWindow == "secondary" && args.ScreenMode == types.SCREEN_FULL {
return []*boxlayout.Box{
{
Window: "secondary",
Weight: 1,
},
}
}
return []*boxlayout.Box{
{
Window: "main",
@ -239,7 +248,7 @@ func getMidSectionWeights(args WindowArrangementArgs) (int, int) {
mainSectionWeight = 5 // need to shrink side panel to make way for main panels if side-by-side
}
if args.CurrentWindow == "main" {
if args.CurrentWindow == "main" || args.CurrentWindow == "secondary" {
if args.ScreenMode == types.SCREEN_HALF || args.ScreenMode == types.SCREEN_FULL {
sideSectionWeight = 0
}

View File

@ -0,0 +1,47 @@
package staging
import (
"github.com/jesseduffield/lazygit/pkg/config"
. "github.com/jesseduffield/lazygit/pkg/integration/components"
)
var DiffChangeScreenMode = NewIntegrationTest(NewIntegrationTestArgs{
Description: "Change the staged changes screen mode",
ExtraCmdArgs: []string{},
Skip: false,
SetupConfig: func(config *config.AppConfig) {},
SetupRepo: func(shell *Shell) {
shell.CreateFile("file", "first line\nsecond line")
},
Run: func(t *TestDriver, keys config.KeybindingConfig) {
t.Views().Files().
Focus().
PressEnter()
t.Views().Staging().
IsFocused().
PressPrimaryAction().
Title(Equals("Unstaged changes")).
Content(Contains("+second line").DoesNotContain("+first line")).
PressTab()
t.Views().StagingSecondary().
IsFocused().
Title(Equals("Staged changes")).
Content(Contains("+first line").DoesNotContain("+second line")).
Press(keys.Universal.NextScreenMode).
Tap(func() {
t.Views().AppStatus().
IsInvisible()
t.Views().Staging().
IsVisible()
}).
Press(keys.Universal.NextScreenMode).
Tap(func() {
t.Views().AppStatus().
IsInvisible()
t.Views().Staging().
IsInvisible()
})
},
})

View File

@ -245,6 +245,7 @@ var tests = []*components.IntegrationTest{
reflog.DoNotShowBranchMarkersInReflogSubcommits,
reflog.Patch,
reflog.Reset,
staging.DiffChangeScreenMode,
staging.DiffContextChange,
staging.DiscardAllChanges,
staging.Search,