Add 2x to blade.

huacnlee · Nov 26, 2024 · 5f895fd · 5f895fd
1 parent e9e430d
commit 5f895fd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/crates/gpui/examples/painting.rs b/crates/gpui/examples/painting.rs
@@ -19,7 +19,7 @@ impl PaintingViewer {
         path.line_to(point(px(60.), px(100.)));
         path.line_to(point(px(80.), px(140.)));
         // go back to close the path
-        path.line_to(point(px(81.), px(141.)));
+        path.move_to(point(px(81.), px(141.)));
         path.line_to(point(px(60.), px(101.)));
         path.line_to(point(px(50.), px(161.)));
         path.line_to(point(px(20.), px(101.)));

diff --git a/crates/gpui/src/platform/blade/blade_renderer.rs b/crates/gpui/src/platform/blade/blade_renderer.rs
@@ -5,7 +5,7 @@ use super::{BladeAtlas, PATH_TEXTURE_FORMAT};
 use crate::{
     AtlasTextureKind, AtlasTile, Bounds, ContentMask, DevicePixels, GPUSpecs, Hsla,
     MonochromeSprite, Path, PathId, PathVertex, PolychromeSprite, PrimitiveBatch, Quad,
-    ScaledPixels, Scene, Shadow, Size, Underline,
+    ScaledPixels, Scene, Shadow, Size, Underline, PATH_SUBPIXEL_VARIANTS,
 };
 use bytemuck::{Pod, Zeroable};
 use collections::HashMap;
@@ -622,12 +622,19 @@ impl BladeRenderer {
                         for path in paths {
                             let tile = &self.path_tiles[&path.id];
                             let tex_info = self.atlas.get_texture_info(tile.texture_id);
-                            let origin = path.bounds.intersect(&path.content_mask.bounds).origin;
+                            let origin = path
+                                .bounds
+                                .intersect(&path.content_mask.bounds)
+                                .origin
+                                .map(|p| (p / PATH_SUBPIXEL_VARIANTS).floor());
+                            let size = tile
+                                .bounds
+                                .size
+                                .map(|s| s / PATH_SUBPIXEL_VARIANTS as i32)
+                                .map(Into::into);
+
                             let sprites = [PathSprite {
-                                bounds: Bounds {
-                                    origin: origin.map(|p| p.floor()),
-                                    size: tile.bounds.size.map(Into::into),
-                                },
+                                bounds: Bounds { origin, size },
                                 color: path.color,
                                 tile: (*tile).clone(),
                             }];

diff --git a/crates/gpui/src/platform/mac/metal_renderer.rs b/crates/gpui/src/platform/mac/metal_renderer.rs
@@ -739,10 +739,11 @@ impl MetalRenderer {
                         .intersect(&path.content_mask.bounds)
                         .origin
                         .map(|p| (p / PATH_SUBPIXEL_VARIANTS).floor());
-                    let size = path
+                    let size = tile
                         .bounds
                         .size
-                        .map(|s| (s / PATH_SUBPIXEL_VARIANTS).floor());
+                        .map(|s| s / PATH_SUBPIXEL_VARIANTS as i32)
+                        .map(Into::into);
                     sprites.push(PathSprite {
                         bounds: Bounds { origin, size },
                         color: path.color,