Checkpoint

2023-10-19 23:21:26 +02:00
parent dd7e1c505c
commit 3a70f02cbf
4 changed files with 290 additions and 279 deletions
@@ -1,6 +1,6 @@
 pub use gpui3::{
-    div, Click, Element, Hover, IntoAnyElement, ParentElement, ScrollState, SharedString,
-    StatefullyInteractivee, Styled, ViewContext, WindowContext,
+    div, Element, Hover, IntoAnyElement, ParentElement, ScrollState, SharedString,
+    StatefullyInteractive, Styled, ViewContext, WindowContext,
 };

 use crate::settings::user_settings;
@@ -1,180 +1,179 @@
-use std::ops::Deref;
-use std::sync::Arc;
+// use std::ops::Deref;
+// use std::sync::Arc;

-use gpui3::{
-    rems, AbsoluteLength, AnyElement, BorrowAppContext, Bounds, Interactive, LayoutId, Pixels,
-    WindowContext,
-};
+// use gpui3::{
+//     rems, AbsoluteLength, AnyElement, BorrowAppContext, Bounds, LayoutId, Pixels, WindowContext,
+// };

-use crate::prelude::*;
+// use crate::prelude::*;

-/// Returns the user settings.
-pub fn user_settings(cx: &WindowContext) -> FakeSettings {
-    cx.global::<FakeSettings>().clone()
-}
+// /// Returns the user settings.
+// pub fn user_settings(cx: &WindowContext) -> FakeSettings {
+//     cx.global::<FakeSettings>().clone()
+// }

-pub fn user_settings_mut<'cx>(cx: &'cx mut WindowContext) -> &'cx mut FakeSettings {
-    cx.global_mut::<FakeSettings>()
-}
+// pub fn user_settings_mut<'cx>(cx: &'cx mut WindowContext) -> &'cx mut FakeSettings {
+//     cx.global_mut::<FakeSettings>()
+// }

-#[derive(Clone)]
-pub enum SettingValue<T> {
-    UserDefined(T),
-    Default(T),
-}
+// #[derive(Clone)]
+// pub enum SettingValue<T> {
+//     UserDefined(T),
+//     Default(T),
+// }

-impl<T> Deref for SettingValue<T> {
-    type Target = T;
+// impl<T> Deref for SettingValue<T> {
+//     type Target = T;

-    fn deref(&self) -> &Self::Target {
-        match self {
-            Self::UserDefined(value) => value,
-            Self::Default(value) => value,
-        }
-    }
-}
+//     fn deref(&self) -> &Self::Target {
+//         match self {
+//             Self::UserDefined(value) => value,
+//             Self::Default(value) => value,
+//         }
+//     }
+// }

-#[derive(Clone)]
-pub struct TitlebarSettings {
-    pub show_project_owner: SettingValue<bool>,
-    pub show_git_status: SettingValue<bool>,
-    pub show_git_controls: SettingValue<bool>,
-}
+// #[derive(Clone)]
+// pub struct TitlebarSettings {
+//     pub show_project_owner: SettingValue<bool>,
+//     pub show_git_status: SettingValue<bool>,
+//     pub show_git_controls: SettingValue<bool>,
+// }

-impl Default for TitlebarSettings {
-    fn default() -> Self {
-        Self {
-            show_project_owner: SettingValue::Default(true),
-            show_git_status: SettingValue::Default(true),
-            show_git_controls: SettingValue::Default(true),
-        }
-    }
-}
+// impl Default for TitlebarSettings {
+//     fn default() -> Self {
+//         Self {
+//             show_project_owner: SettingValue::Default(true),
+//             show_git_status: SettingValue::Default(true),
+//             show_git_controls: SettingValue::Default(true),
+//         }
+//     }
+// }

