Merge branch 'gpui2' into zed2

2023-10-24 14:11:13 +02:00 · 2023-10-24 14:11:13 +02:00 · bb35583998
commit bb35583998
parent 4d5ca37edb 23ad0a2c58
19 changed files with 115 additions and 60 deletions
--- a/crates/ui2/src/components/list.rs
+++ b/crates/ui2/src/components/list.rs
@ -511,9 +511,11 @@ impl<S: 'static + Send + Sync> ListDetailsEntry<S> {
            .w_full()
            .line_height(relative(1.2))
            .child(Label::new(self.label.clone()).color(label_color))
-            .when(self.meta.is_some(), |this| {
-                this.child(Label::new(self.meta.clone().unwrap()).color(LabelColor::Muted))
-            })
+            .children(
+                self.meta
+                    .take()
+                    .map(|meta| Label::new(meta).color(LabelColor::Muted)),
+            )
            .child(
                h_stack()
                    .gap_1()