Skip to content

Commit

Permalink
Remove feedback button from status bar (#9100)
Browse files Browse the repository at this point in the history
This PR removes the feedback button from the status bar, as Nathan and I
discussed. We discussed the fact that we likely no longer need to take
up valuable screen real estate for this, with where Zed as at now.

This PR also moves the `Share Feedback...` collab menu item to the
`Help` menu, as that's where VS Code puts their action to send in-app
feedback (which might help with future discoverability) and renames it
to `Give Feedback...`, to make it consistent with the name of the
command palette action.

Release Notes:

- Removed the feedback button from the status bar.
  • Loading branch information
JosephTLyons authored Mar 9, 2024
1 parent ca696fd commit a03feca
Show file tree
Hide file tree
Showing 8 changed files with 2 additions and 58 deletions.
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion crates/collab_ui/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ db.workspace = true
editor.workspace = true
emojis.workspace = true
extensions_ui.workspace = true
feedback.workspace = true
futures.workspace = true
fuzzy.workspace = true
gpui.workspace = true
Expand Down
2 changes: 0 additions & 2 deletions crates/collab_ui/src/collab_titlebar_item.rs
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,6 @@ impl CollabTitlebarItem {
.action("Extensions", extensions_ui::Extensions.boxed_clone())
.action("Themes...", theme_selector::Toggle.boxed_clone())
.separator()
.action("Share Feedback...", feedback::GiveFeedback.boxed_clone())
.action("Sign Out", client::SignOut.boxed_clone())
})
.into()
Expand All @@ -725,7 +724,6 @@ impl CollabTitlebarItem {
.action("Extensions", extensions_ui::Extensions.boxed_clone())
.action("Themes...", theme_selector::Toggle.boxed_clone())
.separator()
.action("Share Feedback...", feedback::GiveFeedback.boxed_clone())
})
.into()
})
Expand Down
49 changes: 0 additions & 49 deletions crates/feedback/src/deploy_feedback_button.rs

This file was deleted.

1 change: 0 additions & 1 deletion crates/feedback/src/feedback.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ use gpui::{actions, AppContext, ClipboardItem, PromptLevel};
use system_specs::SystemSpecs;
use workspace::Workspace;

pub mod deploy_feedback_button;
pub mod feedback_modal;

actions!(feedback, [GiveFeedback, SubmitFeedback]);
Expand Down
2 changes: 1 addition & 1 deletion crates/feedback/src/feedback_modal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ impl Render for FeedbackModal {
.h(rems(32.))
.p_4()
.gap_2()
.child(Headline::new("Share Feedback"))
.child(Headline::new("Give Feedback"))
.child(
Label::new(if self.character_count < *FEEDBACK_CHAR_LIMIT.start() {
format!(
Expand Down
1 change: 1 addition & 0 deletions crates/zed/src/app_menus.rs
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ pub fn app_menus() -> Vec<Menu<'static>> {
MenuItem::action("View Telemetry", crate::OpenTelemetryLog),
MenuItem::action("View Dependency Licenses", crate::OpenLicenses),
MenuItem::action("Show Welcome", workspace::Welcome),
MenuItem::action("Give Feedback...", feedback::GiveFeedback),
MenuItem::separator(),
MenuItem::action(
"Documentation",
Expand Down
3 changes: 0 additions & 3 deletions crates/zed/src/zed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,11 @@ pub fn initialize_workspace(app_state: Arc<AppState>, cx: &mut AppContext) {
let active_buffer_language =
cx.new_view(|_| language_selector::ActiveBufferLanguage::new(workspace));
let vim_mode_indicator = cx.new_view(|cx| vim::ModeIndicator::new(cx));
let feedback_button =
cx.new_view(|_| feedback::deploy_feedback_button::DeployFeedbackButton::new(workspace));
let cursor_position =
cx.new_view(|_| go_to_line::cursor_position::CursorPosition::new(workspace));
workspace.status_bar().update(cx, |status_bar, cx| {
status_bar.add_left_item(diagnostic_summary, cx);
status_bar.add_left_item(activity_indicator, cx);
status_bar.add_right_item(feedback_button, cx);
status_bar.add_right_item(copilot, cx);
status_bar.add_right_item(active_buffer_language, cx);
status_bar.add_right_item(vim_mode_indicator, cx);
Expand Down

0 comments on commit a03feca

Please sign in to comment.