-// These should be merged into settings
-#[derive(Clone)]
-pub struct FakeSettings {
-    pub default_panel_size: SettingValue<AbsoluteLength>,
-    pub list_disclosure_style: SettingValue<DisclosureControlStyle>,
-    pub list_indent_depth: SettingValue<AbsoluteLength>,
-    pub titlebar: TitlebarSettings,
-    pub ui_scale: SettingValue<f32>,
-}
+// // These should be merged into settings
+// #[derive(Clone)]
+// pub struct FakeSettings {
+//     pub default_panel_size: SettingValue<AbsoluteLength>,
+//     pub list_disclosure_style: SettingValue<DisclosureControlStyle>,
+//     pub list_indent_depth: SettingValue<AbsoluteLength>,
+//     pub titlebar: TitlebarSettings,
+//     pub ui_scale: SettingValue<f32>,
+// }

-impl Default for FakeSettings {
-    fn default() -> Self {
-        Self {
-            titlebar: TitlebarSettings::default(),
-            list_disclosure_style: SettingValue::Default(DisclosureControlStyle::ChevronOnHover),
-            list_indent_depth: SettingValue::Default(rems(0.3).into()),
-            default_panel_size: SettingValue::Default(rems(16.).into()),
-            ui_scale: SettingValue::Default(1.),
-        }
-    }
-}
+// impl Default for FakeSettings {
+//     fn default() -> Self {
+//         Self {
+//             titlebar: TitlebarSettings::default(),
+//             list_disclosure_style: SettingValue::Default(DisclosureControlStyle::ChevronOnHover),
+//             list_indent_depth: SettingValue::Default(rems(0.3).into()),
+//             default_panel_size: SettingValue::Default(rems(16.).into()),
+//             ui_scale: SettingValue::Default(1.),
+//         }
+//     }
+// }

-impl FakeSettings {}
+// impl FakeSettings {}

-pub fn with_settings<E, F>(
-    settings: FakeSettings,
-    cx: &mut ViewContext<E::ViewState>,
-    build_child: F,
-) -> WithSettings<E>
-where
-    E: Element,
-    F: FnOnce(&mut ViewContext<E::ViewState>) -> E,
-{
-    let child = cx.with_global(settings.clone(), |cx| build_child(cx));
-    WithSettings { settings, child }
-}
+// pub fn with_settings<E, F>(
+//     settings: FakeSettings,
+//     cx: &mut ViewContext<E::ViewState>,
+//     build_child: F,
+// ) -> WithSettings<E>
+// where
+//     E: Element,
+//     F: FnOnce(&mut ViewContext<E::ViewState>) -> E,
+// {
+//     let child = cx.with_global(settings.clone(), |cx| build_child(cx));
+//     WithSettings { settings, child }
+// }

-pub struct WithSettings<E> {
-    pub(crate) settings: FakeSettings,
-    pub(crate) child: E,
-}
+// pub struct WithSettings<E> {
+//     pub(crate) settings: FakeSettings,
+//     pub(crate) child: E,
+// }

-impl<E> IntoAnyElement<E::ViewState> for WithSettings<E>
-where
-    E: Element,
-{
-    fn into_any(self) -> AnyElement<E::ViewState> {
-        AnyElement::new(self)
-    }
-}
+// impl<E> IntoAnyElement<E::ViewState> for WithSettings<E>
+// where
+//     E: Element,
+// {
+//     fn into_any(self) -> AnyElement<E::ViewState> {
+//         AnyElement::new(self)
+//     }
+// }

