pull box shadow from extractor (#631)

* pull box shadow from extractor this makes it so that the shadow property can be animated * remove extra import
lapce · Oct 20, 2024 · b665323 · b665323
1 parent 11764e3
commit b665323
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 29 deletions.
diff --git a/src/context.rs b/src/context.rs
@@ -1001,7 +1001,7 @@ impl<'a> PaintCx<'a> {
                 self.set_z_index(z_index);
             }
 
-            paint_bg(self, &style, &view_style_props, size);
+            paint_bg(self, &view_style_props, size);
 
             view.borrow_mut().paint(self);
             paint_border(self, &layout_props, &view_style_props, size);
@@ -1042,27 +1042,23 @@ impl<'a> PaintCx<'a> {
 
                     let style = view_state.borrow().combined_style.clone();
                     let mut view_style_props = view_state.borrow().view_style_props.clone();
-                    let style =
-                        if let Some(dragging_style) = view_state.borrow().dragging_style.clone() {
-                            let style = style.apply(dragging_style);
-                            let mut _new_frame = false;
-                            view_style_props.read_explicit(
-                                &style,
-                                &style,
-                                &Instant::now(),
-                                &mut _new_frame,
-                            );
-                            style
-                        } else {
-                            style
-                        };
+                    if let Some(dragging_style) = view_state.borrow().dragging_style.clone() {
+                        let style = style.apply(dragging_style);
+                        let mut _new_frame = false;
+                        view_style_props.read_explicit(
+                            &style,
+                            &style,
+                            &Instant::now(),
+                            &mut _new_frame,
+                        );
+                    }
                     let layout_props = view_state.borrow().layout_props.clone();
 
                     // Important: If any method early exit points are added in this
                     // code block, they MUST call CURRENT_DRAG_PAINTING_ID.take() before
                     // returning.
                     CURRENT_DRAG_PAINTING_ID.set(Some(id));
-                    paint_bg(self, &style, &view_style_props, size);
+                    paint_bg(self, &view_style_props, size);
 
                     view.borrow_mut().paint(self);
                     paint_border(self, &layout_props, &view_style_props, size);

diff --git a/src/view.rs b/src/view.rs
@@ -54,7 +54,7 @@ use crate::{
     context::{ComputeLayoutCx, EventCx, LayoutCx, PaintCx, StyleCx, UpdateCx},
     event::{Event, EventPropagation},
     id::ViewId,
-    style::{BoxShadowProp, LayoutProps, Style, StyleClassRef},
+    style::{LayoutProps, Style, StyleClassRef},
     view_state::ViewStyleProps,
     views::{dyn_view, DynamicView},
 };
@@ -378,12 +378,7 @@ pub fn default_compute_layout(id: ViewId, cx: &mut ComputeLayoutCx) -> Option<Re
     layout_rect
 }
 
-pub(crate) fn paint_bg(
-    cx: &mut PaintCx,
-    computed_style: &Style,
-    style: &ViewStyleProps,
-    size: Size,
-) {
+pub(crate) fn paint_bg(cx: &mut PaintCx, style: &ViewStyleProps, size: Size) {
     let radius = match style.border_radius() {
         crate::unit::PxPct::Px(px) => px,
         crate::unit::PxPct::Pct(pct) => size.min_side() * (pct / 100.),
@@ -401,7 +396,7 @@ pub(crate) fn paint_bg(
             };
             cx.fill(&circle, &bg, 0.0);
         } else {
-            paint_box_shadow(cx, computed_style, rect, Some(radius));
+            paint_box_shadow(cx, style, rect, Some(radius));
             let bg = match style.background() {
                 Some(color) => color,
                 None => return,
@@ -410,7 +405,7 @@ pub(crate) fn paint_bg(
             cx.fill(&rounded_rect, &bg, 0.0);
         }
     } else {
-        paint_box_shadow(cx, computed_style, size.to_rect(), None);
+        paint_box_shadow(cx, style, size.to_rect(), None);
         let bg = match style.background() {
             Some(color) => color,
             None => return,
@@ -419,8 +414,13 @@ pub(crate) fn paint_bg(
     }
 }
 
-fn paint_box_shadow(cx: &mut PaintCx, style: &Style, rect: Rect, rect_radius: Option<f64>) {
-    if let Some(shadow) = style.get(BoxShadowProp).as_ref() {
+fn paint_box_shadow(
+    cx: &mut PaintCx,
+    style: &ViewStyleProps,
+    rect: Rect,
+    rect_radius: Option<f64>,
+) {
+    if let Some(shadow) = &style.shadow() {
         let min = rect.size().min_side();
         let h_offset = match shadow.h_offset {
             crate::unit::PxPct::Px(px) => px,

diff --git a/src/view_state.rs b/src/view_state.rs
@@ -8,8 +8,8 @@ use crate::{
     prop_extractor,
     responsive::ScreenSizeBp,
     style::{
-        Background, BorderColor, BorderRadius, LayoutProps, Outline, OutlineColor, Style,
-        StyleClassRef, StyleSelectors,
+        Background, BorderColor, BorderRadius, BoxShadowProp, LayoutProps, Outline, OutlineColor,
+        Style, StyleClassRef, StyleSelectors,
     },
 };
 use bitflags::bitflags;
@@ -72,6 +72,7 @@ prop_extractor! {
         pub outline_color: OutlineColor,
         pub border_color: BorderColor,
         pub background: Background,
+        pub shadow: BoxShadowProp,
     }
 }