Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Use a computed type for page-size which converts paper sizes to a Size2D

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D115842
This commit is contained in:
Emily McDonough 2023-05-22 09:50:52 +02:00 • committed by Oriol Brufau
parent 4f0e0c888c
commit c9d4f812e5
2 changed files with 100 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

63
components/style/values/generics/page.rs
View file

@ -4,22 +4,14 @@
//! @page at-rule properties
use crate::values::generics::NonNegative;
use crate::values::specified::length::AbsoluteLength;
/// Page size names.
///
/// https://drafts.csswg.org/css-page-3/#typedef-page-size-page-size
#[derive(
Clone,
Copy,
Debug,
Eq,
MallocSizeOf,
Parse,
PartialEq,
SpecifiedValueInfo,
ToComputedValue,
ToCss,
ToResolvedValue,
ToShmem,
Clone, Copy, Debug, Eq, MallocSizeOf, Parse, PartialEq, SpecifiedValueInfo, ToCss, ToShmem,
)]
#[repr(u8)]
pub enum PaperSize {
@ -45,6 +37,39 @@ pub enum PaperSize {
Ledger,
}
impl PaperSize {
/// Gets the long edge length of the paper size
pub fn long_edge(&self) -> NonNegative<AbsoluteLength> {
NonNegative(match *self {
PaperSize::A5 => AbsoluteLength::Mm(210.0),
PaperSize::A4 => AbsoluteLength::Mm(297.0),
PaperSize::A3 => AbsoluteLength::Mm(420.0),
PaperSize::B5 => AbsoluteLength::Mm(250.0),
PaperSize::B4 => AbsoluteLength::Mm(353.0),
PaperSize::JisB5 => AbsoluteLength::Mm(257.0),
PaperSize::JisB4 => AbsoluteLength::Mm(364.0),
PaperSize::Letter => AbsoluteLength::In(11.0),
PaperSize::Legal => AbsoluteLength::In(14.0),
PaperSize::Ledger => AbsoluteLength::In(17.0),
})
}
/// Gets the short edge length of the paper size
pub fn short_edge(&self) -> NonNegative<AbsoluteLength> {
NonNegative(match *self {
PaperSize::A5 => AbsoluteLength::Mm(148.0),
PaperSize::A4 => AbsoluteLength::Mm(210.0),
PaperSize::A3 => AbsoluteLength::Mm(297.0),
PaperSize::B5 => AbsoluteLength::Mm(176.0),
PaperSize::B4 => AbsoluteLength::Mm(250.0),
PaperSize::JisB5 => AbsoluteLength::Mm(182.0),
PaperSize::JisB4 => AbsoluteLength::Mm(257.0),
PaperSize::Letter => AbsoluteLength::In(8.5),
PaperSize::Legal => AbsoluteLength::In(8.5),
PaperSize::Ledger => AbsoluteLength::In(11.0),
})
}
}
/// Paper orientation
///
/// https://drafts.csswg.org/css-page-3/#page-size-prop
@ -57,7 +82,6 @@ pub enum PaperSize {
Parse,
PartialEq,
SpecifiedValueInfo,
ToComputedValue,
ToCss,
ToResolvedValue,
ToShmem,
@ -73,18 +97,7 @@ pub enum Orientation {
/// Page size property
///
/// https://drafts.csswg.org/css-page-3/#page-size-prop
#[derive(
Clone,
Copy,
Debug,
MallocSizeOf,
PartialEq,
SpecifiedValueInfo,
ToComputedValue,
ToCss,
ToResolvedValue,
ToShmem,
)]
#[derive(Clone, Copy, Debug, MallocSizeOf, PartialEq, SpecifiedValueInfo, ToCss, ToShmem)]
#[repr(C, u8)]
pub enum GenericPageSize<S> {
/// Page dimensions.