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

Swap the parameters to IconButton

Browse source
This commit is contained in:
Marshall Bowers 2023-10-24 11:26:19 +02:00
parent 47f979d457
commit 6a532af1fd
11 changed files with 37 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/ui2/src/components/assistant_panel.rs
View file

@ -45,7 +45,7 @@ impl<S: 'static + Send + Sync> AssistantPanel<S> {
.child( .child(
div() div()
.flex() .flex()
.child(IconButton::new(Icon::Menu, "menu")) .child(IconButton::new("menu", Icon::Menu))
.child(Label::new("New Conversation")), .child(Label::new("New Conversation")),
) )
.child( .child(
@ -53,11 +53,11 @@ impl<S: 'static + Send + Sync> AssistantPanel<S> {
.flex() .flex()
.items_center() .items_center()
.gap_px() .gap_px()
.child(IconButton::new(Icon::SplitMessage, "split_message")) .child(IconButton::new("split_message", Icon::SplitMessage))
.child(IconButton::new(Icon::Quote, "quote")) .child(IconButton::new("quote", Icon::Quote))
.child(IconButton::new(Icon::MagicWand, "magic_wand")) .child(IconButton::new("magic_wand", Icon::MagicWand))
.child(IconButton::new(Icon::Plus, "plus")) .child(IconButton::new("plus", Icon::Plus))
.child(IconButton::new(Icon::Maximize, "maximize")), .child(IconButton::new("maximize", Icon::Maximize)),
), ),
) )
// Chat Body // Chat Body

2
crates/ui2/src/components/buffer_search.rs
View file

