From ea9b009a22ab5544fb5ea0d2e59cc8049f3a14b8 Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla.c.maki@gmail.com>
Date: Mon, 31 Oct 2022 09:55:52 -0700
Subject: [PATCH] Fixed bug with cut entry active states

---
 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(-)

diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index 5f1e07aa21..8f5d9b0e55 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/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
             };
diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs
index c1757cb022..97c0b0a79d 100644
--- a/crates/theme/src/theme.rs
+++ b/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,
 }
diff --git a/styles/src/styleTree/projectPanel.ts b/styles/src/styleTree/projectPanel.ts
index 701c913c9f..729150fbc7 100644
--- a/styles/src/styleTree/projectPanel.ts
+++ b/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"),