Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

style: fix formatting.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2020-06-18 20:27:58 +02:00
parent 97f29c893f
commit bb8c3ee8ba
No known key found for this signature in database
GPG key ID: E1152D0994E4BF8A
4 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/canvas/canvas_data.rs
View file

@ -11,7 +11,7 @@ use euclid::{point2, vec2};
use font_kit::family_name::FamilyName;
use font_kit::font::Font;
use font_kit::metrics::Metrics;
use font_kit::properties::{Properties, Weight, Stretch, Style};
use font_kit::properties::{Properties, Stretch, Style, Weight};
use font_kit::source::SystemSource;
use gfx::font::FontHandleMethods;
use gfx::font_cache_thread::FontCacheThread;
@ -1385,9 +1385,7 @@ fn to_font_kit_family(font_family: &font::SingleFontFamily) -> FamilyName {
font::GenericFontFamily::Monospace => FamilyName::Monospace,
font::GenericFontFamily::Fantasy => FamilyName::Fantasy,
font::GenericFontFamily::Cursive => FamilyName::Cursive,
font::GenericFontFamily::None => {
unreachable!("Shouldn't appear in computed values")
},
font::GenericFontFamily::None => unreachable!("Shouldn't appear in computed values"),
},
}
}
@ -1411,7 +1409,7 @@ fn load_system_font_from_style(font_style: Option<&FontStyleStruct>) -> Font {
font::FontStyle::Oblique(..) => {
// TODO: support oblique angle.
Style::Oblique
}
},
})
.weight(Weight(style.font_weight.0))
.stretch(Stretch(style.font_stretch.value()));