Pure implementation update

Author: dudochkin-victor

Cargo.toml

@@ -22,6 +22,7 @@ name = "animate"
 features = ["dox"]
 
 [features]
+pure = []
 dox = ["ffi/dox", "glib/dox", "glib-sys/dox", "gobject-sys/dox", "ux-dx/dox"]
 
 [dependencies]
@@ -37,9 +38,10 @@ tiny-skia = "0.5"
 rand = "0.8"
 x11 = "2.18.2"
 once_cell = "1.7.2"
+fontdue = "0.5.0"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-ux-dx = "0.1"
+ux-dx = { version = "0.1" }
 libc = "0.2"
 bitflags = "1.0"
 glib-sys = "0.10"

src/prelude.rs

@@ -15,6 +15,3 @@ pub use crate::AdvancedShapesExt;
 
 #[cfg(not(target_arch = "wasm32"))]
 pub use crate::legacy::traits::*;
-
-pub trait Object: std::fmt::Debug + Clone + 'static {}
-pub trait Is<T: Object>: AsRef<T> + 'static {}

src/pure/action.rs

@@ -1,18 +1,17 @@
 use crate::prelude::*;
-// use super::ActorMeta;
+use super::ActorMeta;
 use std::fmt;
 
-// * ClutterAction:
+// * Action:
 // *
-// * The #ClutterAction structure contains only private data and
+// * The #Action structure contains only private data and
 // * should be accessed using the provided API.
 // *
 
 // It should be Trait
-// extends ActorMeta
 #[derive(Debug, Clone)]
 pub struct Action {
-    // parent_instance: ClutterActorMeta,
+    inner: ActorMeta,
 }
 
 impl Action {
@@ -28,6 +27,12 @@ impl AsRef<Action> for Action {
     }
 }
 
+impl AsRef<ActorMeta> for Action {
+    fn as_ref(&self) -> &ActorMeta {
+        &self.inner
+    }
+}
+
 impl fmt::Display for Action {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "Action")

src/pure/actor.rs

@@ -1,12 +1,12 @@
 use super::{
     Action, ActorAlign, ActorBox, ActorFlags, AllocationFlags, AnimationMode, ButtonEvent,
-    Constraint, Content, ContentGravity, ContentRepeat, CrossingEvent, Effect, Event, InternalRect,
+    Constraint, Content, ContentGravity, ContentRepeat, CrossingEvent, Effect, Event, 
     KeyEvent, LayoutManager, Margin, Matrix, MotionEvent, OffscreenRedirect, Orientation,
     PaintVolume, RequestMode, RotateAxis, ScalingFilter, ScrollEvent, Stage, TextDirection,
     Transition, Vertex,
 };
 use crate::prelude::*;
-use crate::Color;
+use crate::{Color, Rect};
 use glib::signal::SignalHandlerId;
 use std::fmt;
 
@@ -2397,7 +2397,7 @@ pub trait ActorExt: 'static {
     ///
     /// Setting this property will change the `Actor:has-clip`
     /// property as a side effect.
-    fn get_property_clip_rect(&self) -> Option<InternalRect>;
+    fn get_property_clip_rect(&self) -> Option<Rect<f32>>;
 
     /// The visible region of the actor, in actor-relative coordinates,
     /// expressed as a `Rect`.
@@ -2406,7 +2406,7 @@ pub trait ActorExt: 'static {
     ///
     /// Setting this property will change the `Actor:has-clip`
     /// property as a side effect.
-    fn set_property_clip_rect(&self, clip_rect: Option<&InternalRect>);
+    fn set_property_clip_rect(&self, clip_rect: Option<&Rect<f32>>);
 
     /// Adds a `Constraint` to the actor
     fn set_property_constraints<P: Is<Constraint>>(&self, constraints: Option<&P>);
