diff --git a/examples/src/raycast-tests/src/lib.pax b/examples/src/raycast-tests/src/lib.pax index c9a1ca9d5..bfd121866 100644 --- a/examples/src/raycast-tests/src/lib.pax +++ b/examples/src/raycast-tests/src/lib.pax @@ -1,8 +1,8 @@ - + - + { }, true); layer.addEventListener("mousemove", (evt) => { let event = { - "Mousemove": { + "MouseMove": { "x": evt.clientX, "y": evt.clientY, "button": getMouseButton(evt), @@ -1654,7 +1654,7 @@ var Pax = (() => { }, { "passive": true, "capture": true }); layer.addEventListener("mousedown", (evt) => { let event = { - "Mousedown": { + "MouseDown": { "x": evt.clientX, "y": evt.clientY, "button": getMouseButton(evt), @@ -1665,7 +1665,7 @@ var Pax = (() => { }, true); layer.addEventListener("mouseup", (evt) => { let event = { - "Mouseup": { + "MouseUp": { "x": evt.clientX, "y": evt.clientY, "button": getMouseButton(evt), diff --git a/pax-chassis-web/interface/src/events/listeners.ts b/pax-chassis-web/interface/src/events/listeners.ts index 2a05b5b79..a78ff3f08 100644 --- a/pax-chassis-web/interface/src/events/listeners.ts +++ b/pax-chassis-web/interface/src/events/listeners.ts @@ -73,7 +73,7 @@ export function setupEventListeners(chassis: PaxChassisWeb, layer: any) { // @ts-ignore layer.addEventListener('mousemove', (evt) => { let event = { - "Mousemove": { + "MouseMove": { "x": evt.clientX, "y": evt.clientY, "button": getMouseButton(evt), @@ -98,7 +98,7 @@ export function setupEventListeners(chassis: PaxChassisWeb, layer: any) { // @ts-ignore layer.addEventListener('mousedown', (evt) => { let event = { - "Mousedown": { + "MouseDown": { "x": evt.clientX, "y": evt.clientY, "button": getMouseButton(evt), @@ -110,7 +110,7 @@ export function setupEventListeners(chassis: PaxChassisWeb, layer: any) { // @ts-ignore layer.addEventListener('mouseup', (evt) => { let event = { - "Mouseup": { + "MouseUp": { "x": evt.clientX, "y": evt.clientY, "button": getMouseButton(evt), diff --git a/pax-chassis-web/src/lib.rs b/pax-chassis-web/src/lib.rs index 2e65e9446..9ea535385 100644 --- a/pax-chassis-web/src/lib.rs +++ b/pax-chassis-web/src/lib.rs @@ -20,7 +20,7 @@ use pax_core::{PaxEngine, Renderer}; use pax_message::{ImageLoadInterruptArgs, NativeInterrupt}; use pax_runtime_api::{ ArgsClap, ArgsClick, ArgsContextMenu, ArgsDoubleClick, ArgsKeyDown, ArgsKeyPress, ArgsKeyUp, - ArgsMouseOut, ArgsMouseOver, ArgsMousedown, ArgsMousemove, ArgsMouseup, ArgsScroll, + ArgsMouseDown, ArgsMouseMove, ArgsMouseOut, ArgsMouseOver, ArgsMouseUp, ArgsScroll, ArgsTouchEnd, ArgsTouchMove, ArgsTouchStart, ArgsWheel, KeyboardEventArgs, ModifierKey, MouseButton, MouseEventArgs, Touch, }; @@ -336,10 +336,10 @@ 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 { + let args_mouse_move = ArgsMouseMove { mouse: MouseEventArgs { x: args.x, y: args.y, @@ -351,7 +351,7 @@ impl PaxChassisWeb { .collect(), }, }; - topmost_node.dispatch_mousemove(args_mousemove, globals); + topmost_node.dispatch_mouse_move(args_mouse_move, globals); } } NativeInterrupt::Wheel(args) => { @@ -372,10 +372,10 @@ 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 { + let args_mouse_down = ArgsMouseDown { mouse: MouseEventArgs { x: args.x, y: args.y, @@ -387,13 +387,13 @@ impl PaxChassisWeb { .collect(), }, }; - topmost_node.dispatch_mousedown(args_mousedown, globals); + topmost_node.dispatch_mouse_down(args_mouse_down, 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 { + let args_mouse_up = ArgsMouseUp { mouse: MouseEventArgs { x: args.x, y: args.y, @@ -405,7 +405,7 @@ impl PaxChassisWeb { .collect(), }, }; - topmost_node.dispatch_mouseup(args_mouseup, globals); + topmost_node.dispatch_mouse_up(args_mouse_up, globals); } } NativeInterrupt::MouseOver(args) => { diff --git a/pax-core/src/engine.rs b/pax-core/src/engine.rs index 0c82b61a8..1375495a2 100644 --- a/pax-core/src/engine.rs +++ b/pax-core/src/engine.rs @@ -7,8 +7,8 @@ use pax_message::{NativeMessage, OcclusionPatch}; use pax_runtime_api::{ ArgsButtonClick, ArgsCheckboxChange, ArgsClap, ArgsClick, ArgsContextMenu, ArgsDoubleClick, - ArgsKeyDown, ArgsKeyPress, ArgsKeyUp, ArgsMouseOut, ArgsMouseOver, ArgsMousedown, - ArgsMousemove, ArgsMouseup, ArgsScroll, ArgsTextboxChange, ArgsTouchEnd, ArgsTouchMove, + ArgsKeyDown, ArgsKeyPress, ArgsKeyUp, ArgsMouseDown, ArgsMouseMove, ArgsMouseOut, + ArgsMouseOver, ArgsMouseUp, ArgsScroll, ArgsTextboxChange, ArgsTouchEnd, ArgsTouchMove, ArgsTouchStart, ArgsWheel, CommonProperties, Interpolatable, Layer, NodeContext, OcclusionLayerGen, RenderContext, TransitionManager, }; @@ -91,9 +91,9 @@ pub struct HandlerRegistry { pub button_click_handlers: Vec>, &NodeContext, ArgsButtonClick)>, pub textbox_change_handlers: Vec>, &NodeContext, ArgsTextboxChange)>, pub click_handlers: Vec>, &NodeContext, ArgsClick)>, - pub mousedown_handlers: Vec>, &NodeContext, ArgsMousedown)>, - pub mouseup_handlers: Vec>, &NodeContext, ArgsMouseup)>, - pub mousemove_handlers: Vec>, &NodeContext, ArgsMousemove)>, + pub mouse_down_handlers: Vec>, &NodeContext, ArgsMouseDown)>, + pub mouse_up_handlers: Vec>, &NodeContext, ArgsMouseUp)>, + pub mouse_move_handlers: Vec>, &NodeContext, ArgsMouseMove)>, pub mouse_over_handlers: Vec>, &NodeContext, ArgsMouseOver)>, pub mouse_out_handlers: Vec>, &NodeContext, ArgsMouseOut)>, pub double_click_handlers: Vec>, &NodeContext, ArgsDoubleClick)>, @@ -116,9 +116,9 @@ impl Default for HandlerRegistry { key_up_handlers: Vec::new(), key_press_handlers: Vec::new(), click_handlers: Vec::new(), - mousedown_handlers: Vec::new(), - mouseup_handlers: Vec::new(), - mousemove_handlers: Vec::new(), + mouse_down_handlers: Vec::new(), + mouse_up_handlers: Vec::new(), + mouse_move_handlers: Vec::new(), mouse_over_handlers: Vec::new(), mouse_out_handlers: Vec::new(), double_click_handlers: Vec::new(), diff --git a/pax-core/src/engine/expanded_node.rs b/pax-core/src/engine/expanded_node.rs index f328f254f..e5a076328 100644 --- a/pax-core/src/engine/expanded_node.rs +++ b/pax-core/src/engine/expanded_node.rs @@ -8,8 +8,8 @@ use kurbo::Point; use pax_runtime_api::{ ArgsButtonClick, ArgsCheckboxChange, ArgsClap, ArgsClick, ArgsContextMenu, ArgsDoubleClick, - ArgsKeyDown, ArgsKeyPress, ArgsKeyUp, ArgsMouseOut, ArgsMouseOver, ArgsMousedown, - ArgsMousemove, ArgsMouseup, ArgsScroll, ArgsTextboxChange, ArgsTouchEnd, ArgsTouchMove, + ArgsKeyDown, ArgsKeyPress, ArgsKeyUp, ArgsMouseDown, ArgsMouseMove, ArgsMouseOut, + ArgsMouseOver, ArgsMouseUp, ArgsScroll, ArgsTextboxChange, ArgsTouchEnd, ArgsTouchMove, ArgsTouchStart, ArgsWheel, Axis, CommonProperties, NodeContext, RenderContext, Size, }; @@ -445,9 +445,9 @@ impl ExpandedNode { ArgsButtonClick, button_click_handlers ); - dispatch_event_handler!(dispatch_mousedown, ArgsMousedown, mousedown_handlers); - dispatch_event_handler!(dispatch_mouseup, ArgsMouseup, mouseup_handlers); - dispatch_event_handler!(dispatch_mousemove, ArgsMousemove, mousemove_handlers); + dispatch_event_handler!(dispatch_mouse_down, ArgsMouseDown, mouse_down_handlers); + dispatch_event_handler!(dispatch_mouse_up, ArgsMouseUp, mouse_up_handlers); + dispatch_event_handler!(dispatch_mouse_move, ArgsMouseMove, mouse_move_handlers); dispatch_event_handler!(dispatch_mouse_over, ArgsMouseOver, mouse_over_handlers); dispatch_event_handler!(dispatch_mouse_out, ArgsMouseOut, mouse_out_handlers); dispatch_event_handler!( diff --git a/pax-language-server/src/completion.rs b/pax-language-server/src/completion.rs index 6e1788e9b..c63a341ab 100644 --- a/pax-language-server/src/completion.rs +++ b/pax-language-server/src/completion.rs @@ -289,9 +289,9 @@ lazy_static! { ("key_up", "Set Key Up event handler"), ("key_press", "Set Key Press event handler"), ("click", "Set Click event handler"), - ("mousedown", "Set Mouse Down event handler"), - ("mouseup", "Set Mouse Up event handler"), - ("mousemove", "Set Mouse Move event handler"), + ("mouse_down", "Set Mouse Down event handler"), + ("mouse_up", "Set Mouse Up event handler"), + ("mouse_move", "Set Mouse Move event handler"), ("mouse_over", "Set Mouse Over event handler"), ("mouse_out", "Set Mouse Out event handler"), ("double_click", "Set Double Click event handler"), diff --git a/pax-message/src/lib.rs b/pax-message/src/lib.rs index 42f7758d8..e91a89570 100644 --- a/pax-message/src/lib.rs +++ b/pax-message/src/lib.rs @@ -48,10 +48,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), @@ -186,7 +186,7 @@ pub struct DoubleClickInterruptArgs { #[derive(Deserialize)] #[repr(C)] -pub struct MousemoveInterruptArgs { +pub struct MouseMoveInterruptArgs { pub x: f64, pub y: f64, pub button: MouseButtonMessage, @@ -205,7 +205,7 @@ pub struct WheelInterruptArgs { #[derive(Deserialize)] #[repr(C)] -pub struct MousedownInterruptArgs { +pub struct MouseDownInterruptArgs { pub x: f64, pub y: f64, pub button: MouseButtonMessage, @@ -214,7 +214,7 @@ pub struct MousedownInterruptArgs { #[derive(Deserialize)] #[repr(C)] -pub struct MouseupInterruptArgs { +pub struct MouseUpInterruptArgs { pub x: f64, pub y: f64, pub button: MouseButtonMessage, diff --git a/pax-runtime-api/src/lib.rs b/pax-runtime-api/src/lib.rs index 1326ffbc1..484caa960 100644 --- a/pax-runtime-api/src/lib.rs +++ b/pax-runtime-api/src/lib.rs @@ -267,7 +267,7 @@ pub struct ArgsDoubleClick { /// User moves the mouse while it is over an element. #[derive(Clone)] -pub struct ArgsMousemove { +pub struct ArgsMouseMove { pub mouse: MouseEventArgs, } @@ -296,13 +296,13 @@ pub struct ArgsButtonClick {} /// User presses a mouse button over an element. #[derive(Clone)] -pub struct ArgsMousedown { +pub struct ArgsMouseDown { pub mouse: MouseEventArgs, } /// User releases a mouse button over an element. #[derive(Clone)] -pub struct ArgsMouseup { +pub struct ArgsMouseUp { pub mouse: MouseEventArgs, }