zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-20 02:47:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Checkpoint: Glyphs rendering how I'd like

Browse Source
This commit is contained in:
Nathan Sobo 2023-10-03 17:29:36 -06:00
parent 550d9a9f71
commit c57e19c8fa
6 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/gpui/src/platform/mac/atlas.rs
View File

@ -147,10 +147,10 @@ impl Atlas {
bounds.size().y() as u64,
);
self.texture.replace_region(
dbg!(region),
region,
0,
bytes.as_ptr() as *const _,
dbg!((bounds.size().x() * self.bytes_per_pixel() as i32) as u64),
(bounds.size().x() * self.bytes_per_pixel() as i32) as u64,
);
}

1
crates/gpui/src/platform/mac/renderer.rs
View File

@ -633,7 +633,6 @@ impl Renderer {
// Snap sprite to pixel grid.
let origin = (glyph.origin * scale_factor).floor() + sprite.offset.to_f32();
dbg!(origin);
sprites_by_atlas
.entry(sprite.atlas_id)
.or_insert_with(Vec::new)

2
crates/gpui3/src/platform/mac/metal_renderer.rs
View File

@ -49,7 +49,6 @@ const SHADERS_METALLIB: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/shader
const INSTANCE_BUFFER_SIZE: usize = 8192 * 1024; // This is an arbitrary decision. There's probably a more optimal value.
pub struct MetalRenderer {
device: metal::Device,
layer: metal::MetalLayer,
command_queue: CommandQueue,
quads_pipeline_state: metal::RenderPipelineState,
@ -145,7 +144,6 @@ impl MetalRenderer {
));
Self {
device,
layer,
command_queue,
quads_pipeline_state,

8
crates/gpui3/src/window.rs
View File

@ -192,14 +192,14 @@ impl<'a, 'w> WindowContext<'a, 'w> {
let raster_bounds = self.text_system().raster_bounds(&params)?;
if !raster_bounds.is_zero() {
let layer_id = self.current_layer_id();
let bounds = Bounds {
origin: glyph_origin.map(|px| px.floor()) + raster_bounds.origin.map(Into::into),
size: raster_bounds.size.map(Into::into),
};
let tile = self
.window
.glyph_atlas
.get_or_insert_with(&params, &mut || self.text_system().rasterize_glyph(&params))?;
let bounds = Bounds {
origin: glyph_origin.map(|px| px.floor()) + raster_bounds.origin.map(Into::into),
size: tile.bounds.size.map(Into::into),
};
self.window.scene.insert(
layer_id,

2
crates/storybook/src/workspace.rs
View File

@ -26,7 +26,7 @@ impl WorkspaceElement {
.font("Helvetica")
.text_base()
.text_color(black())
.child("Hey");
.child("The quick brown fox ran over the lazy dog.");
// div()
// .size_full()

5
crates/storybook2/src/workspace.rs
View File

@ -33,14 +33,11 @@ impl Workspace {
.text_base()
.fill(white())
.text_color(black())
.child("Hey")
.child("The quick brown fox ran over the lazy dog.")
// TODO: Implement style.
//.size_full().fill(gpui3::hsla(0.83, 1., 0.5, 1.))
// TODO: Debug font not font.
//.child("Is this thing on?")
// themed(rose_pine_dawn(), cx, |cx| {
// div()
// .size_full()