From a35d350cbd85fadc25a91d9db392b17b4cbc8f39 Mon Sep 17 00:00:00 2001 From: Nate Butler Date: Wed, 18 Oct 2023 16:21:04 -0400 Subject: [PATCH] Update storybook2 to run the workspace by default Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com> --- crates/storybook2/src/storybook2.rs | 58 ++++++++++++----------------- 1 file changed, 23 insertions(+), 35 deletions(-) diff --git a/crates/storybook2/src/storybook2.rs b/crates/storybook2/src/storybook2.rs index 758fcd9a96789d01cec9cf35f3db4d451d6618fa..1141f11eed8382aa1238ef93ceee928a09d46537 100644 --- a/crates/storybook2/src/storybook2.rs +++ b/crates/storybook2/src/storybook2.rs @@ -17,6 +17,7 @@ use gpui3::{ }; use log::LevelFilter; use simplelog::SimpleLogger; +use story_selector::ComponentStory; use ui::prelude::*; use ui::themed; @@ -56,41 +57,28 @@ fn main() { let asset_source = Arc::new(Assets); gpui3::App::production(asset_source).run(move |cx| { - match story_selector { - Some(selector) => { - let window = cx.open_window( - WindowOptions { - bounds: WindowBounds::Fixed(Bounds { - origin: Default::default(), - size: size(px(1700.), px(980.)).into(), - }), - ..Default::default() - }, - move |cx| { - view( - cx.entity(|cx| { - cx.with_global(theme.clone(), |cx| { - StoryWrapper::new(selector.story(cx), theme) - }) - }), - StoryWrapper::render, - ) - }, - ); - } - None => { - let window = cx.open_window( - WindowOptions { - bounds: WindowBounds::Fixed(Bounds { - origin: Default::default(), - size: size(px(800.), px(600.)).into(), - }), - ..Default::default() - }, - |cx| workspace(cx), - ); - } - }; + let selector = + story_selector.unwrap_or(StorySelector::Component(ComponentStory::Workspace)); + + let window = cx.open_window( + WindowOptions { + bounds: WindowBounds::Fixed(Bounds { + origin: Default::default(), + size: size(px(1700.), px(980.)).into(), + }), + ..Default::default() + }, + move |cx| { + view( + cx.entity(|cx| { + cx.with_global(theme.clone(), |cx| { + StoryWrapper::new(selector.story(cx), theme) + }) + }), + StoryWrapper::render, + ) + }, + ); cx.activate(true); });