zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-07 20:39:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use theme.editor.diff for the colors

Browse Source
This commit is contained in:
Petros Amoiridis 2023-05-10 16:21:24 +03:00 committed by Mikayla Maki
parent f935047ff2
commit 6b4242cded
No known key found for this signature in database
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,6 @@ use futures::stream::StreamExt;
use gpui::{ use gpui::{
actions, actions,
anyhow::{anyhow, Result}, anyhow::{anyhow, Result},
color::Color,
elements::{ elements::{
AnchorCorner, ChildView, ContainerStyle, Empty, Flex, Label, MouseEventHandler, AnchorCorner, ChildView, ContainerStyle, Empty, Flex, Label, MouseEventHandler,
ParentElement, ScrollTarget, Stack, Svg, UniformList, UniformListState, ParentElement, ScrollTarget, Stack, Svg, UniformList, UniformListState,
@ -1079,16 +1078,23 @@ impl ProjectPanel {
let kind = details.kind; let kind = details.kind;
let show_editor = details.is_editing && !details.is_processing; let show_editor = details.is_editing && !details.is_processing;
let git_color = details // Prepare colors for git statuses
let editor_theme = &cx.global::<Settings>().theme.editor;
let color_for_added = Some(editor_theme.diff.inserted);
let color_for_modified = Some(editor_theme.diff.modified);
let color_for_conflict = Some(editor_theme.diff.deleted);
let color_for_untracked = None;
let mut filename_text_style = style.text.clone();
filename_text_style.color = details
.git_status .git_status
.as_ref() .as_ref()
.and_then(|status| match status { .and_then(|status| match status {
GitStatus::Added => Some(Color::green()), GitStatus::Added => color_for_added,
GitStatus::Modified => Some(Color::blue()), GitStatus::Modified => color_for_modified,
GitStatus::Conflict => Some(Color::red()), GitStatus::Conflict => color_for_conflict,
GitStatus::Untracked => None, GitStatus::Untracked => color_for_untracked,
}) })
.unwrap_or(Color::transparent_black()); .unwrap_or(style.text.color);
Flex::row() Flex::row()
.with_child( .with_child(
@ -1117,7 +1123,7 @@ impl ProjectPanel {
.flex(1.0, true) .flex(1.0, true)
.into_any() .into_any()
} else { } else {
Label::new(details.filename.clone(), style.text.clone()) Label::new(details.filename.clone(), filename_text_style)
.contained() .contained()
.with_margin_left(style.icon_spacing) .with_margin_left(style.icon_spacing)
.aligned() .aligned()
@ -1128,7 +1134,6 @@ impl ProjectPanel {
.with_height(style.height) .with_height(style.height)
.contained() .contained()
.with_style(row_container_style) .with_style(row_container_style)
.with_background_color(git_color)
.with_padding_left(padding) .with_padding_left(padding)
.into_any_named("project panel entry visual element") .into_any_named("project panel entry visual element")
} }