mirror of
https://github.com/zellij-org/zellij.git
synced 2024-12-25 10:15:09 +03:00
Merge pull request #407 from a-kenji/default-layout
Fix Startup with Default in Same Folder
This commit is contained in:
commit
b5d38e95c8
@ -205,6 +205,18 @@ impl Layout {
|
||||
layout
|
||||
}
|
||||
|
||||
// It wants to use Path here, but that doesn't compile.
|
||||
#[warn(clippy::ptr_arg)]
|
||||
pub fn from_defaults(layout_path: &PathBuf, data_dir: &Path) -> Self {
|
||||
Self::new(
|
||||
&data_dir
|
||||
.join("layouts/")
|
||||
.join(layout_path)
|
||||
.with_extension("yaml"),
|
||||
&data_dir,
|
||||
)
|
||||
}
|
||||
|
||||
pub fn total_terminal_panes(&self) -> usize {
|
||||
let mut total_panes = 0;
|
||||
total_panes += self.parts.len();
|
||||
|
@ -186,8 +186,8 @@ pub fn start(mut os_input: Box<dyn OsApi>, opts: CliArgs) {
|
||||
let default_layout = None;
|
||||
let maybe_layout = opts
|
||||
.layout
|
||||
.or(default_layout)
|
||||
.map(|p| Layout::new(&p, &data_dir));
|
||||
.map(|p| Layout::new(&p, &data_dir))
|
||||
.or_else(|| default_layout.map(|p| Layout::from_defaults(&p, &data_dir)));
|
||||
|
||||
#[cfg(not(test))]
|
||||
std::panic::set_hook({
|
||||
|
Loading…
Reference in New Issue
Block a user