Skip to content

Commit 5227bc7

Browse files
committed
Convert compute code to work with mutable measurables
1 parent e79465f commit 5227bc7

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/compute/leaf.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use crate::util::debug::NODE_LOGGER;
1414
/// Perform full layout on a leaf node
1515
pub(crate) fn perform_layout<Context>(
1616
style: &Style,
17-
measurable: Option<&impl Measurable<Context = Context>>,
17+
measurable: Option<&mut impl Measurable<Context = Context>>,
1818
known_dimensions: Size<Option<f32>>,
1919
parent_size: Size<Option<f32>>,
2020
available_space: Size<AvailableSpace>,
@@ -27,7 +27,7 @@ pub(crate) fn perform_layout<Context>(
2727
/// Measure a leaf node's size
2828
pub(crate) fn measure_size<Context>(
2929
style: &Style,
30-
measurable: Option<&impl Measurable<Context = Context>>,
30+
measurable: Option<&mut impl Measurable<Context = Context>>,
3131
known_dimensions: Size<Option<f32>>,
3232
parent_size: Size<Option<f32>>,
3333
available_space: Size<AvailableSpace>,
@@ -40,7 +40,7 @@ pub(crate) fn measure_size<Context>(
4040
/// Compute the size of a leaf node (node with no children)
4141
pub fn compute<Context>(
4242
style: &Style,
43-
measurable: Option<&impl Measurable<Context = Context>>,
43+
measurable: Option<&mut impl Measurable<Context = Context>>,
4444
known_dimensions: Size<Option<f32>>,
4545
parent_size: Size<Option<f32>>,
4646
available_space: Size<AvailableSpace>,

src/compute/taffy_tree.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ fn compute_node_layout<Measure: Measurable>(
225225
(_, false) => match run_mode {
226226
RunMode::PerformLayout => leaf::perform_layout(
227227
&tree.nodes[node_key].style,
228-
tree.nodes[node_key].needs_measure.then(|| &tree.measure_funcs[node_key]),
228+
tree.nodes[node_key].needs_measure.then(|| &mut tree.measure_funcs[node_key]),
229229
known_dimensions,
230230
parent_size,
231231
available_space,
@@ -234,7 +234,7 @@ fn compute_node_layout<Measure: Measurable>(
234234
),
235235
RunMode::ComputeSize => leaf::measure_size(
236236
&tree.nodes[node_key].style,
237-
tree.nodes[node_key].needs_measure.then(|| &tree.measure_funcs[node_key]),
237+
tree.nodes[node_key].needs_measure.then(|| &mut tree.measure_funcs[node_key]),
238238
known_dimensions,
239239
parent_size,
240240
available_space,

0 commit comments

Comments
 (0)