From cf911cef28720b25938ac19095bcd2b979806b1c Mon Sep 17 00:00:00 2001 From: Jonathan Turner Date: Mon, 20 Mar 2017 11:46:02 +1300 Subject: [PATCH 1/2] Change windows font metrics --- components/gfx/platform/windows/font.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/gfx/platform/windows/font.rs b/components/gfx/platform/windows/font.rs index d45ac25edd3..eff93d7e5f5 100644 --- a/components/gfx/platform/windows/font.rs +++ b/components/gfx/platform/windows/font.rs @@ -372,7 +372,7 @@ impl FontHandleMethods for FontHandle { descent: au_from_du_s(dm.descent as i32), max_advance: au_from_pt(0.0), // FIXME average_advance: au_from_pt(0.0), // FIXME - line_gap: au_from_du(dm.lineGap as i32), + line_gap: au_from_du((dm.ascent + dm.descent + dm.lineGap as u16) as i32), }; debug!("Font metrics (@{} pt): {:?}", self.em_size * 12., metrics); metrics From f38bab454aa032755ebf05e49f8490af0cb21f8b Mon Sep 17 00:00:00 2001 From: Jonathan Turner Date: Mon, 20 Mar 2017 14:14:19 +1300 Subject: [PATCH 2/2] Update browserhtml dep --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 72065507be0..96ab041bec4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -251,7 +251,7 @@ dependencies = [ [[package]] name = "browserhtml" version = "0.1.17" -source = "git+https://github.com/browserhtml/browserhtml?branch=crate#cd5374a970fd404377ab418ac1e4a358db47691f" +source = "git+https://github.com/browserhtml/browserhtml?branch=crate#7c66ae9a3e29d35230d5b9f16d19a562b1312c87" [[package]] name = "build-apk"