[librsvg: 15/37] text.rs: Reorder the impls a bit



commit 9a54532b1d7f15b7b066836fcb902547bd6322f5
Author: Federico Mena Quintero <federico gnome org>
Date:   Wed Oct 31 07:37:37 2018 -0600

    text.rs: Reorder the impls a bit

 rsvg_internals/src/text.rs | 82 +++++++++++++++++++++++-----------------------
 1 file changed, 41 insertions(+), 41 deletions(-)
---
diff --git a/rsvg_internals/src/text.rs b/rsvg_internals/src/text.rs
index b039dbb8..13b5c72b 100644
--- a/rsvg_internals/src/text.rs
+++ b/rsvg_internals/src/text.rs
@@ -44,17 +44,6 @@ struct Chunk {
     spans: Vec<Span>,
 }
 
-impl Chunk {
-    fn new(values: &ComputedValues, x: Option<Length>, y: Option<Length>) -> Chunk {
-        Chunk {
-            values: values.clone(),
-            x,
-            y,
-            spans: Vec::new(),
-        }
-    }
-}
-
 struct MeasuredChunk {
     values: ComputedValues,
     x: Option<Length>,
@@ -87,11 +76,13 @@ struct PositionedSpan {
     rendered_position: (f64, f64),
 }
 
-impl Span {
-    fn new(text: &str, values: ComputedValues) -> Span {
-        Span {
-            values,
-            text: text.to_string(),
+impl Chunk {
+    fn new(values: &ComputedValues, x: Option<Length>, y: Option<Length>) -> Chunk {
+        Chunk {
+            values: values.clone(),
+            x,
+            y,
+            spans: Vec::new(),
         }
     }
 }
@@ -111,31 +102,6 @@ impl MeasuredChunk {
     }
 }
 
-impl MeasuredSpan {
-    fn from_span(span: &Span, draw_ctx: &DrawingCtx) -> MeasuredSpan {
-        let values = span.values.clone();
-
-        let layout = create_pango_layout(draw_ctx, &values, &span.text);
-        let (w, h) = layout.get_size();
-
-        let w = f64::from(w) / f64::from(pango::SCALE);
-        let h = f64::from(h) / f64::from(pango::SCALE);
-
-        let (advance_x, advance_y) = if values.text_gravity_is_vertical() {
-            (0.0, w)
-        } else {
-            (w, 0.0)
-        };
-
-        MeasuredSpan {
-            values,
-            layout,
-            layout_size: (w, h),
-            advance: (advance_x, advance_y),
-        }
-    }
-}
-
 impl PositionedChunk {
     fn from_measured(
         measured: &MeasuredChunk,
@@ -165,6 +131,40 @@ impl PositionedChunk {
     }
 }
 
+impl Span {
+    fn new(text: &str, values: ComputedValues) -> Span {
+        Span {
+            values,
+            text: text.to_string(),
+        }
+    }
+}
+
+impl MeasuredSpan {
+    fn from_span(span: &Span, draw_ctx: &DrawingCtx) -> MeasuredSpan {
+        let values = span.values.clone();
+
+        let layout = create_pango_layout(draw_ctx, &values, &span.text);
+        let (w, h) = layout.get_size();
+
+        let w = f64::from(w) / f64::from(pango::SCALE);
+        let h = f64::from(h) / f64::from(pango::SCALE);
+
+        let (advance_x, advance_y) = if values.text_gravity_is_vertical() {
+            (0.0, w)
+        } else {
+            (w, 0.0)
+        };
+
+        MeasuredSpan {
+            values,
+            layout,
+            layout_size: (w, h),
+            advance: (advance_x, advance_y),
+        }
+    }
+}
+
 impl PositionedSpan {
     fn from_measured(
         measured: &MeasuredSpan,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]