diff --git a/pax-chassis-web/interface/public/pax-chassis-web-interface.js b/pax-chassis-web/interface/public/pax-chassis-web-interface.js index cf8a7dc93..57ac70d80 100644 --- a/pax-chassis-web/interface/public/pax-chassis-web-interface.js +++ b/pax-chassis-web/interface/public/pax-chassis-web-interface.js @@ -376,7 +376,7 @@ var Pax = (() => { } }; - // node_modules/snarkdown/dist/snarkdown.es.js + // ../node_modules/snarkdown/dist/snarkdown.es.js var e = { "": ["", ""], _: ["", ""], "*": ["", ""], "~": ["", ""], "\n": ["
"], " ": ["
"], "-": ["
"] }; function n(e2) { return e2.replace(RegExp("^" + (e2.match(/^(\t| )+/) || "")[0], "gm"), ""); diff --git a/pax-chassis-web/src/lib.rs b/pax-chassis-web/src/lib.rs index 2e65e9446..58a187635 100644 --- a/pax-chassis-web/src/lib.rs +++ b/pax-chassis-web/src/lib.rs @@ -336,7 +336,7 @@ impl PaxChassisWeb { topmost_node.dispatch_double_click(args_double_click, globals); } } - NativeInterrupt::Mousemove(args) => { + NativeInterrupt::MouseMove(args) => { let prospective_hit = engine.get_topmost_element_beneath_ray((args.x, args.y)); if let Some(topmost_node) = prospective_hit { let args_mousemove = ArgsMousemove { @@ -372,7 +372,7 @@ impl PaxChassisWeb { topmost_node.dispatch_wheel(args_wheel, globals); } } - NativeInterrupt::Mousedown(args) => { + NativeInterrupt::MouseDown(args) => { let prospective_hit = engine.get_topmost_element_beneath_ray((args.x, args.y)); if let Some(topmost_node) = prospective_hit { let args_mousedown = ArgsMousedown { @@ -390,7 +390,7 @@ impl PaxChassisWeb { topmost_node.dispatch_mousedown(args_mousedown, globals); } } - NativeInterrupt::Mouseup(args) => { + NativeInterrupt::MouseUp(args) => { let prospective_hit = engine.get_topmost_element_beneath_ray((args.x, args.y)); if let Some(topmost_node) = prospective_hit { let args_mouseup = ArgsMouseup { diff --git a/pax-core/src/declarative_macros.rs b/pax-core/src/declarative_macros.rs index c9b785aca..1c9cad90e 100644 --- a/pax-core/src/declarative_macros.rs +++ b/pax-core/src/declarative_macros.rs @@ -10,7 +10,7 @@ use crate::{ExpressionTable, RuntimePropertiesStackFrame}; /// ```text /// handle_vtable_update!(ptc, self.height, Size); /// ``` -pub fn handle_vtable_update( +pub fn handle_vtable_update( table: &ExpressionTable, stack: &Rc, property: &mut Box>, @@ -33,7 +33,7 @@ pub fn handle_vtable_update( /// // In this example `scale_x` is `Option`al (`Option>>>`) /// handle_vtable_update_optional!(ptc, self.scale_x, Size); /// ``` -pub fn handle_vtable_update_optional( +pub fn handle_vtable_update_optional( table: &ExpressionTable, stack: &Rc, optional_property: Option<&mut Box>>, diff --git a/pax-message/src/lib.rs b/pax-message/src/lib.rs index 846c003a1..e70ee912b 100644 --- a/pax-message/src/lib.rs +++ b/pax-message/src/lib.rs @@ -46,10 +46,10 @@ pub enum NativeInterrupt { KeyPress(KeyPressInterruptArgs), Click(ClickInterruptArgs), DoubleClick(DoubleClickInterruptArgs), - Mousemove(MousemoveInterruptArgs), + MouseMove(MousemoveInterruptArgs), Wheel(WheelInterruptArgs), - Mousedown(MousedownInterruptArgs), - Mouseup(MouseupInterruptArgs), + MouseDown(MousedownInterruptArgs), + MouseUp(MouseupInterruptArgs), MouseOver(MouseOverInterruptArgs), MouseOut(MouseOutInterruptArgs), ContextMenu(ContextMenuInterruptArgs), diff --git a/pax-std/pax-std-primitives/src/button.rs b/pax-std/pax-std-primitives/src/button.rs index 39393a79f..2fd8e3840 100644 --- a/pax-std/pax-std-primitives/src/button.rs +++ b/pax-std/pax-std-primitives/src/button.rs @@ -122,6 +122,7 @@ impl InstanceNode for ButtonInstance { &self.base } + #[cfg(debug_assertions)] fn resolve_debug( &self, f: &mut std::fmt::Formatter, diff --git a/pax-std/pax-std-primitives/src/checkbox.rs b/pax-std/pax-std-primitives/src/checkbox.rs index 405cac782..738590773 100644 --- a/pax-std/pax-std-primitives/src/checkbox.rs +++ b/pax-std/pax-std-primitives/src/checkbox.rs @@ -112,6 +112,7 @@ impl InstanceNode for CheckboxInstance { &self.base } + #[cfg(debug_assertions)] fn resolve_debug( &self, f: &mut std::fmt::Formatter, diff --git a/pax-std/pax-std-primitives/src/image.rs b/pax-std/pax-std-primitives/src/image.rs index 4cc5bacc4..8d3e783ae 100644 --- a/pax-std/pax-std-primitives/src/image.rs +++ b/pax-std/pax-std-primitives/src/image.rs @@ -103,11 +103,12 @@ impl InstanceNode for ImageInstance { &self.base } + #[cfg(debug_assertions)] fn resolve_debug( &self, - _f: &mut std::fmt::Formatter, + f: &mut std::fmt::Formatter, _expanded_node: Option<&pax_core::ExpandedNode>, ) -> std::fmt::Result { - todo!() + f.debug_struct("Image").finish_non_exhaustive() } } diff --git a/pax-std/pax-std-primitives/src/textbox.rs b/pax-std/pax-std-primitives/src/textbox.rs index 0a18d0e62..a58bc5465 100644 --- a/pax-std/pax-std-primitives/src/textbox.rs +++ b/pax-std/pax-std-primitives/src/textbox.rs @@ -108,6 +108,7 @@ impl InstanceNode for TextboxInstance { &self.base } + #[cfg(debug_assertions)] fn resolve_debug( &self, f: &mut std::fmt::Formatter,