Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix panic when not specifying a project_panel setting

Browse source
This commit is contained in:
Antonio Scandurra 2023-05-10 10:43:42 +02:00
parent 9173916ab8
commit 6e3ce6332a
2 changed files with 26 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/project_panel/src/project_panel.rs
View file

@ -150,7 +150,8 @@ impl ProjectPanel {
old_dock_position = new_dock_position;
cx.emit(Event::DockPositionChanged);
}
}).detach();
})
.detach();
cx.observe(&project, |this, _, cx| {
this.update_visible_entries(None, cx);
@ -253,8 +254,8 @@ impl ProjectPanel {
}
}
}
},
Event::DockPositionChanged => {},
}
Event::DockPositionChanged => {}
}
})
.detach();
@ -1341,7 +1342,11 @@ impl Entity for ProjectPanel {
impl workspace::dock::Panel for ProjectPanel {
fn position(&self, cx: &gpui::WindowContext) -> DockPosition {
cx.global::<Settings>().project_panel_overrides.dock.into()
cx.global::<Settings>()
.project_panel_overrides
.dock
.map(Into::into)
.unwrap_or(DockPosition::Left)
}
fn position_is_valid(&self, position: DockPosition) -> bool {