diff --git a/crates/feedback/src/feedback_editor.rs b/crates/feedback/src/feedback_editor.rs index ca960a7c10..8185fbad9a 100644 --- a/crates/feedback/src/feedback_editor.rs +++ b/crates/feedback/src/feedback_editor.rs @@ -37,7 +37,7 @@ const FEEDBACK_CHAR_COUNT_RANGE: Range = Range { end: 1000, }; -const FEEDBACK_PLACEHOLDER_TEXT: &str = "Thanks for spending time with Zed. Enter your feedback here in the form of Markdown. Save the tab to submit your feedback."; +const FEEDBACK_PLACEHOLDER_TEXT: &str = "Thanks for spending time with Zed. Enter your feedback here as Markdown. Save the tab to submit your feedback."; const FEEDBACK_SUBMISSION_ERROR_TEXT: &str = "Feedback failed to submit, see error log for details."; @@ -77,71 +77,6 @@ impl View for FeedbackButton { ) .boxed() } - - fn focus_in(&mut self, _: gpui::AnyViewHandle, _: &mut ViewContext) {} - - fn focus_out(&mut self, _: gpui::AnyViewHandle, _: &mut ViewContext) {} - - fn key_down(&mut self, _: &gpui::KeyDownEvent, _: &mut ViewContext) -> bool { - false - } - - fn key_up(&mut self, _: &gpui::KeyUpEvent, _: &mut ViewContext) -> bool { - false - } - - fn modifiers_changed( - &mut self, - _: &gpui::ModifiersChangedEvent, - _: &mut ViewContext, - ) -> bool { - false - } - - fn keymap_context(&self, _: &gpui::AppContext) -> gpui::keymap_matcher::KeymapContext { - Self::default_keymap_context() - } - - fn default_keymap_context() -> gpui::keymap_matcher::KeymapContext { - let mut cx = gpui::keymap_matcher::KeymapContext::default(); - cx.set.insert(Self::ui_name().into()); - cx - } - - fn debug_json(&self, _: &gpui::AppContext) -> gpui::serde_json::Value { - gpui::serde_json::Value::Null - } - - fn text_for_range(&self, _: Range, _: &gpui::AppContext) -> Option { - None - } - - fn selected_text_range(&self, _: &gpui::AppContext) -> Option> { - None - } - - fn marked_text_range(&self, _: &gpui::AppContext) -> Option> { - None - } - - fn unmark_text(&mut self, _: &mut ViewContext) {} - - fn replace_text_in_range( - &mut self, - _: Option>, - _: &str, - _: &mut ViewContext, - ) { - } - - fn replace_and_mark_text_in_range( - &mut self, - _: Option>, - _: &str, - _: Option>, - _: &mut ViewContext, - ) { - } } impl StatusItemView for FeedbackButton { diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs index ed8fb1bb12..e463310b98 100644 --- a/crates/theme/src/theme.rs +++ b/crates/theme/src/theme.rs @@ -25,7 +25,6 @@ pub struct Theme { pub command_palette: CommandPalette, pub picker: Picker, pub editor: Editor, - pub feedback: Feedback, pub search: Search, pub project_diagnostics: ProjectDiagnostics, pub breadcrumbs: ContainedText, @@ -120,20 +119,6 @@ pub struct ContactList { pub calling_indicator: ContainedText, } -#[derive(Deserialize, Default)] -pub struct Feedback { - // pub feedback_popover: FeedbackPopover, - pub feedback_editor: FieldEditor, -} - -// #[derive(Deserialize, Default)] -// pub struct FeedbackPopover { -// #[serde(flatten)] -// pub container: ContainerStyle, -// pub height: f32, -// pub width: f32, -// } - #[derive(Deserialize, Default)] pub struct ProjectRow { #[serde(flatten)] diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs index 863a036e8e..2d0222ef3a 100644 --- a/crates/workspace/src/pane.rs +++ b/crates/workspace/src/pane.rs @@ -95,11 +95,6 @@ pub struct DeployNewMenu { position: Vector2F, } -#[derive(Clone, PartialEq)] -pub struct DeployFeedbackModal { - position: Vector2F, -} - impl_actions!(pane, [GoBack, GoForward, ActivateItem]); impl_internal_actions!( pane, @@ -108,8 +103,7 @@ impl_internal_actions!( DeploySplitMenu, DeployNewMenu, DeployDockMenu, - MoveItem, - DeployFeedbackModal + MoveItem ] ); diff --git a/styles/src/styleTree/app.ts b/styles/src/styleTree/app.ts index a51426b6f6..267d830506 100644 --- a/styles/src/styleTree/app.ts +++ b/styles/src/styleTree/app.ts @@ -19,7 +19,6 @@ import terminal from "./terminal"; import contactList from "./contactList"; import incomingCallNotification from "./incomingCallNotification"; import { ColorScheme } from "../themes/common/colorScheme"; -import feedback from "./feedback"; export default function app(colorScheme: ColorScheme): Object { return { @@ -38,7 +37,6 @@ export default function app(colorScheme: ColorScheme): Object { projectDiagnostics: projectDiagnostics(colorScheme), projectPanel: projectPanel(colorScheme), contactsPopover: contactsPopover(colorScheme), - feedback: feedback(colorScheme), contactFinder: contactFinder(colorScheme), contactList: contactList(colorScheme), search: search(colorScheme), diff --git a/styles/src/styleTree/feedback.ts b/styles/src/styleTree/feedback.ts deleted file mode 100644 index 0521949871..0000000000 --- a/styles/src/styleTree/feedback.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { ColorScheme } from "../themes/common/colorScheme"; -import { background, border, text } from "./components"; - -export default function feedback(colorScheme: ColorScheme) { - let layer = colorScheme.middle; - return { - feedbackEditor: { - background: background(layer, "on"), - cornerRadius: 6, - text: text(layer, "mono", "on"), - placeholderText: text(layer, "mono", "on", "disabled", { size: "xs" }), - selection: colorScheme.players[0], - border: border(layer, "on"), - padding: { - bottom: 4, - left: 8, - right: 8, - top: 4, - }, - margin: { - left: 6, - } - }, - feedbackPopover: { - background: background(layer), - cornerRadius: 6, - padding: { top: 6 }, - margin: { top: -6 }, - shadow: colorScheme.popoverShadow, - border: border(layer), - width: 500, - height: 400 - } - } -}