Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "more fixes and debugging"

Browse source 
This reverts commit 2fb31a9157.
This commit is contained in:
Junkui Zhang 2025-07-22 22:18:17 +08:00
parent 9d8ef8156d
commit 347b863ac6
2 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

36
crates/gpui/examples/text.rs
View file

@ -270,27 +270,27 @@ impl Render for TextExample {
.overflow_x_hidden()
.bg(rgb(0xffffff))
.size_full()
// .child(div().child(CharacterGrid::new().scale(base)))
.child(div().child(CharacterGrid::new().scale(base)))
.child(
div()
// .child(Specimen::new(self.next_id()).scale(step_down_2))
// .child(Specimen::new(self.next_id()).scale(step_down_2).invert())
// .child(Specimen::new(self.next_id()).scale(step_down_1))
// .child(Specimen::new(self.next_id()).scale(step_down_1).invert())
.child(Specimen::new(self.next_id()).scale(step_down_2))
.child(Specimen::new(self.next_id()).scale(step_down_2).invert())
.child(Specimen::new(self.next_id()).scale(step_down_1))
.child(Specimen::new(self.next_id()).scale(step_down_1).invert())
.child(Specimen::new(self.next_id()).scale(base))
// .child(Specimen::new(self.next_id()).scale(base).invert())
// .child(Specimen::new(self.next_id()).scale(step_up_1))
// .child(Specimen::new(self.next_id()).scale(step_up_1).invert())
// .child(Specimen::new(self.next_id()).scale(step_up_2))
// .child(Specimen::new(self.next_id()).scale(step_up_2).invert())
// .child(Specimen::new(self.next_id()).scale(step_up_3))
// .child(Specimen::new(self.next_id()).scale(step_up_3).invert())
// .child(Specimen::new(self.next_id()).scale(step_up_4))
// .child(Specimen::new(self.next_id()).scale(step_up_4).invert())
// .child(Specimen::new(self.next_id()).scale(step_up_5))
// .child(Specimen::new(self.next_id()).scale(step_up_5).invert())
// .child(Specimen::new(self.next_id()).scale(step_up_6))
// .child(Specimen::new(self.next_id()).scale(step_up_6).invert()),
.child(Specimen::new(self.next_id()).scale(base).invert())
.child(Specimen::new(self.next_id()).scale(step_up_1))
.child(Specimen::new(self.next_id()).scale(step_up_1).invert())
.child(Specimen::new(self.next_id()).scale(step_up_2))
.child(Specimen::new(self.next_id()).scale(step_up_2).invert())
.child(Specimen::new(self.next_id()).scale(step_up_3))
.child(Specimen::new(self.next_id()).scale(step_up_3).invert())
.child(Specimen::new(self.next_id()).scale(step_up_4))
.child(Specimen::new(self.next_id()).scale(step_up_4).invert())
.child(Specimen::new(self.next_id()).scale(step_up_5))
.child(Specimen::new(self.next_id()).scale(step_up_5).invert())
.child(Specimen::new(self.next_id()).scale(step_up_6))
.child(Specimen::new(self.next_id()).scale(step_up_6).invert()),
),
)
.child(div().w(px(240.)).h_full().bg(colors.container))

7
crates/gpui/src/platform/windows/direct_write.rs
View file

@ -810,13 +810,14 @@ impl DirectWriteState {
}
// Resize to match expected bitmap_size if needed
let expected_size = bitmap_size.width.0 as usize * bitmap_size.height.0 as usize * 4;
rgba_data.resize(expected_size, 0);
Ok((bitmap_size, rgba_data))
} else {
// For regular text, use grayscale or cleartype
let texture_type = DWRITE_TEXTURE_CLEARTYPE_3x1;
let texture_bounds = unsafe { glyph_analysis.GetAlphaTextureBounds(texture_type)? };
println!("glyph id: {:?}, variant: {:?}, size: {:?}, texture_bounds: {:?}", glyph_id, params.subpixel_variant, bitmap_size, texture_bounds);
let width = (texture_bounds.right - texture_bounds.left) as u32;
let height = (texture_bounds.bottom - texture_bounds.top) as u32;
@ -847,10 +848,10 @@ impl DirectWriteState {
}
// Resize to match expected bitmap_size if needed
let expected_size = width as usize * height as usize;
let expected_size = bitmap_size.width.0 as usize * bitmap_size.height.0 as usize;
grayscale_data.resize(expected_size, 0);
Ok((size(DevicePixels(width as i32), DevicePixels(height as i32)), grayscale_data))
Ok((bitmap_size, grayscale_data))
}
}