diff --git a/src/layout/painter.rs b/src/layout/painter.rs index 4003291..38bf6ab 100644 --- a/src/layout/painter.rs +++ b/src/layout/painter.rs @@ -47,6 +47,6 @@ impl<'a, Ctx> Painter<'a, Ctx> { } pub fn ctx_mut(&mut self) -> &mut Ctx { - &mut self.ctx + self.ctx } } diff --git a/src/layout/ui.rs b/src/layout/ui.rs index 766db67..1dc1a82 100644 --- a/src/layout/ui.rs +++ b/src/layout/ui.rs @@ -1,5 +1,5 @@ use crate::{ - HashMap, Painter, Vec2, Widget, WidgetId, WidgetLike, + HashMap, Painter, Widget, WidgetId, WidgetLike, primitive::Primitives, util::{IDTracker, Id}, }; @@ -17,18 +17,6 @@ pub struct Ui { full_redraw: bool, } -pub struct MouseState { - pos: Vec2, - primary: ButtonState, - secondary: ButtonState, -} - -pub enum ButtonState { - JustPressed, - Pressed, - Released, -} - #[derive(Default)] pub struct Widgets(HashMap>>); diff --git a/src/testing/render/mod.rs b/src/testing/render/mod.rs index 3069b0a..60a4dfc 100644 --- a/src/testing/render/mod.rs +++ b/src/testing/render/mod.rs @@ -1,4 +1,4 @@ -use gui::{primitive::Primitives, UIRenderNode, Ui}; +use gui::{UIRenderNode, primitive::Primitives}; use pollster::FutureExt; use std::sync::Arc; use wgpu::util::StagingBelt;