Skip to content

Fix behaviors of gui.sidePanelWidth: 1 #4583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+113 −1
Open

Fix behaviors of gui.sidePanelWidth: 1 #4583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ecbd8ad
Set explicit mainSectionWeight when forcing main view to full width
ArkoselabsDoesNotWork-215640955 May 23, 2025
f0b86bc
Add explicit mainSectionWidth if it is 0 when main view focused
ArkoselabsDoesNotWork-215640955 May 23, 2025
afe4808
fixup! Add explicit mainSectionWidth if it is 0 when main view focused
ArkoselabsDoesNotWork-215640955 May 23, 2025
0ac3ac7
Add tests for SidePanelWidth: 1 rendering of side panel and main
ArkoselabsDoesNotWork-215640955 May 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pkg/gui/controllers/helpers/window_arrangement_helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,9 @@ func getMidSectionWeights(args WindowArrangementArgs) (int, int) {
}

if args.CurrentWindow == "main" || args.CurrentWindow == "secondary" {
if args.ScreenMode == types.SCREEN_HALF || args.ScreenMode == types.SCREEN_FULL {
if args.ScreenMode == types.SCREEN_HALF || args.ScreenMode == types.SCREEN_FULL || mainSectionWeight == 0 {
sideSectionWeight = 0
mainSectionWeight = 1
}
} else {
if args.ScreenMode == types.SCREEN_HALF {
Expand Down
81 changes: 81 additions & 0 deletions pkg/gui/controllers/helpers/window_arrangement_helper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,87 @@ func TestGetWindowDimensions(t *testing.T) {
B: information
`,
},
{
name: "1.0 SidePanelWidth",
mutateArgs: func(args *WindowArrangementArgs) {
args.UserConfig.Gui.SidePanelWidth = 1.0
},
expected: `
╭status───────────────────────────────────────────────────────────────────╮
│ │
╰─────────────────────────────────────────────────────────────────────────╯
╭files────────────────────────────────────────────────────────────────────╮
│ │
│ │
│ │
│ │
│ │
│ │
╰─────────────────────────────────────────────────────────────────────────╯
╭branches─────────────────────────────────────────────────────────────────╮
│ │
│ │
│ │
│ │
│ │
│ │
╰─────────────────────────────────────────────────────────────────────────╯
╭commits──────────────────────────────────────────────────────────────────╮
│ │
│ │
│ │
│ │
│ │
╰─────────────────────────────────────────────────────────────────────────╯
╭stash────────────────────────────────────────────────────────────────────╮
│ │
╰─────────────────────────────────────────────────────────────────────────╯
<options──────────────────────────────────────────────────────>A<B────────>
A: statusSpacer1
B: information
`,
},
{
name: "1.0 SidePanelWidth main view focused",
mutateArgs: func(args *WindowArrangementArgs) {
args.UserConfig.Gui.SidePanelWidth = 1.0
args.CurrentWindow = "main"
},
expected: `
╭main─────────────────────────────────────────────────────────────────────╮
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
╰─────────────────────────────────────────────────────────────────────────╯
<options──────────────────────────────────────────────────────>A<B────────>
A: statusSpacer1
B: information
`,
},
{
name: "half screen mode, enlargedSideViewLocation left",
mutateArgs: func(args *WindowArrangementArgs) {
Expand Down
1 change: 1 addition & 0 deletions pkg/integration/tests/test_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,7 @@ var tests = []*components.IntegrationTest{
ui.ModeSpecificKeybindingSuggestions,
ui.OpenLinkFailure,
ui.RangeSelect,
ui.SidePanelWidth1,
ui.SwitchTabFromMenu,
ui.SwitchTabWithPanelJumpKeys,
undo.UndoCheckoutAndDrop,
Expand Down
29 changes: 29 additions & 0 deletions pkg/integration/tests/ui/side_panel_width_1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package ui

import (
"github.com/jesseduffield/lazygit/pkg/config"
. "github.com/jesseduffield/lazygit/pkg/integration/components"
)

var SidePanelWidth1 = NewIntegrationTest(NewIntegrationTestArgs{
Description: "Verify that setting sidePanelWidth to 1.0 doesn't crash when navigating to commit files",
ExtraCmdArgs: []string{},
Skip: false,
SetupConfig: func(config *config.AppConfig) {
config.GetUserConfig().Gui.SidePanelWidth = 1.0
},
SetupRepo: func(shell *Shell) {
shell.CreateFileAndAdd("file1.txt", "content")
shell.Commit("first commit")
},
Run: func(t *TestDriver, keys config.KeybindingConfig) {
t.Views().Commits().Focus().
Press(keys.Universal.NextScreenMode).
Press(keys.Universal.GoInto)

t.Views().CommitFiles().
Press(keys.Universal.GoInto)

t.Views().PatchBuilding().Content(Contains("+content"))
},
})
Loading