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

Introduce useful helpers in layout module

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-01-09 06:35:33 +01:00
parent d24e50c1a6
commit d62bb8193c
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
26 changed files with 189 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

19
widget/src/button.rs
View file

@ -10,8 +10,8 @@ use crate::core::touch;
use crate::core::widget::tree::{self, Tree};
use crate::core::widget::Operation;
use crate::core::{
Background, Clipboard, Color, Element, Layout, Length, Padding, Point,
Rectangle, Shell, Size, Vector, Widget,
Background, Clipboard, Color, Element, Layout, Length, Padding, Rectangle,
Shell, Size, Vector, Widget,
};
pub use iced_style::button::{Appearance, StyleSheet};
@ -430,20 +430,7 @@ pub fn layout(
padding: Padding,
layout_content: impl FnOnce(&layout::Limits) -> layout::Node,
) -> layout::Node {
let limits = limits.width(width).height(height);
let content = layout_content(&limits.shrink(padding));
let padding = padding.fit(content.size(), limits.max());
let size = limits
.shrink(padding)
.resolve(content.size(), width, height)
.expand(padding);
layout::Node::with_children(
size,
vec![content.move_to(Point::new(padding.left, padding.top))],
)
layout::padded(limits, width, height, padding, layout_content)
}
/// Returns the [`mouse::Interaction`] of a [`Button`].

4
widget/src/canvas.rs
View file

@ -133,9 +133,7 @@ where
_renderer: &Renderer,
limits: &layout::Limits,
) -> layout::Node {
let size = limits.resolve(Size::ZERO, self.width, self.height);
layout::Node::new(size)
layout::atomic(limits, self.width, self.height)
}
fn on_event(

28
widget/src/container.rs
View file

@ -321,27 +321,19 @@ pub fn layout(
vertical_alignment: alignment::Vertical,
layout_content: impl FnOnce(&layout::Limits) -> layout::Node,
) -> layout::Node {
let limits = limits
.width(width)
.height(height)
.max_width(max_width)
.max_height(max_height);
let content = layout_content(&limits.shrink(padding).loose());
let padding = padding.fit(content.size(), limits.max());
let size = limits
.shrink(padding)
.resolve(content.size(), width, height);
layout::Node::with_children(
size.expand(padding),
vec![content
.move_to(Point::new(padding.left, padding.top))
.align(
layout::positioned(
&limits.max_width(max_width).max_height(max_height),
width,
height,
padding,
|limits| layout_content(&limits.loose()),
|content, size| {
content.align(
Alignment::from(horizontal_alignment),
Alignment::from(vertical_alignment),
size,
)],
)
},
)
}

2
widget/src/image.rs
View file

@ -99,7 +99,7 @@ where
};
// The size to be available to the widget prior to `Shrink`ing
let raw_size = limits.resolve(image_size, width, height);
let raw_size = limits.resolve(width, height, image_size);
// The uncropped size of the image when fit to the bounds above
let full_size = content_fit.fit(image_size, raw_size);

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

@ -113,9 +113,9 @@ where
let Size { width, height } = renderer.dimensions(&self.handle);
let mut size = limits.resolve(
Size::new(width as f32, height as f32),
self.width,
self.height,
Size::new(width as f32, height as f32),
);
let expansion_size = if height > width {

2
widget/src/overlay/menu.rs
View file

@ -369,7 +369,7 @@ where
* self.options.len() as f32,
);
limits.resolve(intrinsic, Length::Fill, Length::Shrink)
limits.resolve(Length::Fill, Length::Shrink, intrinsic)
};
layout::Node::new(size)

2
widget/src/pane_grid.rs
View file

@ -489,7 +489,7 @@ pub fn layout<Renderer, T>(
&layout::Limits,
) -> layout::Node,
) -> layout::Node {
let size = limits.resolve(Size::ZERO, width, height);
let size = limits.resolve(width, height, Size::ZERO);
let regions = node.pane_regions(spacing, size);
let children = contents

5
widget/src/pick_list.rs
View file

@ -392,7 +392,6 @@ where
{
use std::f32;
let limits = limits.width(width).height(Length::Shrink);
let font = font.unwrap_or_else(|| renderer.default_font());
let text_size = text_size.unwrap_or_else(|| renderer.default_size());
@ -451,8 +450,10 @@ where
);
limits
.width(width)
.height(Length::Shrink)
.shrink(padding)
.resolve(intrinsic, width, Length::Shrink)
.resolve(width, Length::Shrink, intrinsic)
.expand(padding)
};

