Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Mainline GPUI2 UI work (#3062)

Browse source 
This PR mainlines the current state of new GPUI2-based UI from the
`gpui2-ui` branch.

Release Notes:

- N/A

---------

Co-authored-by: Nate Butler <iamnbutler@gmail.com>
Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
Co-authored-by: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
Co-authored-by: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Co-authored-by: Nate <nate@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
This commit is contained in:
Marshall Bowers 2023-09-28 19:36:21 -04:00 • committed by GitHub
parent e7ee8a95f6
commit f26ca0866c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
85 changed files with 4658 additions and 1623 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/storybook/src/stories/components/toolbar.rs
View file

@ -1,5 +1,5 @@
use gpui2::{Element, IntoElement, ParentElement, ViewContext};
use ui::toolbar;
use ui::prelude::*;
use ui::Toolbar;
use crate::story::Story;
@ -8,9 +8,9 @@ pub struct ToolbarStory {}
impl ToolbarStory {
fn render<V: 'static>(&mut self, _: &mut V, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
Story::container()
.child(Story::title_for::<_, ui::Toolbar>())
.child(Story::label("Default"))
.child(toolbar())
Story::container(cx)
.child(Story::title_for::<_, Toolbar>(cx))
.child(Story::label(cx, "Default"))
.child(Toolbar::new())
}
}