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/toolbar.rs
+++ b/crates/ui2/src/components/toolbar.rs
@ -130,9 +130,9 @@ mod stories {
                            ],
                        ))
                        .right_items(vec![
-                            IconButton::new(Icon::InlayHint),
-                            IconButton::new(Icon::MagnifyingGlass),
-                            IconButton::new(Icon::MagicWand),
+                            IconButton::new("toggle_inlay_hints", Icon::InlayHint),
+                            IconButton::new("buffer_search", Icon::MagnifyingGlass),
+                            IconButton::new("inline_assist", Icon::MagicWand),
                        ]),
                )
        }