remove custom style trait

lapce · Aug 7, 2024 · d661a82 · d661a82
1 parent 4a1195e
commit d661a82
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 30 deletions.
diff --git a/src/style.rs b/src/style.rs
@@ -1812,8 +1812,8 @@ impl Style {
         }
     }
 
-    pub fn apply_custom<CS: CustomStyle>(self, custom_style: CS) -> Self {
-        self.apply(custom_style.get_style())
+    pub fn apply_custom<CS: Into<Style>>(self, custom_style: CS) -> Self {
+        self.apply(custom_style.into())
     }
 }
 
@@ -1882,12 +1882,9 @@ impl Style {
     }
 }
 
-pub trait CustomStyle {
-    fn new_custom_style() -> Self;
-    fn get_style(&self) -> Style;
-}
-
-pub trait CustomStylable<S: CustomStyle + 'static>: IntoView<V = Self::DV> + Sized {
+pub trait CustomStylable<S: Default + Into<Style> + 'static>:
+    IntoView<V = Self::DV> + Sized
+{
     type DV: View;
 
     /// #  Add a custom style to the view with acess to this view's specialized custom style.
@@ -1901,10 +1898,10 @@ pub trait CustomStylable<S: CustomStyle + 'static>: IntoView<V = Self::DV> + Siz
         let view_state = id.state();
         let offset = view_state.borrow_mut().style.next_offset();
         let style = create_updater(
-            move || style(S::new_custom_style()),
-            move |style| id.update_style(offset, style.get_style()),
+            move || style(S::default()),
+            move |style| id.update_style(offset, style.into()),
         );
-        view_state.borrow_mut().style.push(style.get_style());
+        view_state.borrow_mut().style.push(style.into());
         view
     }
 }

diff --git a/src/views/dropdown.rs b/src/views/dropdown.rs
@@ -9,7 +9,7 @@ use crate::{
     event::{Event, EventListener, EventPropagation},
     id::ViewId,
     prop, prop_extractor,
-    style::{CustomStylable, CustomStyle, Style, StyleClass, Width},
+    style::{CustomStylable, Style, StyleClass, Width},
     style_class,
     unit::PxPctAuto,
     view::{default_compute_layout, IntoView, View},
@@ -310,13 +310,9 @@ impl<T> DropDown<T> {
 
 #[derive(Debug, Clone, Default)]
 pub struct DropDownCustomStyle(Style);
-impl CustomStyle for DropDownCustomStyle {
-    fn new_custom_style() -> Self {
-        Self(Style::new())
-    }
-
-    fn get_style(&self) -> Style {
-        self.0.clone()
+impl From<DropDownCustomStyle> for Style {
+    fn from(val: DropDownCustomStyle) -> Self {
+        val.0
     }
 }
 impl<T> CustomStylable<DropDownCustomStyle> for DropDown<T> {

diff --git a/src/views/slider.rs b/src/views/slider.rs
@@ -10,10 +10,7 @@ use crate::{
     event::EventPropagation,
     id::ViewId,
     prop, prop_extractor,
-    style::{
-        Background, BorderRadius, CustomStylable, CustomStyle, Foreground, Height, Style,
-        StyleValue,
-    },
+    style::{Background, BorderRadius, CustomStylable, Foreground, Height, Style, StyleValue},
     style_class,
     unit::{PxPct, PxPctAuto},
     view::View,
@@ -356,14 +353,11 @@ impl Slider {
     }
 }
 
+#[derive(Debug, Default, Clone)]
 pub struct SliderCustomStyle(Style);
-impl CustomStyle for SliderCustomStyle {
-    fn new_custom_style() -> Self {
-        Self(Style::new())
-    }
-
-    fn get_style(&self) -> Style {
-        self.0.clone()
+impl From<SliderCustomStyle> for Style {
+    fn from(val: SliderCustomStyle) -> Self {
+        val.0
     }
 }