|
1 | 1 | use crate::{ |
2 | 2 | Bounds, DevicePixels, Font, FontFeatures, FontId, FontMetrics, FontRun, FontStyle, FontWeight, |
3 | 3 | GlyphId, LineLayout, Pixels, PlatformTextSystem, Point, RenderGlyphParams, SUBPIXEL_VARIANTS_X, |
4 | | - ShapedGlyph, ShapedRun, SharedString, Size, point, size, |
| 4 | + SUBPIXEL_VARIANTS_Y, ShapedGlyph, ShapedRun, SharedString, Size, point, size, |
5 | 5 | }; |
6 | 6 | use anyhow::{Context as _, Ok, Result}; |
7 | 7 | use collections::HashMap; |
@@ -274,9 +274,10 @@ impl CosmicTextSystemState { |
274 | 274 |
|
275 | 275 | fn raster_bounds(&mut self, params: &RenderGlyphParams) -> Result<Bounds<DevicePixels>> { |
276 | 276 | let font = &self.loaded_fonts[params.font_id.0].font; |
277 | | - let subpixel_shift = params |
278 | | - .subpixel_variant |
279 | | - .map(|v| v as f32 / (SUBPIXEL_VARIANTS_X as f32 * params.scale_factor)); |
| 277 | + let subpixel_shift = point( |
| 278 | + params.subpixel_variant.x as f32 / SUBPIXEL_VARIANTS_X as f32 / params.scale_factor, |
| 279 | + params.subpixel_variant.y as f32 / SUBPIXEL_VARIANTS_Y as f32 / params.scale_factor, |
| 280 | + ); |
280 | 281 | let image = self |
281 | 282 | .swash_cache |
282 | 283 | .get_image( |
@@ -309,9 +310,10 @@ impl CosmicTextSystemState { |
309 | 310 | } else { |
310 | 311 | let bitmap_size = glyph_bounds.size; |
311 | 312 | let font = &self.loaded_fonts[params.font_id.0].font; |
312 | | - let subpixel_shift = params |
313 | | - .subpixel_variant |
314 | | - .map(|v| v as f32 / (SUBPIXEL_VARIANTS_X as f32 * params.scale_factor)); |
| 313 | + let subpixel_shift = point( |
| 314 | + params.subpixel_variant.x as f32 / SUBPIXEL_VARIANTS_X as f32 / params.scale_factor, |
| 315 | + params.subpixel_variant.y as f32 / SUBPIXEL_VARIANTS_Y as f32 / params.scale_factor, |
| 316 | + ); |
315 | 317 | let mut image = self |
316 | 318 | .swash_cache |
317 | 319 | .get_image( |
|
0 commit comments