Properly color file labels in project panel

2023-12-23 01:27:41 +02:00
parent b501f4eafc
commit 9600337d81
2 changed files with 7 additions and 8 deletions
@@ -13,6 +13,7 @@ pub enum Color {
    Hidden,
    Info,
    Modified,
+    Conflict,
    Muted,
    Placeholder,
    Player(u32),
@@ -28,6 +29,7 @@ impl Color {
            Color::Muted => cx.theme().colors().text_muted,
            Color::Created => cx.theme().status().created,
            Color::Modified => cx.theme().status().modified,
+            Color::Conflict => cx.theme().status().conflict,
            Color::Deleted => cx.theme().status().deleted,
            Color::Disabled => cx.theme().colors().text_disabled,
            Color::Hidden => cx.theme().status().hidden,