From c40e45e4d74175d444ff18fe131c7ed359d6f107 Mon Sep 17 00:00:00 2001 From: Nate Butler Date: Mon, 8 Jan 2024 11:34:00 -0500 Subject: [PATCH 1/2] Use default instead of muted color --- crates/diagnostics/src/items.rs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/crates/diagnostics/src/items.rs b/crates/diagnostics/src/items.rs index da1f77b9afb0f1c4308362f42f479dc30890e77b..a250713e65eb4e13c12a8981b731d6b9233b427a 100644 --- a/crates/diagnostics/src/items.rs +++ b/crates/diagnostics/src/items.rs @@ -25,11 +25,7 @@ impl Render for DiagnosticIndicator { let diagnostic_indicator = match (self.summary.error_count, self.summary.warning_count) { (0, 0) => h_stack().map(|this| { if !self.in_progress_checks.is_empty() { - this.child( - IconElement::new(Icon::ArrowCircle) - .size(IconSize::Small) - .color(Color::Muted), - ) + this.child(IconElement::new(Icon::ArrowCircle).size(IconSize::Small)) } else { this.child( IconElement::new(Icon::Check) @@ -74,7 +70,6 @@ impl Render for DiagnosticIndicator { Some( Label::new("Checking…") .size(LabelSize::Small) - .color(Color::Muted) .into_any_element(), ) } else if let Some(diagnostic) = &self.current_diagnostic { From 1ede003de20822d7a1419e125db8e7bc974e8621 Mon Sep 17 00:00:00 2001 From: Nate Butler Date: Mon, 8 Jan 2024 11:55:51 -0500 Subject: [PATCH 2/2] Always show checking with icon if checks are still running --- assets/icons/arrow_circle.svg | 7 ++++++- crates/diagnostics/src/items.rs | 24 +++++++++++++----------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/assets/icons/arrow_circle.svg b/assets/icons/arrow_circle.svg index 750e349e2b8c73ef0c78b9974ea100f70ae37abe..90e352bdea7a208356139bed8af5bb3c1301b5ce 100644 --- a/assets/icons/arrow_circle.svg +++ b/assets/icons/arrow_circle.svg @@ -1 +1,6 @@ - + + + + + + diff --git a/crates/diagnostics/src/items.rs b/crates/diagnostics/src/items.rs index a250713e65eb4e13c12a8981b731d6b9233b427a..0c2d673d8e68b5bd43681788bde078442ed43d9d 100644 --- a/crates/diagnostics/src/items.rs +++ b/crates/diagnostics/src/items.rs @@ -24,15 +24,11 @@ impl Render for DiagnosticIndicator { fn render(&mut self, cx: &mut ViewContext) -> impl IntoElement { let diagnostic_indicator = match (self.summary.error_count, self.summary.warning_count) { (0, 0) => h_stack().map(|this| { - if !self.in_progress_checks.is_empty() { - this.child(IconElement::new(Icon::ArrowCircle).size(IconSize::Small)) - } else { - this.child( - IconElement::new(Icon::Check) - .size(IconSize::Small) - .color(Color::Default), - ) - } + this.child( + IconElement::new(Icon::Check) + .size(IconSize::Small) + .color(Color::Default), + ) }), (0, warning_count) => h_stack() .gap_1() @@ -68,8 +64,14 @@ impl Render for DiagnosticIndicator { let status = if !self.in_progress_checks.is_empty() { Some( - Label::new("Checking…") - .size(LabelSize::Small) + h_stack() + .gap_2() + .child(IconElement::new(Icon::ArrowCircle).size(IconSize::Small)) + .child( + Label::new("Checking…") + .size(LabelSize::Small) + .into_any_element(), + ) .into_any_element(), ) } else if let Some(diagnostic) = &self.current_diagnostic {