1 files changed, 39 insertions, 16 deletions

diff --git a/core/src/solving.rs b/core/src/solving.rs
index 4760611..261b4d4 100644
--- a/core/src/solving.rs
+++ b/core/src/solving.rs
@@ -1,4 +1,5 @@
-use super::core_shapes::*;
+use crate::core_shapes::{CoreDrawable, CoreShape, DefinedCoreDrawable, DefinedCoreShape};
+
 use super::styles::*;
 use super::text::*;
 use super::types::{Bool, Float};
@@ -147,6 +148,17 @@ pub trait Constrainable {
     fn fixate(&self, model: &dyn SolverModel) -> Option<Self::Fixated>;
 }
 
+impl Constrainable for CoreShape {
+    type Fixated = DefinedCoreShape;
+
+    fn fixate(&self, model: &dyn SolverModel) -> Option<Self::Fixated> {
+        match self {
+            CoreShape::Rectangle(r) => Some(DefinedCoreShape::Rectangle(*r)),
+            CoreShape::Text(t) => t.fixate(model).map(DefinedCoreShape::Text),
+        }
+    }
+}
+
 impl Constrainable for Float {
     type Fixated = f64;
 
@@ -218,11 +230,22 @@ impl Constrainable for DashStyle {
     }
 }
 
-impl Constrainable for ShapeContext {
-    type Fixated = DefinedShapeContext;
+impl Constrainable for CoreDrawable {
+    type Fixated = DefinedCoreDrawable;
+
+    fn fixate(&self, model: &dyn SolverModel) -> Option<Self::Fixated> {
+        Some(DefinedCoreDrawable {
+            shape: self.shape.fixate(model)?,
+            context: self.context.fixate(model)?,
+        })
+    }
+}
+
+impl Constrainable for CoreShapeContext {
+    type Fixated = DefinedCoreShapeContext;
 
     fn fixate(&self, model: &dyn SolverModel) -> Option<Self::Fixated> {
-        Some(DefinedShapeContext {
+        Some(DefinedCoreShapeContext {
             bounds: self.bounds.fixate(model)?,
             fill: self.fill.clone(),
             stroke: self.stroke.fixate(model)?,
@@ -265,15 +288,15 @@ impl Constrainable for Text {
     }
 }
 
-impl Constrainable for StraightPath {
-    type Fixated = DefinedStraightPath;
-
-    fn fixate(&self, model: &dyn SolverModel) -> Option<Self::Fixated> {
-        let points: Option<_> = self
-            .points
-            .iter()
-            .map(|point| point.fixate(model))
-            .collect();
-        Some(DefinedStraightPath { points: points? })
-    }
-}
+// impl Constrainable for StraightPath {
+//     type Fixated = DefinedStraightPath;
+//
+//     fn fixate(&self, model: &dyn SolverModel) -> Option<Self::Fixated> {
+//         let points: Option<_> = self
+//             .points
+//             .iter()
+//             .map(|point| point.fixate(model))
+//             .collect();
+//         Some(DefinedStraightPath { points: points? })
+//     }
+// }