Merge workspace and collab panel demos

This commit is contained in:
Nate Butler 2023-09-07 12:55:47 -04:00
parent a87711d157
commit 23a8d8fba4
2 changed files with 36 additions and 28 deletions

View file

@ -23,7 +23,7 @@ impl<V: 'static> CollabPanelElement<V> {
// Panel
div()
.full()
.w_96()
.flex()
.flex_col()
.font("Zed Sans Extended")

View file

@ -1,4 +1,4 @@
use crate::theme::theme;
use crate::{collab_panel::collab_panel, theme::theme};
use gpui2::{
elements::{div, svg},
geometry::pixels,
@ -247,7 +247,10 @@ impl StatusBar {
)
// === Diagnostics === //
.child(
div().flex().items_center().gap_2()
div()
.flex()
.items_center()
.gap_2()
.child(
div()
.h_full()
@ -270,8 +273,12 @@ impl StatusBar {
)
.child(div().text_sm().child("2")),
)
.child(div().text_sm().text_color(theme.lowest.variant.default.foreground).child("Something is wrong")),
.child(
div()
.text_sm()
.text_color(theme.lowest.variant.default.foreground)
.child("Something is wrong"),
),
)
}
@ -340,11 +347,12 @@ impl WorkspaceElement {
.w_full()
.flex()
.flex_col()
.gap_y_0()
.font("Zed Sans Extended")
.text_color(theme.lowest.base.default.foreground)
.fill(theme.middle.base.default.background)
.child(titlebar())
.child(div().child("panes"))
.child(collab_panel())
.child(statusbar())
}
}