me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Simplify image rotation API and its internals

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-05-02 15:21:22 +02:00
parent 09a6bcfffc
commit a57313b23e
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
23 changed files with 219 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

72
widget/src/image.rs
View file

@ -1,6 +1,5 @@
//! Display images in your user interface.
pub mod viewer;
use iced_renderer::core::{Point, RotationLayout};
pub use viewer::Viewer;
use crate::core::image;
@ -9,7 +8,8 @@ use crate::core::mouse;
use crate::core::renderer;
use crate::core::widget::Tree;
use crate::core::{
ContentFit, Element, Layout, Length, Rectangle, Size, Widget,
ContentFit, Element, Layout, Length, Point, Rectangle, Rotation, Size,
Vector, Widget,
};
pub use image::{FilterMethod, Handle};
@ -37,8 +37,7 @@ pub struct Image<Handle> {
height: Length,
content_fit: ContentFit,
filter_method: FilterMethod,
rotation: f32,
rotation_layout: RotationLayout,
rotation: Rotation,
}
impl<Handle> Image<Handle> {
@ -48,10 +47,9 @@ impl<Handle> Image<Handle> {
handle: handle.into(),
width: Length::Shrink,
height: Length::Shrink,
content_fit: ContentFit::Contain,
content_fit: ContentFit::default(),
filter_method: FilterMethod::default(),
rotation: 0.0,
rotation_layout: RotationLayout::Change,
rotation: Rotation::default(),
}
}
@ -81,15 +79,9 @@ impl<Handle> Image<Handle> {
self
}
/// Rotates the [`Image`] by the given angle in radians.
pub fn rotation(mut self, degrees: f32) -> Self {
self.rotation = degrees;
self
}
/// Sets the [`RotationLayout`] of the [`Image`].
pub fn rotation_layout(mut self, rotation_layout: RotationLayout) -> Self {
self.rotation_layout = rotation_layout;
/// Applies the given [`Rotation`] to the [`Image`].
pub fn rotation(mut self, rotation: impl Into<Rotation>) -> Self {
self.rotation = rotation.into();
self
}
}
@ -102,8 +94,7 @@ pub fn layout<Renderer, Handle>(
width: Length,
height: Length,
content_fit: ContentFit,
rotation: f32,
rotation_layout: RotationLayout,
rotation: Rotation,
) -> layout::Node
where
Renderer: image::Renderer<Handle = Handle>,
@ -114,7 +105,7 @@ where
Size::new(image_size.width as f32, image_size.height as f32);
// The rotated size of the image
let rotated_size = rotation_layout.apply_to_size(image_size, rotation);
let rotated_size = rotation.apply(image_size);
// The size to be available to the widget prior to `Shrink`ing
let raw_size = limits.resolve(width, height, rotated_size);
@ -144,45 +135,44 @@ pub fn draw<Renderer, Handle>(
handle: &Handle,
content_fit: ContentFit,
filter_method: FilterMethod,
rotation: f32,
rotation_layout: RotationLayout,
rotation: Rotation,
) where
Renderer: image::Renderer<Handle = Handle>,
Handle: Clone,
{
let Size { width, height } = renderer.measure_image(handle);
let image_size = Size::new(width as f32, height as f32);
let rotated_size = rotation_layout.apply_to_size(image_size, rotation);
let rotated_size = rotation.apply(image_size);
let bounds = layout.bounds();
let adjusted_fit = content_fit.fit(rotated_size, bounds.size());
let scale = Size::new(
let scale = Vector::new(
adjusted_fit.width / rotated_size.width,
adjusted_fit.height / rotated_size.height,
);
let final_size = image_size * scale;
let position = match content_fit {
ContentFit::None => Point::new(
bounds.x + (rotated_size.width - adjusted_fit.width) / 2.0,
bounds.y + (rotated_size.height - adjusted_fit.height) / 2.0,
),
_ => Point::new(
bounds.center_x() - final_size.width / 2.0,
bounds.center_y() - final_size.height / 2.0,
),
};
let drawing_bounds = Rectangle::new(position, final_size);
let render = |renderer: &mut Renderer| {
let position = match content_fit {
ContentFit::None => Point::new(
bounds.position().x
+ (rotated_size.width - image_size.width) / 2.0,
bounds.position().y
+ (rotated_size.height - image_size.height) / 2.0,
),
_ => Point::new(
bounds.center_x() - image_size.width / 2.0,
bounds.center_y() - image_size.height / 2.0,
),
};
let drawing_bounds = Rectangle::new(position, image_size);
renderer.draw_image(
handle.clone(),
filter_method,
drawing_bounds,
rotation,
scale,
rotation.radians(),
);
};
@ -221,7 +211,6 @@ where
self.height,
self.content_fit,
self.rotation,
self.rotation_layout,
)
}
@ -242,7 +231,6 @@ where
self.content_fit,
self.filter_method,
self.rotation,
self.rotation_layout,
);
}
}

