diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/Cargo.toml | 5 | ||||
| -rw-r--r-- | core/README.md | 2 | ||||
| -rw-r--r-- | core/src/content_fit.rs | 119 | ||||
| -rw-r--r-- | core/src/lib.rs | 3 | ||||
| -rw-r--r-- | core/src/time.rs | 9 |
5 files changed, 136 insertions, 2 deletions
diff --git a/core/Cargo.toml b/core/Cargo.toml index a0aba80e..a8d50801 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -2,7 +2,7 @@ name = "iced_core" version = "0.4.0" authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"] -edition = "2018" +edition = "2021" description = "The essential concepts of Iced" license = "MIT" repository = "https://github.com/iced-rs/iced" @@ -13,3 +13,6 @@ bitflags = "1.2" [dependencies.palette] version = "0.6" optional = true + +[target.'cfg(target_arch = "wasm32")'.dependencies] +wasm-timer = { version = "0.2" } diff --git a/core/README.md b/core/README.md index c16eb779..bbb7983c 100644 --- a/core/README.md +++ b/core/README.md @@ -2,7 +2,7 @@ [][documentation] [](https://crates.io/crates/iced_core) [](https://github.com/iced-rs/iced/blob/master/LICENSE) -[](https://iced.zulipchat.com) +[](https://discord.gg/3xZJ65GAhd) `iced_core` holds basic reusable types of the public API. For instance, basic data types like `Point`, `Rectangle`, `Length`, etc. diff --git a/core/src/content_fit.rs b/core/src/content_fit.rs new file mode 100644 index 00000000..6bbedc7a --- /dev/null +++ b/core/src/content_fit.rs @@ -0,0 +1,119 @@ +//! Control the fit of some content (like an image) within a space. +use crate::Size; + +/// The strategy used to fit the contents of a widget to its bounding box. +/// +/// Each variant of this enum is a strategy that can be applied for resolving +/// differences in aspect ratio and size between the image being displayed and +/// the space its being displayed in. +/// +/// For an interactive demonstration of these properties as they are implemented +/// in CSS, see [Mozilla's docs][1], or run the `tour` example +/// +/// [1]: https://developer.mozilla.org/en-US/docs/Web/CSS/object-fit +#[derive(Debug, Hash, Clone, Copy, PartialEq, Eq)] +pub enum ContentFit { + /// Scale as big as it can be without needing to crop or hide parts. + /// + /// The image will be scaled (preserving aspect ratio) so that it just fits + /// within the window. This won't distort the image or crop/hide any edges, + /// but if the image doesn't fit perfectly, there may be whitespace on the + /// top/bottom or left/right. + /// + /// This is a great fit for when you need to display an image without losing + /// any part of it, particularly when the image itself is the focus of the + /// screen. + Contain, + + /// Scale the image to cover all of the bounding box, cropping if needed. + /// + /// This doesn't distort the image, and it ensures that the widget's area is + /// completely covered, but it might crop off a bit of the edges of the + /// widget, particularly when there is a big difference between the aspect + /// ratio of the widget and the aspect ratio of the image. + /// + /// This is best for when you're using an image as a background, or to fill + /// space, and any details of the image around the edge aren't too + /// important. + Cover, + + /// Distort the image so the widget is 100% covered without cropping. + /// + /// This stretches the image to fit the widget, without any whitespace or + /// cropping. However, because of the stretch, the image may look distorted + /// or elongated, particularly when there's a mismatch of aspect ratios. + Fill, + + /// Don't resize or scale the image at all. + /// + /// This will not apply any transformations to the provided image, but also + /// means that unless you do the math yourself, the widget's area will not + /// be completely covered, or the image might be cropped. + /// + /// This is best for when you've sized the image yourself. + None, + + /// Scale the image down if it's too big for the space, but never scale it + /// up. + /// + /// This works much like [`Contain`](Self::Contain), except that if the + /// image would have been scaled up, it keeps its original resolution to + /// avoid the bluring that accompanies upscaling images. + ScaleDown, +} + +impl ContentFit { + /// Attempt to apply the given fit for a content size within some bounds. + /// + /// The returned value is the recommended scaled size of the content. + pub fn fit(&self, content: Size, bounds: Size) -> Size { + let content_ar = content.width / content.height; + let bounds_ar = bounds.width / bounds.height; + + match self { + Self::Contain => { + if bounds_ar > content_ar { + Size { + width: content.width * bounds.height / content.height, + ..bounds + } + } else { + Size { + height: content.height * bounds.width / content.width, + ..bounds + } + } + } + Self::Cover => { + if bounds_ar < content_ar { + Size { + width: content.width * bounds.height / content.height, + ..bounds + } + } else { + Size { + height: content.height * bounds.width / content.width, + ..bounds + } + } + } + Self::Fill => bounds, + Self::None => content, + Self::ScaleDown => { + if bounds_ar > content_ar && bounds.height < content.height { + Size { + width: content.width * bounds.height / content.height, + ..bounds + } + } else if bounds.width < content.width { + Size { + height: content.height * bounds.width / content.width, + ..bounds + } + } else { + content + } + } + } + } +} diff --git a/core/src/lib.rs b/core/src/lib.rs index b76c6d20..3eb9f659 100644 --- a/core/src/lib.rs +++ b/core/src/lib.rs @@ -17,9 +17,11 @@ pub mod alignment; pub mod keyboard; pub mod mouse; +pub mod time; mod background; mod color; +mod content_fit; mod font; mod length; mod padding; @@ -31,6 +33,7 @@ mod vector; pub use alignment::Alignment; pub use background::Background; pub use color::Color; +pub use content_fit::ContentFit; pub use font::Font; pub use length::Length; pub use padding::Padding; diff --git a/core/src/time.rs b/core/src/time.rs new file mode 100644 index 00000000..f496d1a4 --- /dev/null +++ b/core/src/time.rs @@ -0,0 +1,9 @@ +//! Keep track of time, both in native and web platforms! + +#[cfg(target_arch = "wasm32")] +pub use wasm_timer::Instant; + +#[cfg(not(target_arch = "wasm32"))] +pub use std::time::Instant; + +pub use std::time::Duration; |