summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--examples/clock/src/main.rs1
-rw-r--r--examples/pane_grid/src/main.rs6
-rw-r--r--examples/pokedex/src/main.rs2
-rw-r--r--examples/svg/Cargo.toml1
-rw-r--r--examples/svg/src/main.rs26
-rw-r--r--native/src/layout/flex.rs5
-rw-r--r--native/src/widget/container.rs19
-rw-r--r--native/src/widget/image.rs15
-rw-r--r--native/src/widget/svg.rs80
-rw-r--r--web/src/widget/container.rs15
-rw-r--r--wgpu/src/image/vector.rs16
11 files changed, 128 insertions, 58 deletions
diff --git a/examples/clock/src/main.rs b/examples/clock/src/main.rs
index 1fd19bc6..d3a4261b 100644
--- a/examples/clock/src/main.rs
+++ b/examples/clock/src/main.rs
@@ -67,6 +67,7 @@ impl Application for Clock {
Container::new(canvas)
.width(Length::Fill)
.height(Length::Fill)
+ .padding(20)
.center_x()
.center_y()
.into()
diff --git a/examples/pane_grid/src/main.rs b/examples/pane_grid/src/main.rs
index dafc396c..b4bbd68f 100644
--- a/examples/pane_grid/src/main.rs
+++ b/examples/pane_grid/src/main.rs
@@ -106,11 +106,10 @@ impl Sandbox for Example {
.on_resize(Message::Resized)
.on_key_press(handle_hotkey);
- Column::new()
+ Container::new(pane_grid)
.width(Length::Fill)
.height(Length::Fill)
.padding(10)
- .push(pane_grid)
.into()
}
}
@@ -213,9 +212,10 @@ impl Content {
.push(Text::new(format!("Pane {}", id)).size(30))
.push(controls);
- Container::new(Column::new().padding(5).push(content))
+ Container::new(content)
.width(Length::Fill)
.height(Length::Fill)
+ .padding(5)
.center_y()
.style(style::Pane {
is_focused: focus.is_some(),
diff --git a/examples/pokedex/src/main.rs b/examples/pokedex/src/main.rs
index 600ef632..e7afa8f5 100644
--- a/examples/pokedex/src/main.rs
+++ b/examples/pokedex/src/main.rs
@@ -226,7 +226,7 @@ enum Error {
impl From<reqwest::Error> for Error {
fn from(error: reqwest::Error) -> Error {
- dbg!(&error);
+ dbg!(error);
Error::APIError
}
diff --git a/examples/svg/Cargo.toml b/examples/svg/Cargo.toml
index 161ee6a8..d8f83ac2 100644
--- a/examples/svg/Cargo.toml
+++ b/examples/svg/Cargo.toml
@@ -7,4 +7,3 @@ publish = false
[dependencies]
iced = { path = "../..", features = ["svg"] }
-env_logger = "0.7"
diff --git a/examples/svg/src/main.rs b/examples/svg/src/main.rs
index 811fdfb5..e19eeca2 100644
--- a/examples/svg/src/main.rs
+++ b/examples/svg/src/main.rs
@@ -1,19 +1,16 @@
-use iced::{Column, Container, Element, Length, Sandbox, Settings, Svg};
+use iced::{Container, Element, Length, Sandbox, Settings, Svg};
pub fn main() {
- env_logger::init();
-
Tiger::run(Settings::default())
}
-#[derive(Default)]
struct Tiger;
impl Sandbox for Tiger {
type Message = ();
fn new() -> Self {
- Self::default()
+ Tiger
}
fn title(&self) -> String {
@@ -23,18 +20,17 @@ impl Sandbox for Tiger {
fn update(&mut self, _message: ()) {}
fn view(&mut self) -> Element<()> {
- let content = Column::new().padding(20).push(
- Svg::new(format!(
- "{}/resources/tiger.svg",
- env!("CARGO_MANIFEST_DIR")
- ))
- .width(Length::Fill)
- .height(Length::Fill),
- );
-
- Container::new(content)
+ let svg = Svg::from_path(format!(
+ "{}/resources/tiger.svg",
+ env!("CARGO_MANIFEST_DIR")
+ ))
+ .width(Length::Fill)
+ .height(Length::Fill);
+
+ Container::new(svg)
.width(Length::Fill)
.height(Length::Fill)
+ .padding(20)
.center_x()
.center_y()
.into()
diff --git a/native/src/layout/flex.rs b/native/src/layout/flex.rs
index 2f65f1c1..9da75a21 100644
--- a/native/src/layout/flex.rs
+++ b/native/src/layout/flex.rs
@@ -171,8 +171,5 @@ where
let (width, height) = axis.pack(main - padding, cross);
let size = limits.resolve(Size::new(width, height));
- Node::with_children(
- Size::new(size.width + padding * 2.0, size.height + padding * 2.0),
- nodes,
- )
+ Node::with_children(size.pad(padding), nodes)
}
diff --git a/native/src/widget/container.rs b/native/src/widget/container.rs
index 11ef23a9..34032c3a 100644
--- a/native/src/widget/container.rs
+++ b/native/src/widget/container.rs
@@ -13,6 +13,7 @@ use std::u32;
/// It is normally used for alignment purposes.
#[allow(missing_debug_implementations)]
pub struct Container<'a, Message, Renderer: self::Renderer> {
+ padding: u16,
width: Length,
height: Length,
max_width: u32,
@@ -35,6 +36,7 @@ where
T: Into<Element<'a, Message, Renderer>>,
{
Container {
+ padding: 0,
width: Length::Shrink,
height: Length::Shrink,
max_width: u32::MAX,
@@ -46,6 +48,14 @@ where
}
}
+ /// Sets the padding of the [`Container`].
+ ///
+ /// [`Container`]: struct.Column.html
+ pub fn padding(mut self, units: u16) -> Self {
+ self.padding = units;
+ self
+ }
+
/// Sets the width of the [`Container`].
///
/// [`Container`]: struct.Container.html
@@ -137,19 +147,23 @@ where
renderer: &Renderer,
limits: &layout::Limits,
) -> layout::Node {
+ let padding = f32::from(self.padding);
+
let limits = limits
.loose()
.max_width(self.max_width)
.max_height(self.max_height)
.width(self.width)
- .height(self.height);
+ .height(self.height)
+ .pad(padding);
let mut content = self.content.layout(renderer, &limits.loose());
let size = limits.resolve(content.size());
+ content.move_to(Point::new(padding, padding));
content.align(self.horizontal_alignment, self.vertical_alignment, size);
- layout::Node::with_children(size, vec![content])
+ layout::Node::with_children(size.pad(padding), vec![content])
}
fn on_event(
@@ -191,6 +205,7 @@ where
fn hash_layout(&self, state: &mut Hasher) {
std::any::TypeId::of::<Container<'_, (), Renderer>>().hash(state);
+ self.padding.hash(state);
self.width.hash(state);
self.height.hash(state);
self.max_width.hash(state);
diff --git a/native/src/widget/image.rs b/native/src/widget/image.rs
index 9dc13fa9..0f38a90e 100644
--- a/native/src/widget/image.rs
+++ b/native/src/widget/image.rs
@@ -177,15 +177,12 @@ impl Handle {
}
}
-impl From<String> for Handle {
- fn from(path: String) -> Handle {
- Handle::from_path(path)
- }
-}
-
-impl From<&str> for Handle {
- fn from(path: &str) -> Handle {
- Handle::from_path(path)
+impl<T> From<T> for Handle
+where
+ T: Into<PathBuf>,
+{
+ fn from(path: T) -> Handle {
+ Handle::from_path(path.into())
}
}
diff --git a/native/src/widget/svg.rs b/native/src/widget/svg.rs
index 4a227f3d..114d5e41 100644
--- a/native/src/widget/svg.rs
+++ b/native/src/widget/svg.rs
@@ -2,8 +2,9 @@
use crate::{layout, Element, Hasher, Layout, Length, Point, Size, Widget};
use std::{
- hash::Hash,
- path::{Path, PathBuf},
+ hash::{Hash, Hasher as _},
+ path::PathBuf,
+ sync::Arc,
};
/// A vector graphics image.
@@ -34,6 +35,14 @@ impl Svg {
}
}
+ /// Creates a new [`Svg`] that will display the contents of the file at the
+ /// provided path.
+ ///
+ /// [`Svg`]: struct.Svg.html
+ pub fn from_path(path: impl Into<PathBuf>) -> Self {
+ Self::new(Handle::from_path(path))
+ }
+
/// Sets the width of the [`Svg`].
///
/// [`Svg`]: struct.Svg.html
@@ -101,6 +110,7 @@ where
fn hash_layout(&self, state: &mut Hasher) {
std::any::TypeId::of::<Svg>().hash(state);
+ self.handle.hash(state);
self.width.hash(state);
self.height.hash(state);
}
@@ -112,7 +122,7 @@ where
#[derive(Debug, Clone)]
pub struct Handle {
id: u64,
- path: PathBuf,
+ data: Arc<Data>,
}
impl Handle {
@@ -120,17 +130,28 @@ impl Handle {
/// path.
///
/// [`Handle`]: struct.Handle.html
- pub fn from_path<T: Into<PathBuf>>(path: T) -> Handle {
- use std::hash::Hasher as _;
+ pub fn from_path(path: impl Into<PathBuf>) -> Handle {
+ Self::from_data(Data::Path(path.into()))
+ }
- let path = path.into();
+ /// Creates an SVG [`Handle`] from raw bytes containing either an SVG string
+ /// or gzip compressed data.
+ ///
+ /// This is useful if you already have your SVG data in-memory, maybe
+ /// because you downloaded or generated it procedurally.
+ ///
+ /// [`Handle`]: struct.Handle.html
+ pub fn from_memory(bytes: impl Into<Vec<u8>>) -> Handle {
+ Self::from_data(Data::Bytes(bytes.into()))
+ }
+ fn from_data(data: Data) -> Handle {
let mut hasher = Hasher::default();
- path.hash(&mut hasher);
+ data.hash(&mut hasher);
Handle {
id: hasher.finish(),
- path,
+ data: Arc::new(data),
}
}
@@ -141,20 +162,40 @@ impl Handle {
self.id
}
- /// Returns a reference to the path of the [`Handle`].
+ /// Returns a reference to the SVG [`Data`].
///
- /// [`Handle`]: enum.Handle.html
- pub fn path(&self) -> &Path {
- &self.path
+ /// [`Data`]: enum.Data.html
+ pub fn data(&self) -> &Data {
+ &self.data
}
}
-impl<T> From<T> for Handle
-where
- T: Into<PathBuf>,
-{
- fn from(path: T) -> Handle {
- Handle::from_path(path)
+impl Hash for Handle {
+ fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+ self.id.hash(state);
+ }
+}
+
+/// The data of an [`Svg`].
+///
+/// [`Svg`]: struct.Svg.html
+#[derive(Clone, Hash)]
+pub enum Data {
+ /// File data
+ Path(PathBuf),
+
+ /// In-memory data
+ ///
+ /// Can contain an SVG string or a gzip compressed data.
+ Bytes(Vec<u8>),
+}
+
+impl std::fmt::Debug for Data {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ match self {
+ Data::Path(path) => write!(f, "Path({:?})", path),
+ Data::Bytes(_) => write!(f, "Bytes(...)"),
+ }
}
}
@@ -166,9 +207,10 @@ where
/// [`Svg`]: struct.Svg.html
/// [renderer]: ../../renderer/index.html
pub trait Renderer: crate::Renderer {
- /// Returns the default dimensions of an [`Svg`] located on the given path.
+ /// Returns the default dimensions of an [`Svg`] for the given [`Handle`].
///
/// [`Svg`]: struct.Svg.html
+ /// [`Handle`]: struct.Handle.html
fn dimensions(&self, handle: &Handle) -> (u32, u32);
/// Draws an [`Svg`].
diff --git a/web/src/widget/container.rs b/web/src/widget/container.rs
index 8e4318f9..78be3543 100644
--- a/web/src/widget/container.rs
+++ b/web/src/widget/container.rs
@@ -8,6 +8,7 @@ pub use iced_style::container::{Style, StyleSheet};
/// It is normally used for alignment purposes.
#[allow(missing_debug_implementations)]
pub struct Container<'a, Message> {
+ padding: u16,
width: Length,
height: Length,
max_width: u32,
@@ -29,6 +30,7 @@ impl<'a, Message> Container<'a, Message> {
use std::u32;
Container {
+ padding: 0,
width: Length::Shrink,
height: Length::Shrink,
max_width: u32::MAX,
@@ -40,6 +42,14 @@ impl<'a, Message> Container<'a, Message> {
}
}
+ /// Sets the padding of the [`Container`].
+ ///
+ /// [`Container`]: struct.Column.html
+ pub fn padding(mut self, units: u16) -> Self {
+ self.padding = units;
+ self
+ }
+
/// Sets the width of the [`Container`].
///
/// [`Container`]: struct.Container.html
@@ -113,12 +123,15 @@ where
let column_class = style_sheet.insert(bump, css::Rule::Column);
+ let padding_class =
+ style_sheet.insert(bump, css::Rule::Padding(self.padding));
+
let style = self.style_sheet.style();
let node = div(bump)
.attr(
"class",
- bumpalo::format!(in bump, "{}", column_class).into_bump_str(),
+ bumpalo::format!(in bump, "{} {}", column_class, padding_class).into_bump_str(),
)
.attr(
"style",
diff --git a/wgpu/src/image/vector.rs b/wgpu/src/image/vector.rs
index bae0f82f..b6776827 100644
--- a/wgpu/src/image/vector.rs
+++ b/wgpu/src/image/vector.rs
@@ -45,9 +45,19 @@ impl Cache {
let opt = resvg::Options::default();
- let svg = match resvg::usvg::Tree::from_file(handle.path(), &opt.usvg) {
- Ok(tree) => Svg::Loaded(tree),
- Err(_) => Svg::NotFound,
+ let svg = match handle.data() {
+ svg::Data::Path(path) => {
+ match resvg::usvg::Tree::from_file(path, &opt.usvg) {
+ Ok(tree) => Svg::Loaded(tree),
+ Err(_) => Svg::NotFound,
+ }
+ }
+ svg::Data::Bytes(bytes) => {
+ match resvg::usvg::Tree::from_data(&bytes, &opt.usvg) {
+ Ok(tree) => Svg::Loaded(tree),
+ Err(_) => Svg::NotFound,
+ }
+ }
};
let _ = self.svgs.insert(handle.id(), svg);
generated by cgit (git 2.34.1) at 2025-04-18 00:16:37 +0000