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

Revert "make it not crash"

Browse source 
This reverts commit a7e34ab0bc.
This commit is contained in:
Junkui Zhang 2025-07-22 22:18:18 +08:00
parent 347b863ac6
commit 18937f5756
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -634,7 +634,7 @@ impl DirectWriteState {
let advance = [0.0f32]; let advance = [0.0f32];
let offset = [DWRITE_GLYPH_OFFSET::default()]; let offset = [DWRITE_GLYPH_OFFSET::default()];
let glyph_run = DWRITE_GLYPH_RUN { let glyph_run = DWRITE_GLYPH_RUN {
fontFace: unsafe { std::mem::transmute_copy(&font.font_face) }, fontFace: ManuallyDrop::new(Some(font.font_face.cast()?)),
fontEmSize: params.font_size.0, fontEmSize: params.font_size.0,
glyphCount: 1, glyphCount: 1,
glyphIndices: glyph_id.as_ptr(), glyphIndices: glyph_id.as_ptr(),
@ -644,6 +644,7 @@ impl DirectWriteState {
bidiLevel: 0, bidiLevel: 0,
}; };
let transform = DWRITE_MATRIX::default();
let rendering_mode = DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC; let rendering_mode = DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC;
let measuring_mode = DWRITE_MEASURING_MODE_NATURAL; let measuring_mode = DWRITE_MEASURING_MODE_NATURAL;
let baseline_origin_x = 0.0; let baseline_origin_x = 0.0;
@ -652,7 +653,7 @@ impl DirectWriteState {
let glyph_analysis = unsafe { let glyph_analysis = unsafe {
self.components.factory.CreateGlyphRunAnalysis( self.components.factory.CreateGlyphRunAnalysis(
&glyph_run, &glyph_run,
None, Some(&transform as *const _),
rendering_mode, rendering_mode,
measuring_mode, measuring_mode,
DWRITE_GRID_FIT_MODE_DEFAULT, DWRITE_GRID_FIT_MODE_DEFAULT,
@ -829,7 +830,7 @@ impl DirectWriteState {
)); ));
} }
let mut alpha_data = vec![0u8; (width * height * 3) as usize]; let mut alpha_data = vec![0u8; (width * height) as usize];
unsafe { unsafe {
glyph_analysis.CreateAlphaTexture( glyph_analysis.CreateAlphaTexture(