chore

Author: softmarshmallow

crates/grida-canvas-fonts/examples/ttf_parser_chained_sequence_features.rs

@@ -102,9 +102,7 @@ fn main() {
 #[derive(Debug, Clone)]
 struct ChainedFeature {
     pub tag: String,
-    pub name: String,
     pub glyphs: Vec<String>,
-    pub source_table: String,
 }
 
 fn build_glyph_map(face: &ttf_parser::Face) -> std::collections::HashMap<u16, char> {
@@ -150,7 +148,7 @@ fn extract_features_via_chained_sequences(
 }
 
 fn extract_gsub_features_simplified(
-    face: &ttf_parser::Face,
+    _face: &ttf_parser::Face,
     gsub_table: ttf_parser::opentype_layout::LayoutTable,
     glyph_map: &std::collections::HashMap<u16, char>,
 ) -> Vec<ChainedFeature> {
@@ -160,7 +158,6 @@ fn extract_gsub_features_simplified(
     for i in 0..gsub_table.features.len() {
         if let Some(feature) = gsub_table.features.get(i as u16) {
             let tag = feature.tag.to_string();
-            let name = get_feature_name_from_font(face, &tag);
 
             // Extract glyphs from all lookups in this feature
             let mut all_glyphs = std::collections::HashSet::new();
@@ -224,9 +221,7 @@ fn extract_gsub_features_simplified(
 
             features.push(ChainedFeature {
                 tag,
-                name,
                 glyphs: glyph_chars,
-                source_table: "GSUB".to_string(),
             });
         }
     }
@@ -235,7 +230,7 @@ fn extract_gsub_features_simplified(
 }
 
 fn extract_gpos_features_simplified(
-    face: &ttf_parser::Face,
+    _face: &ttf_parser::Face,
     gpos_table: ttf_parser::opentype_layout::LayoutTable,
     glyph_map: &std::collections::HashMap<u16, char>,
 ) -> Vec<ChainedFeature> {
@@ -245,7 +240,6 @@ fn extract_gpos_features_simplified(
     for i in 0..gpos_table.features.len() {
         if let Some(feature) = gpos_table.features.get(i as u16) {
             let tag = feature.tag.to_string();
-            let name = get_feature_name_from_font(face, &tag);
 
             // Extract glyphs from all lookups in this feature
             let mut all_glyphs = std::collections::HashSet::new();
@@ -301,9 +295,7 @@ fn extract_gpos_features_simplified(
 
             features.push(ChainedFeature {
                 tag,
-                name,
                 glyphs: glyph_chars,
-                source_table: "GPOS".to_string(),
             });
         }
     }
@@ -337,31 +329,3 @@ fn extract_coverage_glyphs(coverage: &ttf_parser::opentype_layout::Coverage) ->
 
     glyphs
 }
-
-fn get_feature_name_from_font(_face: &ttf_parser::Face, tag: &str) -> String {
-    // Simplified feature name mapping
-    match tag {
-        "kern" => "Kerning".to_string(),
-        "liga" => "Ligatures".to_string(),
-        "ss01" => "Stylistic Set 1".to_string(),
-        "cv01" => "Character Variant 1".to_string(),
-        "locl" => "Localized Forms".to_string(),
-        "zero" => "Slashed Zero".to_string(),
-        "sinf" => "Scientific Inferiors".to_string(),
-        "aalt" => "Access All Alternates".to_string(),
-        "numr" => "Numerators".to_string(),
-        "ordn" => "Ordinals".to_string(),
-        "case" => "Case-Sensitive Forms".to_string(),
-        "pnum" => "Proportional Numbers".to_string(),
-        "ccmp" => "Glyph Composition/Decomposition".to_string(),
-        "dlig" => "Discretionary Ligatures".to_string(),
-        "sups" => "Superscript".to_string(),
-        "tnum" => "Tabular Numbers".to_string(),
-        "subs" => "Subscript".to_string(),
-        "salt" => "Stylistic Alternates".to_string(),
-        "dnom" => "Denominators".to_string(),
-        "frac" => "Fractions".to_string(),
-        "calt" => "Contextual Alternates".to_string(),
-        _ => format!("Feature {}", tag),
-    }
-}

crates/grida-canvas/examples/bench_cache_picture.rs

@@ -216,9 +216,6 @@ fn main() {
     let surface = unsafe { &mut *surface_ptr };
     let size = window.inner_size();
     let scene = CachedScene::new(size.width as f32, size.height as f32);
-    let mut camera_x = 0.0;
-    let mut camera_y = 0.0;
-    let mut zoom = 1.0;
     let start_time = Instant::now();
     let mut frame_count = 0;
     let mut last_fps_time = Instant::now();
@@ -246,12 +243,12 @@ fn main() {
                 let now = Instant::now();
                 let elapsed = now.duration_since(start_time).as_secs_f32();
                 let angle = elapsed * 2.0;
-                camera_x = angle.cos() * 100.0;
-                camera_y = angle.sin() * 100.0;
+                let camera_x = angle.cos() * 100.0;
+                let camera_y = angle.sin() * 100.0;
 
                 // Add zoom animation
                 let zoom_angle = elapsed * 1.0; // Slower zoom cycle
-                zoom = 1.0 + zoom_angle.sin() * 0.5; // Oscillate between 0.5 and 1.5
+                let zoom = 1.0 + zoom_angle.sin() * 0.5; // Oscillate between 0.5 and 1.5
 
                 // Clear and render
                 let canvas = surface.canvas();

crates/grida-canvas/examples/golden_type_line_height.rs

@@ -253,7 +253,6 @@ fn main() {
         let x = start_x + (i as f32) * (col_width + col_spacing);
         draw_text_block(canvas, x, y_pos, col_width, label, line_height.clone());
     }
-    y_pos += row_height + section_spacing;
 
     // Save the result
     let image = surface.image_snapshot();

crates/grida-canvas/examples/grida_fills.rs

@@ -38,7 +38,10 @@ async fn demo_fills() -> Scene {
         Paint::from(CGColor(0, 0, 255, 255)),
     ]);
     multi_solid_rect.stroke_width = 3.0;
-    graph.append_child(Node::Rectangle(multi_solid_rect), Parent::NodeId(root_id.clone()));
+    graph.append_child(
+        Node::Rectangle(multi_solid_rect),
+        Parent::NodeId(root_id.clone()),
+    );
 
     // 2. Rectangle with solid + linear gradient fills
     let mut solid_gradient_rect = nf.create_rectangle_node();
@@ -69,7 +72,10 @@ async fn demo_fills() -> Scene {
         }),
     ]);
     solid_gradient_rect.stroke_width = 3.0;
-    graph.append_child(Node::Rectangle(solid_gradient_rect), Parent::NodeId(root_id.clone()));
+    graph.append_child(
+        Node::Rectangle(solid_gradient_rect),
+        Parent::NodeId(root_id.clone()),
+    );
 
     // 3. Rectangle with solid + radial gradient fills
     let mut solid_radial_rect = nf.create_rectangle_node();
@@ -104,7 +110,10 @@ async fn demo_fills() -> Scene {
         }),
     ]);
     solid_radial_rect.stroke_width = 3.0;
-    graph.append_child(Node::Rectangle(solid_radial_rect), Parent::NodeId(root_id.clone()));
+    graph.append_child(
+        Node::Rectangle(solid_radial_rect),
+        Parent::NodeId(root_id.clone()),
+    );
 
     // 4. Rectangle with linear + radial gradient fills
     let mut gradient_gradient_rect = nf.create_rectangle_node();
@@ -152,7 +161,10 @@ async fn demo_fills() -> Scene {
         }),
     ]);
     gradient_gradient_rect.stroke_width = 3.0;
