diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/main.rs | 5 | ||||
-rw-r--r-- | src/text.rs | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/main.rs b/src/main.rs index 74a5058c..31e3586a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -26,8 +26,11 @@ fn main() { gl::Viewport(0, 0, width as i32, height as i32); } + let (dpi_x, dpi_y) = window.get_dpi().unwrap(); + let dpr = window.hidpi_factor(); + let desc = FontDesc::new("Ubuntu Mono", "Regular"); - let mut rasterizer = text::Rasterizer::new(); + let mut rasterizer = text::Rasterizer::new(dpi_x, dpi_y, dpr); let glyph_r = Glyph::new(&rasterizer.get_glyph(&desc, 180., 'R')); let glyph_u = Glyph::new(&rasterizer.get_glyph(&desc, 180., 'u')); diff --git a/src/text.rs b/src/text.rs index 8f5216e6..bd884ad3 100644 --- a/src/text.rs +++ b/src/text.rs @@ -10,6 +10,9 @@ pub struct Rasterizer { faces: HashMap<FontDesc, Face<'static>>, library: Library, system_fonts: HashMap<String, ::list_fonts::Family>, + dpi_x: u32, + dpi_y: u32, + dpr: f32, } #[inline] @@ -35,13 +38,16 @@ impl FontDesc { } impl Rasterizer { - pub fn new() -> Rasterizer { + pub fn new(dpi_x: f32, dpi_y: f32, device_pixel_ratio: f32) -> Rasterizer { let library = Library::init().unwrap(); Rasterizer { system_fonts: get_font_families(), faces: HashMap::new(), library: library, + dpi_x: dpi_x as u32, + dpi_y: dpi_y as u32, + dpr: device_pixel_ratio, } } @@ -66,7 +72,7 @@ impl Rasterizer { pub fn get_glyph(&mut self, desc: &FontDesc, size: f32, c: char) -> RasterizedGlyph { let face = self.get_face(desc).expect("TODO handle get_face error"); // TODO DPI - face.set_char_size(to_freetype_26_6(size), 0, 96, 0).unwrap(); + face.set_char_size(to_freetype_26_6(size * self.dpr), 0, self.dpi_x, self.dpi_y).unwrap(); face.load_char(c as usize, freetype::face::RENDER).unwrap(); let glyph = face.glyph(); |