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

Add settings

Browse source
This commit is contained in:
Mikayla Maki 2023-07-13 17:02:19 -07:00
parent d26f76ba90
commit d023189bda
No known key found for this signature in database
5 changed files with 36 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1168,7 +1168,10 @@ impl ProjectPanel {
}
let end_ix = range.end.min(ix + visible_worktree_entries.len());
let git_status_setting = settings::get::<ProjectPanelSettings>(cx).git_status;
let (git_status_setting, show_file_icons) = {
let settings = settings::get::<ProjectPanelSettings>(cx);
(settings.git_status, settings.file_icons)
};
if let Some(worktree) = self.project.read(cx).worktree_for_id(*worktree_id, cx) {
let snapshot = worktree.read(cx).snapshot();
let root_name = OsStr::new(snapshot.root_name());
@ -1182,14 +1185,16 @@ impl ProjectPanel {
for entry in visible_worktree_entries[entry_range].iter() {
let status = git_status_setting.then(|| entry.git_status).flatten();
let icon = match entry.kind {
EntryKind::File(_) => self
.project
.read(cx)
.icon_for_path(&entry.path)
.or_else(|| Some(TEXT_FILE_ASSET.into())),
_ => None,
};
let icon = show_file_icons
.then(|| match entry.kind {
EntryKind::File(_) => self
.project
.read(cx)
.icon_for_path(&entry.path)
.or_else(|| Some(TEXT_FILE_ASSET.into())),
_ => None,
})
.flatten();
let mut details = EntryDetails {
filename: entry
@ -1283,14 +1288,20 @@ impl ProjectPanel {
Svg::new(icon.to_string())
.with_color(style.icon_color)
.constrained()
.with_max_width(style.file_icon_size)
.with_max_height(style.file_icon_size)
.aligned()
.constrained()
.with_width(style.file_icon_size)
} else {
Empty::new().constrained()
Empty::new()
.constrained()
.with_max_width(style.directory_icon_size)
.with_max_height(style.directory_icon_size)
.aligned()
.constrained()
.with_width(style.directory_icon_size)
}
.with_max_width(style.file_icon_size)
.with_max_height(style.file_icon_size)
.aligned()
.constrained()
.with_width(style.file_icon_size)
})
.with_child(if show_editor && editor.is_some() {
ChildView::new(editor.as_ref().unwrap(), cx)

2
crates/project_panel/src/project_panel_settings.rs
View file

@ -13,6 +13,7 @@ pub enum ProjectPanelDockPosition {
#[derive(Deserialize, Debug)]
pub struct ProjectPanelSettings {
pub git_status: bool,
pub file_icons: bool,
pub dock: ProjectPanelDockPosition,
pub default_width: f32,
}
@ -20,6 +21,7 @@ pub struct ProjectPanelSettings {
#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug)]
pub struct ProjectPanelSettingsContent {
pub git_status: Option<bool>,
pub file_icons: Option<bool>,
pub dock: Option<ProjectPanelDockPosition>,
pub default_width: Option<f32>,
}