-    graph.append_child(Node::Rectangle(gradient_gradient_rect), Parent::NodeId(root_id.clone()));
+    graph.append_child(
+        Node::Rectangle(gradient_gradient_rect),
+        Parent::NodeId(root_id.clone()),
+    );
 
     // 5. Ellipse with multiple radial gradients (concentric circles effect)
     let mut multi_radial_ellipse = nf.create_ellipse_node();
@@ -213,7 +225,10 @@ async fn demo_fills() -> Scene {
         }),
     ]);
     multi_radial_ellipse.stroke_width = 3.0;
-    graph.append_child(Node::Ellipse(multi_radial_ellipse), Parent::NodeId(root_id.clone()));
+    graph.append_child(
+        Node::Ellipse(multi_radial_ellipse),
+        Parent::NodeId(root_id.clone()),
+    );
 
     // 6. Polygon with solid + linear gradient + radial gradient
     let pentagon_points = (0..5)
@@ -268,7 +283,10 @@ async fn demo_fills() -> Scene {
         }),
     ]);
     complex_fill_polygon.stroke_width = 4.0;
-    graph.append_child(Node::Polygon(complex_fill_polygon), Parent::NodeId(root_id.clone()));
+    graph.append_child(
+        Node::Polygon(complex_fill_polygon),
+        Parent::NodeId(root_id.clone()),
+    );
 
     // 7. Regular polygon with multiple linear gradients at different angles
     let mut multi_linear_polygon = nf.create_regular_polygon_node();
