zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-27 23:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug with cut entry active states

Browse Source
This commit is contained in:
Mikayla Maki 2022-10-31 09:55:52 -07:00
parent dbc804669c
commit ea9b009a22
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/project_panel/src/project_panel.rs
View File

@ -1016,12 +1016,10 @@ impl ProjectPanel {
MouseEventHandler::<Self>::new(entry_id.to_usize(), cx, |state, cx| {
let padding = theme.container.padding.left + details.depth as f32 * theme.indent_width;
let entry_style = if details.is_ignored && details.is_cut {
&theme.ignored_and_cut_entry
let entry_style = if details.is_cut {
&theme.cut_entry
} else if details.is_ignored {
&theme.ignored_entry
} else if details.is_cut {
&theme.cut_entry
} else {
&theme.entry
};

1
crates/theme/src/theme.rs
View File

@ -328,7 +328,6 @@ pub struct ProjectPanel {
pub entry: Interactive<ProjectPanelEntry>,
pub ignored_entry: Interactive<ProjectPanelEntry>,
pub cut_entry: Interactive<ProjectPanelEntry>,
pub ignored_and_cut_entry: Interactive<ProjectPanelEntry>,
pub filename_editor: FieldEditor,
pub indent_width: f32,
}

8
styles/src/styleTree/projectPanel.ts
View File

@ -35,10 +35,10 @@ export default function projectPanel(colorScheme: ColorScheme) {
cutEntry: {
...entry,
text: text(layer, "mono", "disabled"),
},
ignoredAndCutEntry: {
...entry,
text: text(layer, "mono", "disabled"),
active: {
background: background(layer, "active"),
text: text(layer, "mono", "disabled", { size: "sm" }),
},
},
filenameEditor: {
background: background(layer, "on"),