7
widget/src/image/viewer.rs
View file

@ -6,8 +6,8 @@ use crate::core::mouse;
use crate::core::renderer;
use crate::core::widget::tree::{self, Tree};
use crate::core::{
Clipboard, Element, Layout, Length, Pixels, Point, Rectangle, Shell, Size,
Vector, Widget,
Clipboard, Element, Layout, Length, Pixels, Point, Radians, Rectangle,
Shell, Size, Vector, Widget,
};
/// A frame that displays an image with the ability to zoom in/out and pan.
@ -341,8 +341,7 @@ where
y: bounds.y,
..Rectangle::with_size(image_size)
},
0.0,
Size::UNIT,
Radians(0.0),
);
});
});

81
widget/src/svg.rs
View file

@ -5,8 +5,8 @@ use crate::core::renderer;
use crate::core::svg;
use crate::core::widget::Tree;
use crate::core::{
Color, ContentFit, Element, Layout, Length, Point, Rectangle,
RotationLayout, Size, Theme, Widget,
Color, ContentFit, Element, Layout, Length, Point, Rectangle, Rotation,
Size, Theme, Vector, Widget,
};
use std::path::PathBuf;
@ -29,8 +29,7 @@ where
height: Length,
content_fit: ContentFit,
class: Theme::Class<'a>,
rotation: f32,
rotation_layout: RotationLayout,
rotation: Rotation,
}
impl<'a, Theme> Svg<'a, Theme>
@ -45,8 +44,7 @@ where
height: Length::Shrink,
content_fit: ContentFit::Contain,
class: Theme::default(),
rotation: 0.0,
rotation_layout: RotationLayout::Change,
rotation: Rotation::default(),
}
}
@ -100,15 +98,9 @@ where
self
}
/// Rotates the [`Svg`] by the given angle in radians.
pub fn rotation(mut self, degrees: f32) -> Self {
self.rotation = degrees;
self
}
/// Sets the [`RotationLayout`] of the [`Svg`].
pub fn rotation_layout(mut self, rotation_layout: RotationLayout) -> Self {
self.rotation_layout = rotation_layout;
/// Applies the given [`Rotation`] to the [`Svg`].
pub fn rotation(mut self, rotation: impl Into<Rotation>) -> Self {
self.rotation = rotation.into();
self
}
}
@ -137,9 +129,7 @@ where
let image_size = Size::new(width as f32, height as f32);
// The rotated size of the svg
let rotated_size = self
.rotation_layout
.apply_to_size(image_size, self.rotation);
let rotated_size = self.rotation.apply(image_size);
// The size to be available to the widget prior to `Shrink`ing
let raw_size = limits.resolve(self.width, self.height, rotated_size);
@ -174,49 +164,46 @@ where
) {
let Size { width, height } = renderer.measure_svg(&self.handle);
let image_size = Size::new(width as f32, height as f32);
let rotated_size = self
.rotation_layout
.apply_to_size(image_size, self.rotation);
let rotated_size = self.rotation.apply(image_size);
let bounds = layout.bounds();
let adjusted_fit = self.content_fit.fit(rotated_size, bounds.size());
let scale = Size::new(
let scale = Vector::new(
adjusted_fit.width / rotated_size.width,
adjusted_fit.height / rotated_size.height,
);
let final_size = image_size * scale;
let position = match self.content_fit {
ContentFit::None => Point::new(
bounds.x + (rotated_size.width - adjusted_fit.width) / 2.0,
bounds.y + (rotated_size.height - adjusted_fit.height) / 2.0,
),
_ => Point::new(
bounds.center_x() - final_size.width / 2.0,
bounds.center_y() - final_size.height / 2.0,
),
};
let drawing_bounds = Rectangle::new(position, final_size);
let is_mouse_over = cursor.is_over(bounds);
let status = if is_mouse_over {
Status::Hovered
} else {
Status::Idle
};
let style = theme.style(&self.class, status);
let render = |renderer: &mut Renderer| {
let position = match self.content_fit {
ContentFit::None => Point::new(
bounds.position().x
+ (rotated_size.width - image_size.width) / 2.0,
bounds.position().y
+ (rotated_size.height - image_size.height) / 2.0,
),
_ => Point::new(
bounds.center_x() - image_size.width / 2.0,
bounds.center_y() - image_size.height / 2.0,
),
};
let drawing_bounds = Rectangle::new(position, image_size);
let status = if is_mouse_over {
Status::Hovered
} else {
Status::Idle
};
let style = theme.style(&self.class, status);
renderer.draw_svg(
self.handle.clone(),
style.color,
drawing_bounds,
self.rotation,
scale,
self.rotation.radians(),
);
};