@@ -331,7 +349,10 @@ async fn demo_fills() -> Scene {
         }),
     ]);
     multi_linear_polygon.stroke_width = 3.0;
-    graph.append_child(Node::RegularPolygon(multi_linear_polygon), Parent::NodeId(root_id.clone()));
+    graph.append_child(
+        Node::RegularPolygon(multi_linear_polygon),
+        Parent::NodeId(root_id.clone()),
+    );
 
     // 8. Container with multiple fills (demonstrating container fill capability)
     let mut multi_fill_container = nf.create_container_node();
@@ -366,7 +387,10 @@ async fn demo_fills() -> Scene {
         }),
     ]);
     multi_fill_container.stroke_width = 3.0;
-    graph.append_child(Node::Container(multi_fill_container), Parent::NodeId(root_id.clone()));
+    graph.append_child(
+        Node::Container(multi_fill_container),
+        Parent::NodeId(root_id.clone()),
+    );
 
     Scene {
         name: "Fills Demo".to_string(),

crates/grida-canvas/examples/grida_shapes.rs

@@ -42,7 +42,10 @@ async fn demo_shapes() -> Scene {
             200 - (i * 20) as u8,
             255,
         ))); // Fading gray
-        graph.append_child(Node::Rectangle(rect), Parent::NodeId(root_container_id.clone()));
+        graph.append_child(
+            Node::Rectangle(rect),
+            Parent::NodeId(root_container_id.clone()),
+        );
     }
 
     // Ellipse Row - demonstrating width/height ratio variations
@@ -60,7 +63,10 @@ async fn demo_shapes() -> Scene {
             200 - (i * 20) as u8,
             255,
         ))]); // Fading gray
-        graph.append_child(Node::Ellipse(ellipse), Parent::NodeId(root_container_id.clone()));
+        graph.append_child(
+            Node::Ellipse(ellipse),
+            Parent::NodeId(root_container_id.clone()),
+        );
     }
 
     // Polygon Row - demonstrating point count variations
@@ -88,7 +94,10 @@ async fn demo_shapes() -> Scene {
             200 - (i * 20) as u8,
             255,
         ))]); // Fading gray
-        graph.append_child(Node::Polygon(polygon), Parent::NodeId(root_container_id.clone()));
+        graph.append_child(
+            Node::Polygon(polygon),
+            Parent::NodeId(root_container_id.clone()),
+        );
     }
 
     // Regular Polygon Row - demonstrating point count variations
@@ -108,7 +117,10 @@ async fn demo_shapes() -> Scene {
             255,
         ))]); // Fading gray
         regular_polygon.corner_radius = 8.0;
