diff --git a/docs/Config.md b/docs/Config.md index 8fd1fd960..a11aa4818 100644 --- a/docs/Config.md +++ b/docs/Config.md @@ -279,7 +279,7 @@ gui: switchToFilesAfterStashApply: true # If true, when using the panel jump keys (default 1 through 5) and target panel is already active, go to next tab instead - switchTabsWithPanelJumpKeys: false + switchTabsWithPanelJumpKeys: true # Config relating to git git: diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go index d35e35772..8239c0ce2 100644 --- a/pkg/config/user_config.go +++ b/pkg/config/user_config.go @@ -798,7 +798,7 @@ func GetDefaultConfig() *UserConfig { StatusPanelView: "dashboard", SwitchToFilesAfterStashPop: true, SwitchToFilesAfterStashApply: true, - SwitchTabsWithPanelJumpKeys: false, + SwitchTabsWithPanelJumpKeys: true, }, Git: GitConfig{ Paging: PagingConfig{ diff --git a/pkg/integration/tests/ui/disable_switch_tab_with_panel_jump_keys.go b/pkg/integration/tests/ui/disable_switch_tab_with_panel_jump_keys.go index fb1ba5aba..a8f870897 100644 --- a/pkg/integration/tests/ui/disable_switch_tab_with_panel_jump_keys.go +++ b/pkg/integration/tests/ui/disable_switch_tab_with_panel_jump_keys.go @@ -6,10 +6,11 @@ import ( ) var DisableSwitchTabWithPanelJumpKeys = NewIntegrationTest(NewIntegrationTestArgs{ - Description: "Verify that the tab does not change by default when jumping to an already focused panel", + Description: "Verify that the tab does not change when jumping to an already focused panel with the config SwitchTabsWithPanelJumpKeys to false", ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { + config.GetUserConfig().Gui.SwitchTabsWithPanelJumpKeys = false }, SetupRepo: func(shell *Shell) { }, diff --git a/pkg/integration/tests/ui/switch_tab_with_panel_jump_keys.go b/pkg/integration/tests/ui/switch_tab_with_panel_jump_keys.go index 4411cb3c6..9def8fb65 100644 --- a/pkg/integration/tests/ui/switch_tab_with_panel_jump_keys.go +++ b/pkg/integration/tests/ui/switch_tab_with_panel_jump_keys.go @@ -10,7 +10,6 @@ var SwitchTabWithPanelJumpKeys = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.SwitchTabsWithPanelJumpKeys = true }, SetupRepo: func(shell *Shell) { }, diff --git a/schema/config.json b/schema/config.json index 96a968e4d..7e8c4e6b4 100644 --- a/schema/config.json +++ b/schema/config.json @@ -728,7 +728,7 @@ "switchTabsWithPanelJumpKeys": { "type": "boolean", "description": "If true, when using the panel jump keys (default 1 through 5) and target panel is already active, go to next tab instead", - "default": false + "default": true } }, "additionalProperties": false,