Fixed bug with cut entry active states
This commit is contained in:
parent
dbc804669c
commit
ea9b009a22
3 changed files with 6 additions and 9 deletions
|
@ -1016,12 +1016,10 @@ impl ProjectPanel {
|
||||||
MouseEventHandler::<Self>::new(entry_id.to_usize(), cx, |state, cx| {
|
MouseEventHandler::<Self>::new(entry_id.to_usize(), cx, |state, cx| {
|
||||||
let padding = theme.container.padding.left + details.depth as f32 * theme.indent_width;
|
let padding = theme.container.padding.left + details.depth as f32 * theme.indent_width;
|
||||||
|
|
||||||
let entry_style = if details.is_ignored && details.is_cut {
|
let entry_style = if details.is_cut {
|
||||||
&theme.ignored_and_cut_entry
|
&theme.cut_entry
|
||||||
} else if details.is_ignored {
|
} else if details.is_ignored {
|
||||||
&theme.ignored_entry
|
&theme.ignored_entry
|
||||||
} else if details.is_cut {
|
|
||||||
&theme.cut_entry
|
|
||||||
} else {
|
} else {
|
||||||
&theme.entry
|
&theme.entry
|
||||||
};
|
};
|
||||||
|
|
|
@ -328,7 +328,6 @@ pub struct ProjectPanel {
|
||||||
pub entry: Interactive<ProjectPanelEntry>,
|
pub entry: Interactive<ProjectPanelEntry>,
|
||||||
pub ignored_entry: Interactive<ProjectPanelEntry>,
|
pub ignored_entry: Interactive<ProjectPanelEntry>,
|
||||||
pub cut_entry: Interactive<ProjectPanelEntry>,
|
pub cut_entry: Interactive<ProjectPanelEntry>,
|
||||||
pub ignored_and_cut_entry: Interactive<ProjectPanelEntry>,
|
|
||||||
pub filename_editor: FieldEditor,
|
pub filename_editor: FieldEditor,
|
||||||
pub indent_width: f32,
|
pub indent_width: f32,
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,10 +35,10 @@ export default function projectPanel(colorScheme: ColorScheme) {
|
||||||
cutEntry: {
|
cutEntry: {
|
||||||
...entry,
|
...entry,
|
||||||
text: text(layer, "mono", "disabled"),
|
text: text(layer, "mono", "disabled"),
|
||||||
},
|
active: {
|
||||||
ignoredAndCutEntry: {
|
background: background(layer, "active"),
|
||||||
...entry,
|
text: text(layer, "mono", "disabled", { size: "sm" }),
|
||||||
text: text(layer, "mono", "disabled"),
|
},
|
||||||
},
|
},
|
||||||
filenameEditor: {
|
filenameEditor: {
|
||||||
background: background(layer, "on"),
|
background: background(layer, "on"),
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue