Layout string flag (#4956)

* allow sending a stringified layout with --layout-string

* add --tab-id to all the things

* fix windows tests

* add pr
This commit is contained in:
Aram Drevekenin
2026-03-30 16:02:09 +02:00
committed by GitHub
parent 16beceaa0a
commit 8ce05f0bbd
26 changed files with 2108 additions and 248 deletions
+20 -16
View File
@@ -772,22 +772,26 @@ pub fn start_client(
config_dir: cli_args.config_dir.clone(),
should_ignore_config: cli_args.is_setup_clean(),
configuration_options: Some(config_options.clone()),
layout: cli_args
.layout
.as_ref()
.and_then(|l| {
LayoutInfo::from_cli(
&config_options.layout_dir,
&Some(l.clone()),
std::env::current_dir().unwrap_or_else(|_| PathBuf::from(".")),
)
})
.or_else(|| {
LayoutInfo::from_config(
&config_options.layout_dir,
&config_options.default_layout,
)
}),
layout: if let Some(layout_string) = &cli_args.layout_string {
Some(LayoutInfo::Stringified(layout_string.clone()))
} else {
cli_args
.layout
.as_ref()
.and_then(|l| {
LayoutInfo::from_cli(
&config_options.layout_dir,
&Some(l.clone()),
std::env::current_dir().unwrap_or_else(|_| PathBuf::from(".")),
)
})
.or_else(|| {
LayoutInfo::from_config(
&config_options.layout_dir,
&config_options.default_layout,
)
})
},
terminal_window_size: full_screen_ws,
data_dir: cli_args.data_dir.clone(),
is_debug: cli_args.debug,