summaryrefslogtreecommitdiff
path: root/src/layout/flex.rs
diff options
context:
space:
mode:
authorLaurenz <laurmaedje@gmail.com>2019-11-17 15:16:37 +0100
committerLaurenz <laurmaedje@gmail.com>2019-11-17 15:16:37 +0100
commitf6cb4d725ee6e4fd09b92b5af7348d11ac951b10 (patch)
tree7cf8bc7b0158a8a453fd9e2a2fe5a857ef036d5e /src/layout/flex.rs
parent4d0bdc4ca4cb5e8ca1a70b38a0fc0ec37d9e4857 (diff)
Update standard library functions 🎁
Diffstat (limited to 'src/layout/flex.rs')
-rw-r--r--src/layout/flex.rs12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/layout/flex.rs b/src/layout/flex.rs
index 3155a13a..bae700ce 100644
--- a/src/layout/flex.rs
+++ b/src/layout/flex.rs
@@ -67,7 +67,7 @@ impl FlexLayouter {
/// Create a new flex layouter.
pub fn new(ctx: FlexContext) -> FlexLayouter {
let stack = StackLayouter::new(StackContext {
- spaces: ctx.spaces,
+ spaces: ctx.spaces.clone(),
axes: ctx.axes,
shrink_to_fit: ctx.shrink_to_fit,
});
@@ -118,7 +118,7 @@ impl FlexLayouter {
}
/// Update the axes in use by this flex layouter.
- pub fn set_axes(&self, axes: LayoutAxes) {
+ pub fn set_axes(&mut self, axes: LayoutAxes) {
self.units.push(FlexUnit::SetAxes(axes));
}
@@ -246,7 +246,7 @@ impl FlexLayouter {
Ok(())
}
- fn finish_aligned_run(&mut self) -> LayoutResult<()> {
+ fn finish_aligned_run(&mut self) {
let anchor = self.ctx.axes.primary.anchor(self.merged_dimensions.x);
let factor = if self.ctx.axes.primary.axis.is_positive() { 1 } else { -1 };
@@ -259,13 +259,11 @@ impl FlexLayouter {
self.merged_dimensions.y = crate::size::max(self.merged_dimensions.y, self.run.size.y);
self.run.size = Size2D::zero();
-
- Ok(())
}
/// This layouter's context.
- pub fn ctx(&self) -> FlexContext {
- self.ctx
+ pub fn ctx(&self) -> &FlexContext {
+ &self.ctx
}
pub fn remaining(&self) -> LayoutResult<LayoutSpaces> {