TEMP

Conrad Irwin created 2 months ago

Change summary

crates/settings/src/settings_content/workspace.rs | 10 ++--------
crates/workspace/src/dock.rs                      |  8 +-------
crates/workspace/src/workspace_settings.rs        |  7 +------
3 files changed, 4 insertions(+), 21 deletions(-)

Detailed changes

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,
-}

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<settings::DockPosition> for DockPosition {
     fn from(value: settings::DockPosition) -> Self {
         match value {

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(),