8
widget/src/progress_bar.rs
View file

@ -98,13 +98,11 @@ where
_renderer: &Renderer,
limits: &layout::Limits,
) -> layout::Node {
let size = limits.resolve(
Size::ZERO,
layout::atomic(
limits,
self.width,
self.height.unwrap_or(Length::Fixed(Self::DEFAULT_HEIGHT)),
);
layout::Node::new(size)
)
}
fn draw(

2
widget/src/rule.rs
View file

@ -75,7 +75,7 @@ where
_renderer: &Renderer,
limits: &layout::Limits,
) -> layout::Node {
layout::Node::new(limits.resolve(Size::ZERO, self.width, self.height))
layout::atomic(limits, self.width, self.height)
}
fn draw(

39
widget/src/scrollable.rs
View file

@ -469,28 +469,25 @@ pub fn layout<Renderer>(
direction: &Direction,
layout_content: impl FnOnce(&Renderer, &layout::Limits) -> layout::Node,
) -> layout::Node {
let limits = limits.width(width).height(height);
layout::contained(limits, width, height, |limits| {
let child_limits = layout::Limits::new(
Size::new(limits.min().width, limits.min().height),
Size::new(
if direction.horizontal().is_some() {
f32::INFINITY
} else {
limits.max().width
},
if direction.vertical().is_some() {
f32::MAX
} else {
limits.max().height
},
),
);
let child_limits = layout::Limits::new(
Size::new(limits.min().width, limits.min().height),
Size::new(
if direction.horizontal().is_some() {
f32::INFINITY
} else {
limits.max().width
},
if direction.vertical().is_some() {
f32::MAX
} else {
limits.max().height
},
),
);
let content = layout_content(renderer, &child_limits);
let size = limits.resolve(content.size(), width, height);
layout::Node::with_children(size, vec![content])
layout_content(renderer, &child_limits)
})
}
/// Processes an [`Event`] and updates the [`State`] of a [`Scrollable`]

5
widget/src/shader.rs
View file

@ -83,10 +83,7 @@ where
_renderer: &Renderer,
limits: &layout::Limits,
) -> layout::Node {
let limits = limits.width(self.width).height(self.height);
let size = limits.resolve(Size::ZERO, self.width, self.height);
layout::Node::new(size)
layout::atomic(limits, self.width, self.height)
}
fn on_event(

4
widget/src/slider.rs
View file

@ -172,9 +172,7 @@ where
_renderer: &Renderer,
limits: &layout::Limits,
) -> layout::Node {
let size = limits.resolve(Size::ZERO, self.width, self.height);
layout::Node::new(size)
layout::atomic(limits, self.width, self.height)
}
fn on_event(

2
widget/src/space.rs
View file

@ -58,7 +58,7 @@ where
_renderer: &Renderer,
limits: &layout::Limits,
) -> layout::Node {
layout::Node::new(limits.resolve(Size::ZERO, self.width, self.height))
layout::atomic(limits, self.width, self.height)
}
fn draw(

2
widget/src/svg.rs
View file

@ -114,7 +114,7 @@ where
let image_size = Size::new(width as f32, height as f32);
// The size to be available to the widget prior to `Shrink`ing
let raw_size = limits.resolve(image_size, self.width, self.height);
let raw_size = limits.resolve(self.width, self.height, image_size);
// The uncropped size of the image when fit to the bounds above
let full_size = self.content_fit.fit(image_size, raw_size);

4
widget/src/text_input.rs
View file

@ -508,8 +508,8 @@ where
let padding = padding.fit(Size::ZERO, limits.max());
let height = line_height.to_absolute(text_size);
let limits = limits.width(width).shrink(padding).height(height);
let text_bounds = limits.resolve(Size::ZERO, width, height);
let limits = limits.width(width).shrink(padding);
let text_bounds = limits.resolve(width, height, Size::ZERO);
let placeholder_text = Text {
font,

4
widget/src/vertical_slider.rs
View file

@ -169,9 +169,7 @@ where
_renderer: &Renderer,
limits: &layout::Limits,
) -> layout::Node {
let size = limits.resolve(Size::ZERO, self.width, self.height);
layout::Node::new(size)
layout::atomic(limits, self.width, self.height)
}
fn on_event(