-impl<E: Element> Element for WithSettings<E> {
-    type ViewState = E::ViewState;
-    type ElementState = E::ElementState;
+// impl<E: Element> Element for WithSettings<E> {
+//     type ViewState = E::ViewState;
+//     type ElementState = E::ElementState;

-    fn id(&self) -> Option<gpui3::ElementId> {
-        None
-    }
+//     fn id(&self) -> Option<gpui3::ElementId> {
+//         None
+//     }

-    fn initialize(
-        &mut self,
-        view_state: &mut Self::ViewState,
-        element_state: Option<Self::ElementState>,
-        cx: &mut ViewContext<Self::ViewState>,
-    ) -> Self::ElementState {
-        cx.with_global(self.settings.clone(), |cx| {
-            self.child.initialize(view_state, element_state, cx)
-        })
-    }
+//     fn initialize(
+//         &mut self,
+//         view_state: &mut Self::ViewState,
+//         element_state: Option<Self::ElementState>,
+//         cx: &mut ViewContext<Self::ViewState>,
+//     ) -> Self::ElementState {
+//         cx.with_global(self.settings.clone(), |cx| {
+//             self.child.initialize(view_state, element_state, cx)
+//         })
+//     }

-    fn layout(
-        &mut self,
-        view_state: &mut E::ViewState,
-        element_state: &mut Self::ElementState,
-        cx: &mut ViewContext<E::ViewState>,
-    ) -> LayoutId
-    where
-        Self: Sized,
-    {
-        cx.with_global(self.settings.clone(), |cx| {
-            self.child.layout(view_state, element_state, cx)
-        })
-    }
+//     fn layout(
+//         &mut self,
+//         view_state: &mut E::ViewState,
+//         element_state: &mut Self::ElementState,
+//         cx: &mut ViewContext<E::ViewState>,
+//     ) -> LayoutId
+//     where
+//         Self: Sized,
+//     {
+//         cx.with_global(self.settings.clone(), |cx| {
+//             self.child.layout(view_state, element_state, cx)
+//         })
+//     }

-    fn paint(
-        &mut self,
-        bounds: Bounds<Pixels>,
-        view_state: &mut Self::ViewState,
-        frame_state: &mut Self::ElementState,
-        cx: &mut ViewContext<Self::ViewState>,
-    ) where
-        Self: Sized,
-    {
-        cx.with_global(self.settings.clone(), |cx| {
-            self.child.paint(bounds, view_state, frame_state, cx);
-        });
-    }
-}
+//     fn paint(
+//         &mut self,
+//         bounds: Bounds<Pixels>,
+//         view_state: &mut Self::ViewState,
+//         frame_state: &mut Self::ElementState,
+//         cx: &mut ViewContext<Self::ViewState>,
+//     ) where
+//         Self: Sized,
+//     {
+//         cx.with_global(self.settings.clone(), |cx| {
+//             self.child.paint(bounds, view_state, frame_state, cx);
+//         });
+//     }
+// }

-impl<E: Element + Interactive> Interactive for WithSettings<E> {
-    fn listeners(&mut self) -> &mut gpui3::EventListeners<Self::ViewState> {
-        self.child.listeners()
-    }
+// impl<E: Element + Interactive> Interactive for WithSettings<E> {
+//     fn listeners(&mut self) -> &mut gpui3::EventListeners<Self::ViewState> {
+//         self.child.listeners()
+//     }

-    fn on_mouse_down(
-        mut self,
-        button: gpui3::MouseButton,
-        handler: impl Fn(&mut Self::ViewState, &gpui3::MouseDownEvent, &mut ViewContext<Self::ViewState>)
-            + Send
-            + Sync
-            + 'static,
-    ) -> Self
-    where
-        Self: Sized,
-    {
-        println!("WithSettings on_mouse_down");
+//     fn on_mouse_down(
+//         mut self,
+//         button: gpui3::MouseButton,
+//         handler: impl Fn(&mut Self::ViewState, &gpui3::MouseDownEvent, &mut ViewContext<Self::ViewState>)
+//             + Send
+//             + Sync
+//             + 'static,
+//     ) -> Self
+//     where
+//         Self: Sized,
+//     {
+//         println!("WithSettings on_mouse_down");

-        let settings = self.settings.clone();
+//         let settings = self.settings.clone();

-        self.listeners()
-            .mouse_down
-            .push(Arc::new(move |view, event, bounds, phase, cx| {
-                cx.with_global(settings.clone(), |cx| handler(view, event, cx))
-            }));
-        self
-    }
-}
+//         self.listeners()
+//             .mouse_down
+//             .push(Arc::new(move |view, event, bounds, phase, cx| {
+//                 cx.with_global(settings.clone(), |cx| handler(view, event, cx))
+//             }));
+//         self
+//     }
+// }