Skip to content

feat(theme): make default icons overrideable #1589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat(theme): make default icons overrideable #1589

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion src/theme/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,17 @@ impl FileStyle for FileTypes {
}
}

#[derive(Debug)]
struct FileDefaults;

#[rustfmt::skip]
impl FileDefaults {
const DIRECTORY: &'static str = ".default_directory";
const DIRECTORY_EMPTY: &'static str = ".default_directory_empty";
const FILE: &'static str = ".default_file";
const FILE_UNKNOWN: &'static str = ".default_file_unknown";
}

#[cfg(unix)]
impl render::BlocksColours for Theme {
fn blocksize(&self, prefix: Option<number_prefix::Prefix>) -> Style {
Expand Down Expand Up @@ -478,7 +489,7 @@ impl FileNameColours for Theme {
.unwrap_or(self.ui.filekinds.unwrap_or_default().normal())
}

fn style_override(&self, file: &File<'_>) -> Option<FileNameStyle> {
fn style_override(&self, file: &File<'_>) -> Option<FileNameStyle> {
if let Some(ref name_overrides) = self.ui.filenames {
if let Some(file_override) = name_overrides.get(&file.name) {
return Some(*file_override);
Expand All @@ -491,6 +502,22 @@ impl FileNameColours for Theme {
return Some(*file_override);
}
}

if file.points_to_directory() {
if file.is_empty_dir() {
if let Some(file_override) = ext_overrides.get(FileDefaults::DIRECTORY_EMPTY) {
return Some(*file_override);
}
} else if let Some(file_override) = ext_overrides.get(FileDefaults::DIRECTORY) {
return Some(*file_override);
}
} else if file.ext.is_some() {
if let Some(file_override) = ext_overrides.get(FileDefaults::FILE) {
return Some(*file_override);
}
} else if let Some(file_override) = ext_overrides.get(FileDefaults::FILE_UNKNOWN) {
return Some(*file_override);
}
}

None
Expand Down
Loading