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

Merge branch 'main' into zed2-breadcrumbs

Browse source
This commit is contained in:
Julia 2023-11-30 11:38:29 -05:00
commit 428c517693
197 changed files with 11947 additions and 8365 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/workspace2/src/toolbar.rs
View file

@ -3,8 +3,8 @@ use gpui::{
div, AnyView, Div, Entity, EntityId, EventEmitter, ParentElement as _, Render, Styled, View,
ViewContext, WindowContext,
};
use theme2::ActiveTheme;
use ui::{h_stack, v_stack, Button, Color, Icon, IconButton, Label};
use ui::prelude::*;
use ui::{h_stack, v_stack, ButtonLike, Color, Icon, IconButton, Label};
pub enum ToolbarItemEvent {
ChangeLocation(ToolbarItemLocation),
@ -90,13 +90,14 @@ impl Render for Toolbar {
.justify_between()
.child(
// Toolbar left side
h_stack()
.border()
.border_color(gpui::red())
.p_1()
.child(Button::new("crates"))
.child(Label::new("/").color(Color::Muted))
.child(Button::new("workspace2")),
h_stack().border().border_color(gpui::red()).p_1().child(
ButtonLike::new("breadcrumb")
.child(Label::new("crates/workspace2/src/toolbar.rs"))
.child(Label::new("›").color(Color::Muted))
.child(Label::new("impl Render for Toolbar"))
.child(Label::new("›").color(Color::Muted))
.child(Label::new("fn render")),
),
)
// Toolbar right side
.child(