@@ -3366,7 +3366,7 @@ impl<O: Is<Actor>> ActorExt for O {
     //     // >(
     //     //     item: *mut gobject_sys::GObject,
     //     //     user_data: glib_sys::gpointer,
-    //     // ) -> *mut ffi::ClutterActor {
+    //     // ) -> *mut ffi::Actor {
     //     //     let item = from_glib_borrow(item);
     //     //     let callback: &Q = &*(user_data as *mut _);
     //     //     let res = (*callback)(&item);
@@ -3522,7 +3522,7 @@ impl<O: Is<Actor>> ActorExt for O {
 
     fn get_background_color(&self) -> Color {
         // unsafe {
-        //     let mut color = InternalColor::uninitialized();
+        //     let mut color = Color::uninitialized();
         //     ffi::clutter_actor_get_background_color(
         //         self.as_ref().to_glib_none().0,
         //         color.to_glib_none_mut().0,
@@ -4565,7 +4565,7 @@ impl<O: Is<Actor>> ActorExt for O {
         //             blue,
         //             alpha,
         //         } = value.into();
-        //         Some(InternalColor::new(red, green, blue, alpha))
+        //         Some(Color::new(red, green, blue, alpha))
         //     }
         //     None => None,
         // };
@@ -5056,9 +5056,9 @@ impl<O: Is<Actor>> ActorExt for O {
         unimplemented!()
     }
 
-    fn get_property_clip_rect(&self) -> Option<InternalRect> {
+    fn get_property_clip_rect(&self) -> Option<Rect<f32>> {
         // unsafe {
-        //     let mut value = Value::from_type(<InternalRect as StaticType>::static_type());
+        //     let mut value = Value::from_type(<Rect as StaticType>::static_type());
         //     gobject_sys::g_object_get_property(
         //         self.to_glib_none().0 as *mut gobject_sys::GObject,
         //         b"clip-rect\0".as_ptr() as *const _,
@@ -5071,7 +5071,7 @@ impl<O: Is<Actor>> ActorExt for O {
         unimplemented!()
     }
 
-    fn set_property_clip_rect(&self, clip_rect: Option<&InternalRect>) {
+    fn set_property_clip_rect(&self, clip_rect: Option<&Rect<f32>>) {
         // unsafe {
         //     gobject_sys::g_object_set_property(
         //         self.to_glib_none().0 as *mut gobject_sys::GObject,

src/pure/actor_box.rs

@@ -1,6 +1,6 @@
 use super::Vertex;
 
-// * ClutterActorBox:
+// * ActorBox:
 // * @x1: X coordinate of the top left corner
 // * @y1: Y coordinate of the top left corner
 // * @x2: X coordinate of the bottom right corner
@@ -82,66 +82,65 @@ impl ActorBox {
     }
 
     pub fn from_vertices(&mut self, verts: &[Vertex; 4]) {     
-        // // 4-way min/max
-        // let mut x1 = verts[0].x;
-        // let mut y1 = verts[0].y;
+        // 4-way min/max
+        let mut x1 = verts[0].x;
+        let mut y1 = verts[0].y;
 
-        // if verts[1].x < x1 {
-        //   x1 = verts[1].x;
-        // }
+        if verts[1].x < x1 {
+          x1 = verts[1].x;
+        }
 
-        // if verts[2].x < x1 {
-        //   x1 = verts[2].x;
-        // }
+        if verts[2].x < x1 {
+          x1 = verts[2].x;
+        }
 
-        // if verts[3].x < x1 {
-        //   x1 = verts[3].x;
-        // }
+        if verts[3].x < x1 {
+          x1 = verts[3].x;
+        }
 
-        // if verts[1].y < y1 {
-        //   y1 = verts[1].y;
-        // }
+        if verts[1].y < y1 {
+          y1 = verts[1].y;
+        }
 
-        // if verts[2].y < y1 {
-        //   y1 = verts[2].y;
-        // }
+        if verts[2].y < y1 {
+          y1 = verts[2].y;
+        }
 
-        // if verts[3].y < y1 {
-        //   y1 = verts[3].y;
-        // }
+        if verts[3].y < y1 {
+          y1 = verts[3].y;
+        }
 
-        // let mut x2 = verts[0].x;
-        // let mut y2 = verts[0].y;
+        let mut x2 = verts[0].x;
+        let mut y2 = verts[0].y;
 
-        // if verts[1].x > x2 {
-        //   x2 = verts[1].x;
-        // }
+        if verts[1].x > x2 {
+          x2 = verts[1].x;
+        }
 
-        // if verts[2].x > x2 {
-        //   x2 = verts[2].x;
-        // }
+        if verts[2].x > x2 {
+          x2 = verts[2].x;
+        }
 
-        // if verts[3].x > x2 {
-        //   x2 = verts[3].x;
-        // }
+        if verts[3].x > x2 {
+          x2 = verts[3].x;
+        }
 
-        // if verts[1].y > y2 {
-        //   y2 = verts[1].y;
-        // }
+        if verts[1].y > y2 {
+          y2 = verts[1].y;
+        }
 
-        // if verts[2].y > y2 {
-        //   y2 = verts[2].y;
-        // }
+        if verts[2].y > y2 {
+          y2 = verts[2].y;
+        }
 
-        // if verts[3].y > y2 {
-        //   y2 = verts[3].y;
-        // }
+        if verts[3].y > y2 {
+          y2 = verts[3].y;
+        }
 
-        // self.x1 = x1;
-        // self.x2 = x2;
-        // self.y1 = y1;
-        // self.y2 = y2;
-        unimplemented!()
+        self.x1 = x1;
+        self.x2 = x2;
+        self.y1 = y1;
+        self.y2 = y2;
     }
 
     /// Retrieves the area of `self`
@@ -234,19 +233,18 @@ impl ActorBox {
     /// the interpolation progress
     /// ## `result`
     /// return location for the interpolation
-    pub fn interpolate(&self, dest: &ActorBox, progress: f64) -> Self {
-        // let x1 = self.x1 + (dest.x1 - self.x1) * progress;
-        // let y1 = self.y1 + (dest.y1 - self.y1) * progress;
-        // let x2 = self.x2 + (dest.x2 - self.x2) * progress;
-        // let y2 = self.y2 + (dest.y2 - self.y2) * progress;
+    pub fn interpolate(&self, dest: &ActorBox, progress: f32) -> Self {
+        let x1 = self.x1 + (dest.x1 - self.x1) * progress;
+        let y1 = self.y1 + (dest.y1 - self.y1) * progress;
+        let x2 = self.x2 + (dest.x2 - self.x2) * progress;
+        let y2 = self.y2 + (dest.y2 - self.y2) * progress;
 
-        // Self {
-        //     x1,
-        //     y1,
-        //     x2,
-        //     y2,
-        // }
-        unimplemented!()
+        Self {
+            x1,
+            y1,
+            x2,
+            y2,
+        }
     }
 
     /// Changes the origin of `self`, maintaining the size of the `ActorBox`.

src/pure/actor_canvas.rs

@@ -4,37 +4,36 @@ use glib::signal::SignalHandlerId;
 use std::fmt;
 // use cairo::Context;
 
-// * ClutterCanvas:
+// * Canvas:
 // *
-// * The #ClutterCanvas structure contains
+// * The #Canvas structure contains
 // * private data and should only be accessed using the provided
 // * API.
-// * @Title: ClutterCanvas
+// * @Title: Canvas
 // * @Short_Description: Content for 2D painting
-// * @See_Also: #ClutterContent
+// * @See_Also: #Content
 // *
-// * The #ClutterCanvas class is a #ClutterContent implementation that allows
+// * The #Canvas class is a #Content implementation that allows
 // * drawing using the Cairo API on a 2D surface.
 // *
-// * In order to draw on a #ClutterCanvas, you should connect a handler to the
-// * #ClutterCanvas::draw signal; the signal will receive a #cairo_t context
-// * that can be used to draw. #ClutterCanvas will emit the #ClutterCanvas::draw
+// * In order to draw on a #Canvas, you should connect a handler to the
+// * #Canvas::draw signal; the signal will receive a #cairo_t context
+// * that can be used to draw. #Canvas will emit the #Canvas::draw
 // * signal when invalidated using clutter_content_invalidate().
 // *
 // * See [canvas.c](https://git.gnome.org/browse/clutter/tree/examples/canvas.c?h=clutter-1.18)
-// * for an example of how to use #ClutterCanvas.
+// * for an example of how to use #Canvas.
 // @implements Content
-#[derive(Debug, Clone)]
 pub struct ActorCanvas {
     cr: cairo::Context,
 
     width: u32,
     height: u32,
 
-    texture: dx::Texture,
+    texture: dx::pure::Texture,
     dirty: bool,
 
-    buffer: dx::Bitmap,
+    buffer: dx::pure::Bitmap,
 
     scale_factor: u32,
     scale_factor_set: bool,

src/pure/align_constraint.rs

@@ -2,15 +2,15 @@ use super::{Actor, AlignAxis};
 use crate::prelude::*;
 use std::fmt;
 
-// * ClutterAlignConstraint:
+// * AlignConstraint:
 // *
-// * #ClutterAlignConstraint is an opaque structure
+// * #AlignConstraint is an opaque structure
 // * whose members cannot be directly accesses
 // * @Short_Description: A constraint aligning the position of an actor
 // *
-// * #ClutterAlignConstraint is a #ClutterConstraint that aligns the position
-// * of the #ClutterActor to which it is applied to the size of another
-// * #ClutterActor using an alignment factor
+// * #AlignConstraint is a #Constraint that aligns the position
+// * of the #Actor to which it is applied to the size of another
+// * #Actor using an alignment factor
 // @extends Constraint, ActorMeta,
 #[derive(Debug, Clone)]
 pub struct AlignConstraint {