diff --git a/crates/settings/src/settings_content/workspace.rs b/crates/settings/src/settings_content/workspace.rs index 6a981ae0f9c3376536e4f23cd3ddccad5f765688..24a7b9a2be624ff48c200893c878dbff9b66b3c6 100644 --- a/crates/settings/src/settings_content/workspace.rs +++ b/crates/settings/src/settings_content/workspace.rs @@ -4,6 +4,8 @@ use collections::HashMap; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; +use crate::DockPosition; + #[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize, JsonSchema)] pub struct WorkspaceSettingsContent { /// Active pane styling settings. @@ -332,11 +334,3 @@ impl OnLastWindowClosed { } } } - -#[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema, PartialEq)] -#[serde(rename_all = "lowercase")] -pub enum DockPosition { - Left, - Bottom, - Right, -} diff --git a/crates/workspace/src/dock.rs b/crates/workspace/src/dock.rs index e706a949b2ec713e17381ccd51497018fc2642c7..77ea068a147e0d3c69efdeace3fb6541cfab25dd 100644 --- a/crates/workspace/src/dock.rs +++ b/crates/workspace/src/dock.rs @@ -9,6 +9,7 @@ use gpui::{ Render, SharedString, StyleRefinement, Styled, Subscription, WeakEntity, Window, deferred, div, px, }; +pub use settings::DockPosition; use settings::SettingsStore; use std::sync::Arc; use ui::{ContextMenu, Divider, DividerColor, IconButton, Tooltip, h_flex}; @@ -208,13 +209,6 @@ impl Focusable for Dock { } } -#[derive(Clone, Copy, Debug, PartialEq)] -pub enum DockPosition { - Left, - Bottom, - Right, -} - impl From for DockPosition { fn from(value: settings::DockPosition) -> Self { match value { diff --git a/crates/workspace/src/workspace_settings.rs b/crates/workspace/src/workspace_settings.rs index 64e6c94e10a89c5ed03e5faa54488d11fea93ff1..0f56bea96650a645160b46d27a3fb2bed88e7a57 100644 --- a/crates/workspace/src/workspace_settings.rs +++ b/crates/workspace/src/workspace_settings.rs @@ -116,12 +116,7 @@ impl Settings for WorkspaceSettings { max_tabs: workspace.max_tabs.clone(), when_closing_with_no_tabs: workspace.when_closing_with_no_tabs.clone().unwrap(), on_last_window_closed: workspace.on_last_window_closed.clone().unwrap(), - resize_all_panels_in_dock: workspace - .resize_all_panels_in_dock - .iter() - .copied() - .map(Into::into) - .collect(), + resize_all_panels_in_dock: workspace.resize_all_panels_in_dock.iter().collect(), close_on_file_delete: workspace.close_on_file_delete.clone().unwrap(), use_system_window_tabs: workspace.use_system_window_tabs.clone().unwrap(), zoomed_padding: workspace.zoomed_padding.clone().unwrap(),