-        graph.append_child(Node::RegularPolygon(regular_polygon), Parent::NodeId(root_container_id.clone()));
+        graph.append_child(
+            Node::RegularPolygon(regular_polygon),
+            Parent::NodeId(root_container_id.clone()),
+        );
     }
 
     // Path Row - demonstrating different path patterns
@@ -135,7 +147,10 @@ async fn demo_shapes() -> Scene {
             200 - (i * 20) as u8,
             255,
         ))]); // Fading gray
-        graph.append_child(Node::SVGPath(path), Parent::NodeId(root_container_id.clone()));
+        graph.append_child(
+            Node::SVGPath(path),
+            Parent::NodeId(root_container_id.clone()),
+        );
     }
 
     // Star Polygon Row - demonstrating different point counts and inner radius variations
@@ -156,7 +171,10 @@ async fn demo_shapes() -> Scene {
             255,
         ))]); // Fading gray
         star.corner_radius = 8.0;
-        graph.append_child(Node::RegularStarPolygon(star), Parent::NodeId(root_container_id.clone()));
+        graph.append_child(
+            Node::RegularStarPolygon(star),
+            Parent::NodeId(root_container_id.clone()),
+        );
     }
 
     // Arc Row - demonstrating different angle variations
@@ -178,7 +196,10 @@ async fn demo_shapes() -> Scene {
             255,
         ))]); // Fading gray
         arc.corner_radius = Some(8.0);
-        graph.append_child(Node::Ellipse(arc), Parent::NodeId(root_container_id.clone()));
+        graph.append_child(
+            Node::Ellipse(arc),
+            Parent::NodeId(root_container_id.clone()),
+        );
     }
 
     Scene {

crates/grida-canvas/examples/grida_shapes_ellipse.rs

@@ -39,7 +39,10 @@ async fn demo_ellipses() -> Scene {
             200 + (i * 5) as u8,
             255,
         ))]); // Blue gradient
-        graph.append_child(Node::Ellipse(ellipse), Parent::NodeId(root_container_id.clone()));
+        graph.append_child(
+            Node::Ellipse(ellipse),
+            Parent::NodeId(root_container_id.clone()),
+        );
     }
 
     // Row 2: Ellipses with different inner radius (rings)
@@ -58,7 +61,10 @@ async fn demo_ellipses() -> Scene {
             50 + (i * 20) as u8,
             255,
         ))]); // Orange gradient
-        graph.append_child(Node::Ellipse(ring), Parent::NodeId(root_container_id.clone()));
+        graph.append_child(
+            Node::Ellipse(ring),
+            Parent::NodeId(root_container_id.clone()),
+        );
     }
 
     // Row 3: Arcs with different angles
@@ -78,7 +84,10 @@ async fn demo_ellipses() -> Scene {
             100 + (i * 15) as u8,
             255,
         ))]); // Green gradient
-        graph.append_child(Node::Ellipse(arc), Parent::NodeId(root_container_id.clone()));
+        graph.append_child(
+            Node::Ellipse(arc),
+            Parent::NodeId(root_container_id.clone()),
+        );
     }
 
     // Row 4: Arcs with inner radius (donut arcs)
@@ -99,7 +108,10 @@ async fn demo_ellipses() -> Scene {
             150 + (i * 12) as u8,
             255,
         ))]); // Purple gradient
-        graph.append_child(Node::Ellipse(donut_arc), Parent::NodeId(root_container_id.clone()));
+        graph.append_child(
+            Node::Ellipse(donut_arc),
+            Parent::NodeId(root_container_id.clone()),
+        );
     }
 
     // Row 5: Ellipses with strokes
@@ -119,7 +131,10 @@ async fn demo_ellipses() -> Scene {
             255,
         ))]); // Red gradient stroke
         stroke_ellipse.stroke_width = 3.0 + (i as f32 * 2.0); // 3 to 17 stroke weight
-        graph.append_child(Node::Ellipse(stroke_ellipse), Parent::NodeId(root_container_id.clone()));
+        graph.append_child(
+            Node::Ellipse(stroke_ellipse),
+            Parent::NodeId(root_container_id.clone()),
+        );
     }
 
     Scene {