wip

noxware · Jun 20, 2024 · e596461 · e596461
1 parent ad6d644
commit e596461
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 31 deletions.
diff --git a/hframe-core/src/context.rs b/hframe-core/src/context.rs
@@ -36,7 +36,6 @@ impl<P: Platform> Context<P> {
                 _ => {}
             }
         }
-        todo!()
     }
 }
 
@@ -46,17 +45,14 @@ mod tests {
         composed_area::{ComposedAreaKind, ComposedAreaState, ComposedHtml},
         geo::{Pos, Rect, Size},
         id::Id,
-        platform,
     };
 
     use super::*;
 
     #[test]
     fn it_works() {
-        let platform = TestPlatform::new();
-
         let mut ctx = Context {
-            platform: platform.clone(),
+            platform: TestPlatform::new(),
             world: World::new(Rect::from((0.0, 0.0, 100.0, 100.0))),
             pointer_pos: Pos::new(0.0, 0.0),
         };
@@ -91,17 +87,20 @@ mod tests {
             assert_eq!(data.value.id, Id::root());
         });
 
-        platform.set_mouse_pos(Pos::new(15.0, 15.0));
+        ctx.platform.move_pointer_to(Pos::new(15.0, 15.0));
+        ctx.sync();
         ctx.get_hovered_area().unwrap().read(|data| {
             assert_eq!(data.value.id, Id::from("grandchild"));
         });
 
-        platform.set_mouse_pos(Pos::new(30.0, 30.0));
+        ctx.platform.move_pointer_to(Pos::new(30.0, 30.0));
+        ctx.sync();
         ctx.get_hovered_area().unwrap().read(|data| {
             assert_eq!(data.value.id, Id::from("grandchild"));
         });
 
-        platform.set_mouse_pos(Pos::new(31.0, 31.0));
+        ctx.platform.move_pointer_to(Pos::new(31.0, 31.0));
+        ctx.sync();
         ctx.get_hovered_area().unwrap().read(|data| {
             assert_eq!(data.value.id, Id::from("child"));
         });

diff --git a/hframe-core/src/platform.rs b/hframe-core/src/platform.rs
@@ -16,6 +16,6 @@ pub(crate) enum PlatformEvent {
 }
 
 pub(crate) trait Platform {
-    fn events(&self) -> impl Iterator<Item = impl AsRef<PlatformEvent>>;
+    fn events(&self) -> impl Iterator<Item = &PlatformEvent>;
     fn clear_events(&mut self);
 }
diff --git a/hframe-core/src/test_platform.rs b/hframe-core/src/test_platform.rs
@@ -8,40 +8,26 @@ use crate::{
     platform::{Platform, PlatformEvent},
 };
 
-pub(crate) struct TestPlatformInner {
-    pub(crate) events: Vec<PlatformEvent>,
-}
-
-pub(crate) struct TestPlatform(Rc<RefCell<TestPlatformInner>>);
-
-impl Clone for TestPlatform {
-    fn clone(&self) -> Self {
-        TestPlatform(Rc::clone(&self.0))
-    }
+pub(crate) struct TestPlatform {
+    events: Vec<PlatformEvent>,
 }
 
 impl Platform for TestPlatform {
     fn clear_events(&mut self) {
-        self.0.borrow_mut().events.clear();
+        self.events.clear();
     }
 
-    fn events(&self) -> impl Iterator<Item = impl AsRef<PlatformEvent>> {
-        self.0
-            .borrow()
-            .events
-            .iter()
-            .map(|e| e as &dyn AsRef<PlatformEvent>)
+    fn events(&self) -> impl Iterator<Item = &PlatformEvent> {
+        self.events.iter()
     }
 }
 
 impl TestPlatform {
     pub(crate) fn new() -> Self {
-        TestPlatform(Rc::new(RefCell::new(TestPlatformInner {
-            events: Vec::new(),
-        })))
+        Self { events: Vec::new() }
     }
 
-    pub(crate) fn set_mouse_pos(&self, mouse_pos: Pos) {
-        self.0.borrow_mut().mouse_pos = mouse_pos;
+    pub(crate) fn move_pointer_to(&mut self, pos: Pos) {
+        self.events.push(PlatformEvent::PointerMove(pos));
     }
 }