Fixed bug with cut entry active states

Mikayla Maki created 3 years ago

Change summary

crates/project_panel/src/project_panel.rs | 6 ++----
crates/theme/src/theme.rs                 | 1 -
styles/src/styleTree/projectPanel.ts      | 8 ++++----
3 files changed, 6 insertions(+), 9 deletions(-)

Detailed changes

crates/project_panel/src/project_panel.rs

@@ -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
             };

crates/theme/src/theme.rs

@@ -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,
 }

styles/src/styleTree/projectPanel.ts

@@ -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"),