@effindomv2/fui-rs 0.1.22 → 0.1.24

package/src/node/image.rs

@@ -41,18 +41,18 @@ impl Default for ImageState {
 
 #[derive(Clone)]
 pub struct ImageNode {
-    core: Rc<RefCell<NodeCore>>,
+    base: FlexBox,
     props: Rc<RefCell<ImageProps>>,
     state: Rc<RefCell<ImageState>>,
 }
 
 impl ImageNode {
     pub fn new(texture_id: u32) -> Self {
+        let base = FlexBox::default();
+        base.core.borrow_mut().kind = NodeKind::Image;
         let node = Self {
-            core: Rc::new(RefCell::new(NodeCore::new(NodeKind::Image))),
+            base,
             props: Rc::new(RefCell::new(ImageProps {
-                width: None,
-                height: None,
                 texture_id,
                 source_url: None,
                 object_fit: ObjectFit::Fill,
@@ -143,10 +143,6 @@ impl ImageNode {
         self
     }
 
-    pub fn source_url(&self, url: impl Into<String>) -> &Self {
-        self.source(url)
-    }
-
     pub fn clear_source(&self) -> &Self {
         self.release_owned_source_asset();
         {
@@ -169,10 +165,6 @@ impl ImageNode {
         self
     }
 
-    pub fn clear_source_url(&self) -> &Self {
-        self.clear_source()
-    }
-
     pub fn alt_text(&self, value: impl Into<String>) -> &Self {
         let value = value.into();
         self.semantic_role(SemanticRole::Image);
@@ -226,17 +218,6 @@ impl ImageNode {
         self
     }
 
-    pub fn interactive(&self, interactive: bool) -> &Self {
-        self.core.borrow_mut().behavior.interactive = interactive;
-        self
-    }
-
-    pub fn on_click(&self, handler: impl Fn(&mut PointerEventArgs) + 'static) -> &Self {
-        self.core.borrow_mut().handlers.pointer_click = Some(Rc::new(handler));
-        self.retained_node_ref().require_interactive();
-        self
-    }
-
     pub fn asset_state_signal(&self) -> crate::assets::AssetStateSignal {
         get_texture_asset_state(self.props.borrow().texture_id)
     }
@@ -316,8 +297,6 @@ impl ImageNode {
         let asset_width = self.asset_width();
         let asset_height = self.asset_height();
         let has_intrinsic_size = asset_width > 0.0 && asset_height > 0.0;
-        let mut props = self.props.borrow_mut();
-
         if has_requested_width {
             let mut resolved_width_value = requested_width_value;
             let mut resolved_width_unit = requested_width_unit;
@@ -329,14 +308,7 @@ impl ImageNode {
                 }
                 resolved_width_unit = Unit::Pixel;
             }
-            props.width = Some((resolved_width_value, resolved_width_unit));
-            if self.has_built_handle() {
-                ui::set_width(
-                    self.handle().raw(),
-                    resolved_width_value,
-                    resolved_width_unit as u32,
-                );
-            }
+            self.base.width(resolved_width_value, resolved_width_unit);
         }
 
         if has_requested_height {
@@ -350,19 +322,8 @@ impl ImageNode {
                 }
                 resolved_height_unit = Unit::Pixel;
             }
-            props.height = Some((resolved_height_value, resolved_height_unit));
-            if self.has_built_handle() {
-                ui::set_height(
-                    self.handle().raw(),
-                    resolved_height_value,
-                    resolved_height_unit as u32,
-                );
-            }
-        }
-
-        drop(props);
-        if self.has_built_handle() {
-            self.notify_retained_layout_mutation();
+            self.base
+                .height(resolved_height_value, resolved_height_unit);
         }
     }
 
@@ -380,16 +341,16 @@ impl ImageNode {
             }
         }
 
-        let core_weak: Weak<RefCell<NodeCore>> = Rc::downgrade(&self.core);
+        let base_weak = self.base.downgrade();
         let props_weak: Weak<RefCell<ImageProps>> = Rc::downgrade(&self.props);
         let state_weak: Weak<RefCell<ImageState>> = Rc::downgrade(&self.state);
         let callback: Callback = Rc::new(move || {
-            if let (Some(core), Some(props), Some(state)) = (
-                core_weak.upgrade(),
+            if let (Some(base), Some(props), Some(state)) = (
+                base_weak.upgrade(),
                 props_weak.upgrade(),
                 state_weak.upgrade(),
             ) {
-                let node = ImageNode { core, props, state };
+                let node = ImageNode { base, props, state };
                 node.apply_resolved_sizing();
             }
         });
@@ -415,16 +376,46 @@ impl ImageNode {
 
 impl Node for ImageNode {
     fn retained_node_ref(&self) -> NodeRef {
-        NodeRef::from_node(self.core.clone(), self.clone())
+        NodeRef::from_node(self.base.core.clone(), self.clone())
     }
 
     fn build_self(&self) {
         self.apply_resolved_sizing();
-        apply_image_props(
-            self.handle(),
-            &self.props.borrow(),
-            self.core.borrow().behavior.clone(),
-        );
+        self.base.build_self();
+        apply_image_props(self.handle(), &self.props.borrow());
+    }
+}
+
+impl HasFlexBoxRoot for ImageNode {
+    fn flex_box_root(&self) -> &FlexBox {
+        &self.base
+    }
+
+    fn set_flex_box_surface_width(&self, value: f32, unit: Unit) {
+        self.width(value, unit);
+    }
+
+    fn set_flex_box_surface_height(&self, value: f32, unit: Unit) {
+        self.height(value, unit);
+    }
+}
+
+impl ThemeBindable for ImageNode {
+    fn theme_binding_node(&self) -> NodeRef {
+        self.retained_node_ref()
+    }
+
+    fn weak_theme_target(&self) -> Box<dyn Fn() -> Option<Self>> {
+        let base = self.base.downgrade();
+        let props = Rc::downgrade(&self.props);
+        let state = Rc::downgrade(&self.state);
+        Box::new(move || {
+            Some(Self {
+                base: base.upgrade()?,
+                props: props.upgrade()?,
+                state: state.upgrade()?,
+            })
+        })
     }
 }