@ -32,7 +32,7 @@ impl BufferSearch {
h_stack().bg(color.toolbar).p_2().child( h_stack().bg(color.toolbar).p_2().child(
h_stack().child(Input::new("Search")).child( h_stack().child(Input::new("Search")).child(
IconButton::<Self>::new(Icon::Replace, "replace") IconButton::<Self>::new("replace", Icon::Replace)
.when(self.is_replace_open, |this| this.color(IconColor::Accent)) .when(self.is_replace_open, |this| this.color(IconColor::Accent))
.on_click(|buffer_search, cx| { .on_click(|buffer_search, cx| {
buffer_search.toggle_replace(cx); buffer_search.toggle_replace(cx);

4
crates/ui2/src/components/chat_panel.rs
View file

@ -45,8 +45,8 @@ impl<S: 'static + Send + Sync> ChatPanel<S> {
.flex() .flex()
.items_center() .items_center()
.gap_px() .gap_px()
.child(IconButton::new(Icon::File, "file")) .child(IconButton::new("file", Icon::File))
.child(IconButton::new(Icon::AudioOn, "audio_on")), .child(IconButton::new("audio_on", Icon::AudioOn)),
), ),
) )
.child( .child(

6
crates/ui2/src/components/editor_pane.rs
View file

@ -61,15 +61,15 @@ impl EditorPane {
Toolbar::new() Toolbar::new()
.left_item(Breadcrumb::new(self.path.clone(), self.symbols.clone())) .left_item(Breadcrumb::new(self.path.clone(), self.symbols.clone()))
.right_items(vec![ .right_items(vec![
IconButton::new(Icon::InlayHint, "toggle_inlay_hints"), IconButton::new("toggle_inlay_hints", Icon::InlayHint),
IconButton::<Self>::new(Icon::MagnifyingGlass, "buffer_search") IconButton::<Self>::new("buffer_search", Icon::MagnifyingGlass)
.when(self.is_buffer_search_open, |this| { .when(self.is_buffer_search_open, |this| {
this.color(IconColor::Accent) this.color(IconColor::Accent)
}) })
.on_click(|editor, cx| { .on_click(|editor, cx| {
editor.toggle_buffer_search(cx); editor.toggle_buffer_search(cx);
}), }),
IconButton::new(Icon::MagicWand, "inline_assist"), IconButton::new("inline_assist", Icon::MagicWand),
]), ]),
) )
.children(Some(self.buffer_search.clone()).filter(|_| self.is_buffer_search_open)) .children(Some(self.buffer_search.clone()).filter(|_| self.is_buffer_search_open))

2
crates/ui2/src/components/icon_button.rs
View file

@ -28,7 +28,7 @@ pub struct IconButton<S: 'static + Send + Sync> {
} }
impl<S: 'static + Send + Sync> IconButton<S> { impl<S: 'static + Send + Sync> IconButton<S> {
pub fn new(icon: Icon, id: impl Into<ElementId>) -> Self { pub fn new(id: impl Into<ElementId>, icon: Icon) -> Self {
Self { Self {
state_type: PhantomData, state_type: PhantomData,
id: id.into(), id: id.into(),

2
crates/ui2/src/components/multi_buffer.rs
View file

@ -34,7 +34,7 @@ impl<S: 'static + Send + Sync + Clone> MultiBuffer<S> {
.p_4() .p_4()
.bg(color.editor_subheader) .bg(color.editor_subheader)
.child(Label::new("main.rs")) .child(Label::new("main.rs"))
.child(IconButton::new(Icon::ArrowUpRight, "arrow_up_right")), .child(IconButton::new("arrow_up_right", Icon::ArrowUpRight)),
) )
.child(buffer) .child(buffer)
})) }))

16
crates/ui2/src/components/status_bar.rs
View file

@ -113,7 +113,7 @@ impl StatusBar {
.items_center() .items_center()
.gap_1() .gap_1()
.child( .child(
IconButton::<Workspace>::new(Icon::FileTree, "project_panel") IconButton::<Workspace>::new("project_panel", Icon::FileTree)
.when(workspace.is_project_panel_open(), |this| { .when(workspace.is_project_panel_open(), |this| {
this.color(IconColor::Accent) this.color(IconColor::Accent)
}) })
@ -122,7 +122,7 @@ impl StatusBar {
}), }),
) )
.child( .child(
IconButton::<Workspace>::new(Icon::Hash, "collab_panel") IconButton::<Workspace>::new("collab_panel", Icon::Hash)
.when(workspace.is_collab_panel_open(), |this| { .when(workspace.is_collab_panel_open(), |this| {
this.color(IconColor::Accent) this.color(IconColor::Accent)
}) })
@ -131,7 +131,7 @@ impl StatusBar {
}), }),
) )
.child(ToolDivider::new()) .child(ToolDivider::new())
.child(IconButton::new(Icon::XCircle, "diagnostics")) .child(IconButton::new("diagnostics", Icon::XCircle))
} }
fn right_tools( fn right_tools(
@ -164,11 +164,11 @@ impl StatusBar {
.items_center() .items_center()
.gap_1() .gap_1()
.child( .child(
IconButton::new(Icon::Copilot, "copilot") IconButton::new("copilot", Icon::Copilot)
.on_click(|_, _| println!("Copilot clicked.")), .on_click(|_, _| println!("Copilot clicked.")),
) )
.child( .child(
IconButton::new(Icon::Envelope, "envelope") IconButton::new("envelope", Icon::Envelope)
.on_click(|_, _| println!("Send Feedback clicked.")), .on_click(|_, _| println!("Send Feedback clicked.")),
), ),
) )
@ -179,7 +179,7 @@ impl StatusBar {
.items_center() .items_center()
.gap_1() .gap_1()
.child( .child(
IconButton::<Workspace>::new(Icon::Terminal, "terminal") IconButton::<Workspace>::new("terminal", Icon::Terminal)
.when(workspace.is_terminal_open(), |this| { .when(workspace.is_terminal_open(), |this| {
this.color(IconColor::Accent) this.color(IconColor::Accent)
}) })
@ -188,7 +188,7 @@ impl StatusBar {
}), }),
) )
.child( .child(
IconButton::<Workspace>::new(Icon::MessageBubbles, "chat_panel") IconButton::<Workspace>::new("chat_panel", Icon::MessageBubbles)
.when(workspace.is_chat_panel_open(), |this| { .when(workspace.is_chat_panel_open(), |this| {
this.color(IconColor::Accent) this.color(IconColor::Accent)
}) })
@ -197,7 +197,7 @@ impl StatusBar {
}), }),
) )
.child( .child(
IconButton::<Workspace>::new(Icon::Ai, "assistant_panel") IconButton::<Workspace>::new("assistant_panel", Icon::Ai)
.when(workspace.is_assistant_panel_open(), |this| { .when(workspace.is_assistant_panel_open(), |this| {
this.color(IconColor::Accent) this.color(IconColor::Accent)
}) })

8
crates/ui2/src/components/tab_bar.rs
View file

@ -51,11 +51,11 @@ impl<S: 'static + Send + Sync + Clone> TabBar<S> {
.items_center() .items_center()
.gap_px() .gap_px()
.child( .child(
IconButton::new(Icon::ArrowLeft, "arrow_left") IconButton::new("arrow_left", Icon::ArrowLeft)
.state(InteractionState::Enabled.if_enabled(can_navigate_back)), .state(InteractionState::Enabled.if_enabled(can_navigate_back)),
) )
.child( .child(
IconButton::new(Icon::ArrowRight, "arrow_right").state( IconButton::new("arrow_right", Icon::ArrowRight).state(
InteractionState::Enabled.if_enabled(can_navigate_forward), InteractionState::Enabled.if_enabled(can_navigate_forward),
), ),
), ),
@ -83,8 +83,8 @@ impl<S: 'static + Send + Sync + Clone> TabBar<S> {
.flex() .flex()
.items_center() .items_center()
.gap_px() .gap_px()
.child(IconButton::new(Icon::Plus, "plus")) .child(IconButton::new("plus", Icon::Plus))
.child(IconButton::new(Icon::Split, "split")), .child(IconButton::new("split", Icon::Split)),
), ),
) )
} }

