diff --git a/crates/settings/src/settings_content/theme.rs b/crates/settings/src/settings_content/theme.rs index 85ca09443bfd9fc701fafa81b40585fa8cc6a1fb..e78d60d2a4298cbe5e92d5b9da2f5d4377e7c0a6 100644 --- a/crates/settings/src/settings_content/theme.rs +++ b/crates/settings/src/settings_content/theme.rs @@ -262,18 +262,7 @@ impl From for String { } /// The buffer's line height. -#[derive( - Clone, - Copy, - Debug, - Serialize, - Deserialize, - PartialEq, - JsonSchema, - MergeFrom, - Default, - strum::VariantNames, -)] +#[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq, JsonSchema, MergeFrom, Default)] #[serde(rename_all = "snake_case")] pub enum BufferLineHeight { /// A less dense line height. @@ -285,10 +274,6 @@ pub enum BufferLineHeight { Custom(#[serde(deserialize_with = "deserialize_line_height")] f32), } -impl strum::VariantArray for BufferLineHeight { - const VARIANTS: &'static [Self] = &[Self::Comfortable, Self::Standard]; -} - fn deserialize_line_height<'de, D>(deserializer: D) -> Result where D: serde::Deserializer<'de>, diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rs index 14a5c399249f4be6410340f893e623bda5a2e06b..b31e6f07d65a208c0dd22cec0e8bc777bb87809b 100644 --- a/crates/settings_ui/src/page_data.rs +++ b/crates/settings_ui/src/page_data.rs @@ -250,15 +250,16 @@ pub(crate) fn user_settings_data() -> Vec { }), metadata: None, }), - SettingsPageItem::SettingItem(SettingItem { - title: "Buffer Line Height", - description: "Line height for editor text", - field: Box::new(SettingField { - pick: |settings_content| &settings_content.theme.buffer_line_height, - pick_mut: |settings_content| &mut settings_content.theme.buffer_line_height, - }), - metadata: None, - }), + // todo(settings_ui): This needs custom ui + // SettingsPageItem::SettingItem(SettingItem { + // title: "Buffer Line Height", + // description: "Line height for editor text", + // field: Box::new(SettingField { + // pick: |settings_content| &settings_content.theme.buffer_line_height, + // pick_mut: |settings_content| &mut settings_content.theme.buffer_line_height, + // }), + // metadata: None, + // }), SettingsPageItem::SettingItem(SettingItem { title: "UI Font Family", description: "Font family for UI elements", diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs index 75d8cff1f9afe1cfd0f746f873bd3187a415c867..955a94eb0d215126d47b4623544cee2bfba12d7c 100644 --- a/crates/settings_ui/src/settings_ui.rs +++ b/crates/settings_ui/src/settings_ui.rs @@ -239,11 +239,12 @@ fn init_renderers(cx: &mut App) { // todo(settings_ui): We need to pass in a validator for this to ensure that users that type in invalid font names render_font_picker(settings_field.clone(), file, window, cx) }) - .add_renderer::(|settings_field, file, _, window, cx| { - // todo(settings_ui): Do we want to expose the custom variant of buffer line height? - // right now there's a manual impl of strum::VariantArray - render_dropdown(*settings_field, file, window, cx) - }) + // todo(settings_ui): This needs custom ui + // .add_renderer::(|settings_field, file, _, window, cx| { + // // todo(settings_ui): Do we want to expose the custom variant of buffer line height? + // // right now there's a manual impl of strum::VariantArray + // render_dropdown(*settings_field, file, window, cx) + // }) .add_renderer::(|settings_field, file, _, window, cx| { render_dropdown(*settings_field, file, window, cx) })