Merge branch 'main' into file_finder

This commit is contained in:
Conrad Irwin 2023-11-14 13:34:25 -07:00
commit 80b7f75d24
51 changed files with 1938 additions and 1355 deletions

View file

@ -4,7 +4,7 @@ use gpui::{
Styled, Task, UniformListScrollHandle, View, ViewContext, VisualContext, WindowContext,
};
use std::{cmp, sync::Arc};
use ui::{prelude::*, v_stack, Divider, Label, LabelColor};
use ui::{prelude::*, v_stack, Divider, Label, TextColor};
pub struct Picker<D: PickerDelegate> {
pub delegate: D,
@ -238,7 +238,7 @@ impl<D: PickerDelegate> Render for Picker<D> {
v_stack().p_1().grow().child(
div()
.px_1()
.child(Label::new("No matches").color(LabelColor::Muted)),
.child(Label::new("No matches").color(TextColor::Muted)),
),
)
})