4
crates/ui2/src/components/terminal.rs
View file

@ -40,11 +40,11 @@ impl<S: 'static + Send + Sync + Clone> Terminal<S> {
.items_center() .items_center()
.gap_px() .gap_px()
.child( .child(
IconButton::new(Icon::ArrowLeft, "arrow_left").state( IconButton::new("arrow_left", Icon::ArrowLeft).state(
InteractionState::Enabled.if_enabled(can_navigate_back), InteractionState::Enabled.if_enabled(can_navigate_back),
), ),
) )
.child(IconButton::new(Icon::ArrowRight, "arrow_right").state( .child(IconButton::new("arrow_right", Icon::ArrowRight).state(
InteractionState::Enabled.if_enabled(can_navigate_forward), InteractionState::Enabled.if_enabled(can_navigate_forward),
)), )),
), ),

12
crates/ui2/src/components/title_bar.rs
View file

@ -129,7 +129,7 @@ impl TitleBar {
.child(Button::new("nate/gpui2-ui-components")), .child(Button::new("nate/gpui2-ui-components")),
) )
.children(player_list.map(|p| PlayerStack::new(p))) .children(player_list.map(|p| PlayerStack::new(p)))
.child(IconButton::new(Icon::Plus, "plus")), .child(IconButton::new("plus", Icon::Plus)),
) )
.child( .child(
div() div()
@ -141,8 +141,8 @@ impl TitleBar {
.flex() .flex()
.items_center() .items_center()
.gap_1() .gap_1()
.child(IconButton::new(Icon::FolderX, "folder_x")) .child(IconButton::new("folder_x", Icon::FolderX))
.child(IconButton::new(Icon::Exit, "exit")), .child(IconButton::new("exit", Icon::Exit)),
) )
.child(ToolDivider::new()) .child(ToolDivider::new())
.child( .child(
@ -152,17 +152,17 @@ impl TitleBar {
.items_center() .items_center()
.gap_1() .gap_1()
.child( .child(
IconButton::<TitleBar>::new(Icon::Mic, "toggle_mic_status") IconButton::<TitleBar>::new("toggle_mic_status", Icon::Mic)
.when(self.is_mic_muted(), |this| this.color(IconColor::Error)) .when(self.is_mic_muted(), |this| this.color(IconColor::Error))
.on_click(|title_bar, cx| title_bar.toggle_mic_status(cx)), .on_click(|title_bar, cx| title_bar.toggle_mic_status(cx)),
) )
.child( .child(
IconButton::<TitleBar>::new(Icon::AudioOn, "toggle_deafened") IconButton::<TitleBar>::new("toggle_deafened", Icon::AudioOn)
.when(self.is_deafened, |this| this.color(IconColor::Error)) .when(self.is_deafened, |this| this.color(IconColor::Error))
.on_click(|title_bar, cx| title_bar.toggle_deafened(cx)), .on_click(|title_bar, cx| title_bar.toggle_deafened(cx)),
) )
.child( .child(
IconButton::<TitleBar>::new(Icon::Screen, "toggle_screen_share") IconButton::<TitleBar>::new("toggle_screen_share", Icon::Screen)
.when( .when(
self.screen_share_status == ScreenShareStatus::Shared, self.screen_share_status == ScreenShareStatus::Shared,
|this| this.color(IconColor::Accent), |this| this.color(IconColor::Accent),

6
crates/ui2/src/components/toolbar.rs
View file

@ -130,9 +130,9 @@ mod stories {
], ],
)) ))
.right_items(vec![ .right_items(vec![
IconButton::new(Icon::InlayHint, "toggle_inlay_hints"), IconButton::new("toggle_inlay_hints", Icon::InlayHint),
IconButton::new(Icon::MagnifyingGlass, "buffer_search"), IconButton::new("buffer_search", Icon::MagnifyingGlass),
IconButton::new(Icon::MagicWand, "inline_assist"), IconButton::new("inline_assist", Icon::MagicWand),
]), ]),
) )
} }