Merge workspace and collab panel demos

Nate Butler created 2 years ago

Change summary

crates/storybook/src/collab_panel.rs |  2 
crates/storybook/src/workspace.rs    | 62 ++++++++++++++++-------------
2 files changed, 36 insertions(+), 28 deletions(-)

Detailed changes

crates/storybook/src/collab_panel.rs

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

crates/storybook/src/workspace.rs

@@ -1,4 +1,4 @@
-use crate::theme::theme;
+use crate::{collab_panel::collab_panel, theme::theme};
 use gpui2::{
     elements::{div, svg},
     geometry::pixels,
@@ -247,31 +247,38 @@ impl StatusBar {
             )
             // === Diagnostics === //
             .child(
-                div().flex().items_center().gap_2()
-                .child(
-                    div()
-                        .h_full()
-                        .flex()
-                        .items_center()
-                        .justify_center()
-                        .gap_0p5()
-                        .px_1()
-                        .text_color(theme.lowest.variant.default.foreground)
-                        .hover()
-                        .fill(theme.lowest.base.hovered.background)
-                        .active()
-                        .fill(theme.lowest.base.pressed.background)
-                        .child(
-                            svg()
-                                .path("icons/error.svg")
-                                .w_4()
-                                .h_4()
-                                .fill(theme.lowest.negative.default.foreground),
-                        )
-                        .child(div().text_sm().child("2")),
-                )
-                .child(div().text_sm().text_color(theme.lowest.variant.default.foreground).child("Something is wrong")),
-
+                div()
+                    .flex()
+                    .items_center()
+                    .gap_2()
+                    .child(
+                        div()
+                            .h_full()
+                            .flex()
+                            .items_center()
+                            .justify_center()
+                            .gap_0p5()
+                            .px_1()
+                            .text_color(theme.lowest.variant.default.foreground)
+                            .hover()
+                            .fill(theme.lowest.base.hovered.background)
+                            .active()
+                            .fill(theme.lowest.base.pressed.background)
+                            .child(
+                                svg()
+                                    .path("icons/error.svg")
+                                    .w_4()
+                                    .h_4()
+                                    .fill(theme.lowest.negative.default.foreground),
+                            )
+                            .child(div().text_sm().child("2")),
+                    )
+                    .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())
     }
 }