diff --git a/crates/ui2/src/components/assistant_panel.rs b/crates/ui2/src/components/assistant_panel.rs index 5f38fefb34aa7d2befc21439a39dcf82654e3e57..d5d22d819c863cbd9721c07e290d6536024a0499 100644 --- a/crates/ui2/src/components/assistant_panel.rs +++ b/crates/ui2/src/components/assistant_panel.rs @@ -45,7 +45,7 @@ impl AssistantPanel { .child( div() .flex() - .child(IconButton::new(Icon::Menu, "menu")) + .child(IconButton::new("menu", Icon::Menu)) .child(Label::new("New Conversation")), ) .child( @@ -53,11 +53,11 @@ impl AssistantPanel { .flex() .items_center() .gap_px() - .child(IconButton::new(Icon::SplitMessage, "split_message")) - .child(IconButton::new(Icon::Quote, "quote")) - .child(IconButton::new(Icon::MagicWand, "magic_wand")) - .child(IconButton::new(Icon::Plus, "plus")) - .child(IconButton::new(Icon::Maximize, "maximize")), + .child(IconButton::new("split_message", Icon::SplitMessage)) + .child(IconButton::new("quote", Icon::Quote)) + .child(IconButton::new("magic_wand", Icon::MagicWand)) + .child(IconButton::new("plus", Icon::Plus)) + .child(IconButton::new("maximize", Icon::Maximize)), ), ) // Chat Body diff --git a/crates/ui2/src/components/buffer_search.rs b/crates/ui2/src/components/buffer_search.rs index 8e1b9b3e979bf31da09fcb60b7549158d62b5b43..bdb31b0369586173c7d5c8812804b568c529f469 100644 --- a/crates/ui2/src/components/buffer_search.rs +++ b/crates/ui2/src/components/buffer_search.rs @@ -32,7 +32,7 @@ impl BufferSearch { h_stack().bg(color.toolbar).p_2().child( h_stack().child(Input::new("Search")).child( - IconButton::::new(Icon::Replace, "replace") + IconButton::::new("replace", Icon::Replace) .when(self.is_replace_open, |this| this.color(IconColor::Accent)) .on_click(|buffer_search, cx| { buffer_search.toggle_replace(cx); diff --git a/crates/ui2/src/components/chat_panel.rs b/crates/ui2/src/components/chat_panel.rs index fda07f4718a8e19582c6945d818a3ff13d25656c..7afccd6d9d5ae23a9c88e09dc3d703380c3d2748 100644 --- a/crates/ui2/src/components/chat_panel.rs +++ b/crates/ui2/src/components/chat_panel.rs @@ -45,8 +45,8 @@ impl ChatPanel { .flex() .items_center() .gap_px() - .child(IconButton::new(Icon::File, "file")) - .child(IconButton::new(Icon::AudioOn, "audio_on")), + .child(IconButton::new("file", Icon::File)) + .child(IconButton::new("audio_on", Icon::AudioOn)), ), ) .child( diff --git a/crates/ui2/src/components/editor_pane.rs b/crates/ui2/src/components/editor_pane.rs index a1da0da258de7908723ea63f391102f7d41878ff..ebdcd4a8738dcf24312ccc1ffc0b45883f7e0a8d 100644 --- a/crates/ui2/src/components/editor_pane.rs +++ b/crates/ui2/src/components/editor_pane.rs @@ -61,15 +61,15 @@ impl EditorPane { Toolbar::new() .left_item(Breadcrumb::new(self.path.clone(), self.symbols.clone())) .right_items(vec![ - IconButton::new(Icon::InlayHint, "toggle_inlay_hints"), - IconButton::::new(Icon::MagnifyingGlass, "buffer_search") + IconButton::new("toggle_inlay_hints", Icon::InlayHint), + IconButton::::new("buffer_search", Icon::MagnifyingGlass) .when(self.is_buffer_search_open, |this| { this.color(IconColor::Accent) }) .on_click(|editor, 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)) diff --git a/crates/ui2/src/components/icon_button.rs b/crates/ui2/src/components/icon_button.rs index a5edfc9c73ffaf4160548035f375c282f070ec02..bd5ad77437c06502ab0ec6d035d219191ab749dd 100644 --- a/crates/ui2/src/components/icon_button.rs +++ b/crates/ui2/src/components/icon_button.rs @@ -28,7 +28,7 @@ pub struct IconButton { } impl IconButton { - pub fn new(icon: Icon, id: impl Into) -> Self { + pub fn new(id: impl Into, icon: Icon) -> Self { Self { state_type: PhantomData, id: id.into(), diff --git a/crates/ui2/src/components/multi_buffer.rs b/crates/ui2/src/components/multi_buffer.rs index 0b47f2c3d88009330610c5212506ebf21be76829..bf8b6777cf753787a02faeb896d237bf8b2cd26a 100644 --- a/crates/ui2/src/components/multi_buffer.rs +++ b/crates/ui2/src/components/multi_buffer.rs @@ -34,7 +34,7 @@ impl MultiBuffer { .p_4() .bg(color.editor_subheader) .child(Label::new("main.rs")) - .child(IconButton::new(Icon::ArrowUpRight, "arrow_up_right")), + .child(IconButton::new("arrow_up_right", Icon::ArrowUpRight)), ) .child(buffer) })) diff --git a/crates/ui2/src/components/status_bar.rs b/crates/ui2/src/components/status_bar.rs index cfcfdf070012b9312bbdc0cbfd020386ac9e3abb..8ebb8901f34c87b316b1c2ea8639d05d7ee7a7d3 100644 --- a/crates/ui2/src/components/status_bar.rs +++ b/crates/ui2/src/components/status_bar.rs @@ -113,7 +113,7 @@ impl StatusBar { .items_center() .gap_1() .child( - IconButton::::new(Icon::FileTree, "project_panel") + IconButton::::new("project_panel", Icon::FileTree) .when(workspace.is_project_panel_open(), |this| { this.color(IconColor::Accent) }) @@ -122,7 +122,7 @@ impl StatusBar { }), ) .child( - IconButton::::new(Icon::Hash, "collab_panel") + IconButton::::new("collab_panel", Icon::Hash) .when(workspace.is_collab_panel_open(), |this| { this.color(IconColor::Accent) }) @@ -131,7 +131,7 @@ impl StatusBar { }), ) .child(ToolDivider::new()) - .child(IconButton::new(Icon::XCircle, "diagnostics")) + .child(IconButton::new("diagnostics", Icon::XCircle)) } fn right_tools( @@ -164,11 +164,11 @@ impl StatusBar { .items_center() .gap_1() .child( - IconButton::new(Icon::Copilot, "copilot") + IconButton::new("copilot", Icon::Copilot) .on_click(|_, _| println!("Copilot clicked.")), ) .child( - IconButton::new(Icon::Envelope, "envelope") + IconButton::new("envelope", Icon::Envelope) .on_click(|_, _| println!("Send Feedback clicked.")), ), ) @@ -179,7 +179,7 @@ impl StatusBar { .items_center() .gap_1() .child( - IconButton::::new(Icon::Terminal, "terminal") + IconButton::::new("terminal", Icon::Terminal) .when(workspace.is_terminal_open(), |this| { this.color(IconColor::Accent) }) @@ -188,7 +188,7 @@ impl StatusBar { }), ) .child( - IconButton::::new(Icon::MessageBubbles, "chat_panel") + IconButton::::new("chat_panel", Icon::MessageBubbles) .when(workspace.is_chat_panel_open(), |this| { this.color(IconColor::Accent) }) @@ -197,7 +197,7 @@ impl StatusBar { }), ) .child( - IconButton::::new(Icon::Ai, "assistant_panel") + IconButton::::new("assistant_panel", Icon::Ai) .when(workspace.is_assistant_panel_open(), |this| { this.color(IconColor::Accent) }) diff --git a/crates/ui2/src/components/tab_bar.rs b/crates/ui2/src/components/tab_bar.rs index 445f2d6deb74eb04376288dbf42e3bffb767be15..c7fe1578f2724323dc6c156432c9b61437edd17d 100644 --- a/crates/ui2/src/components/tab_bar.rs +++ b/crates/ui2/src/components/tab_bar.rs @@ -51,11 +51,11 @@ impl TabBar { .items_center() .gap_px() .child( - IconButton::new(Icon::ArrowLeft, "arrow_left") + IconButton::new("arrow_left", Icon::ArrowLeft) .state(InteractionState::Enabled.if_enabled(can_navigate_back)), ) .child( - IconButton::new(Icon::ArrowRight, "arrow_right").state( + IconButton::new("arrow_right", Icon::ArrowRight).state( InteractionState::Enabled.if_enabled(can_navigate_forward), ), ), @@ -83,8 +83,8 @@ impl TabBar { .flex() .items_center() .gap_px() - .child(IconButton::new(Icon::Plus, "plus")) - .child(IconButton::new(Icon::Split, "split")), + .child(IconButton::new("plus", Icon::Plus)) + .child(IconButton::new("split", Icon::Split)), ), ) } diff --git a/crates/ui2/src/components/terminal.rs b/crates/ui2/src/components/terminal.rs index aaf4382f516827dccce4dcc7ab54aabfbe4fad0a..443973a0dce82912b3508dbd112a96a50a726922 100644 --- a/crates/ui2/src/components/terminal.rs +++ b/crates/ui2/src/components/terminal.rs @@ -40,11 +40,11 @@ impl Terminal { .items_center() .gap_px() .child( - IconButton::new(Icon::ArrowLeft, "arrow_left").state( + IconButton::new("arrow_left", Icon::ArrowLeft).state( 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), )), ), diff --git a/crates/ui2/src/components/title_bar.rs b/crates/ui2/src/components/title_bar.rs index c33d37238a3aca7c4339715e03f4b4a2fd8900b3..f6d4fca97c204254e2eec731dc59130fc7f55a27 100644 --- a/crates/ui2/src/components/title_bar.rs +++ b/crates/ui2/src/components/title_bar.rs @@ -129,7 +129,7 @@ impl TitleBar { .child(Button::new("nate/gpui2-ui-components")), ) .children(player_list.map(|p| PlayerStack::new(p))) - .child(IconButton::new(Icon::Plus, "plus")), + .child(IconButton::new("plus", Icon::Plus)), ) .child( div() @@ -141,8 +141,8 @@ impl TitleBar { .flex() .items_center() .gap_1() - .child(IconButton::new(Icon::FolderX, "folder_x")) - .child(IconButton::new(Icon::Exit, "exit")), + .child(IconButton::new("folder_x", Icon::FolderX)) + .child(IconButton::new("exit", Icon::Exit)), ) .child(ToolDivider::new()) .child( @@ -152,17 +152,17 @@ impl TitleBar { .items_center() .gap_1() .child( - IconButton::::new(Icon::Mic, "toggle_mic_status") + IconButton::::new("toggle_mic_status", Icon::Mic) .when(self.is_mic_muted(), |this| this.color(IconColor::Error)) .on_click(|title_bar, cx| title_bar.toggle_mic_status(cx)), ) .child( - IconButton::::new(Icon::AudioOn, "toggle_deafened") + IconButton::::new("toggle_deafened", Icon::AudioOn) .when(self.is_deafened, |this| this.color(IconColor::Error)) .on_click(|title_bar, cx| title_bar.toggle_deafened(cx)), ) .child( - IconButton::::new(Icon::Screen, "toggle_screen_share") + IconButton::::new("toggle_screen_share", Icon::Screen) .when( self.screen_share_status == ScreenShareStatus::Shared, |this| this.color(IconColor::Accent), diff --git a/crates/ui2/src/components/toolbar.rs b/crates/ui2/src/components/toolbar.rs index 081c3664be2e0a0cf619e4ce81276f2d308bffe8..0d44235fafebfffeaa31f895f7634afffcec9f02 100644 --- a/crates/ui2/src/components/toolbar.rs +++ b/crates/ui2/src/components/toolbar.rs @@ -130,9 +130,9 @@ mod stories { ], )) .right_items(vec![ - IconButton::new(Icon::InlayHint, "toggle_inlay_hints"), - IconButton::new(Icon::MagnifyingGlass, "buffer_search"), - IconButton::new(Icon::MagicWand, "inline_assist"), + IconButton::new("toggle_inlay_hints", Icon::InlayHint), + IconButton::new("buffer_search", Icon::MagnifyingGlass), + IconButton::new("inline_assist", Icon::MagicWand), ]), ) }