keyboard progress & refactors

wgui/uidev-vk/Cargo.toml

@@ -13,10 +13,3 @@ wgui = { path = "../" }
 winit = "0.30.10"
 vulkano = { workspace = true }
 vulkano-shaders = { workspace = true }
-
-[profile.dev]
-opt-level = 0
-debug = true
-strip = "none"
-debug-assertions = true
-incremental = true

wgui/uidev-vk/src/main.rs

@@ -18,7 +18,7 @@ use vulkano::{
 	sync::GpuFuture,
 };
 use wgui::{
-	event::{MouseDownEvent, MouseMotionEvent, MouseUpEvent, MouseWheelEvent},
+	event::{MouseButton, MouseDownEvent, MouseMotionEvent, MouseUpEvent, MouseWheelEvent},
 	gfx::WGfx,
 	renderer_vk::{self},
 };
@@ -121,6 +121,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 					.push_event(&wgui::event::Event::MouseWheel(MouseWheelEvent {
 						shift: Vec2::new(x, y),
 						pos: mouse / scale,
+						device: 0,
 					}))
 					.unwrap(),
 				MouseScrollDelta::PixelDelta(pos) => testbed
@@ -128,6 +129,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 					.push_event(&wgui::event::Event::MouseWheel(MouseWheelEvent {
 						shift: Vec2::new(pos.x as f32 / 5.0, pos.y as f32 / 5.0),
 						pos: mouse / scale,
+						device: 0,
 					}))
 					.unwrap(),
 			},
@@ -141,6 +143,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 							.layout()
 							.push_event(&wgui::event::Event::MouseDown(MouseDownEvent {
 								pos: mouse / scale,
+								button: MouseButton::Left,
+								device: 0,
 							}))
 							.unwrap();
 					} else {
@@ -148,6 +152,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 							.layout()
 							.push_event(&wgui::event::Event::MouseUp(MouseUpEvent {
 								pos: mouse / scale,
+								button: MouseButton::Left,
+								device: 0,
 							}))
 							.unwrap();
 					}
@@ -162,6 +168,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 					.layout()
 					.push_event(&wgui::event::Event::MouseMotion(MouseMotionEvent {
 						pos: mouse / scale,
+						device: 0,
 					}))
 					.unwrap();
 			}

wgui/uidev-vk/src/testbed/testbed_generic.rs

@@ -58,7 +58,7 @@ impl TestbedGeneric {
 		let wid = widget_id.clone();
 		layout.add_event_listener(
 			button.body,
-			EventListener::MouseClick(Box::new(move |data| {
+			EventListener::MouseRelease(Box::new(move |data, _| {
 				button.set_text(data, "Congratulations!");
 				*wid.borrow_mut() = Some(data.widget_id);
 			})),