这是indexloc提供的服务，不要输入任何密码
Skip to content

Deduplicate track_sizing_algorithm function #636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 4, 2024
Merged

Deduplicate track_sizing_algorithm function #636

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/compute/grid/track_sizing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,6 @@ pub(super) fn determine_if_item_crosses_flexible_or_intrinsic_tracks(
/// Track sizing algorithm
/// Note: Gutters are treated as empty fixed-size tracks for the purpose of the track sizing algorithm.
#[allow(clippy::too_many_arguments)]
#[inline(always)]
pub(super) fn track_sizing_algorithm<Tree: LayoutPartialTree>(
tree: &mut Tree,
axis: AbstractAxis,
Expand All @@ -272,7 +271,7 @@ pub(super) fn track_sizing_algorithm<Tree: LayoutPartialTree>(
axis_tracks: &mut [GridTrack],
other_axis_tracks: &mut [GridTrack],
items: &mut [GridItem],
get_track_size_estimate: impl Fn(&GridTrack, Option<f32>) -> Option<f32>,
get_track_size_estimate: fn(&GridTrack, Option<f32>) -> Option<f32>,
has_baseline_aligned_item: bool,
) {
// 11.4 Initialise Track sizes
Expand All @@ -297,7 +296,7 @@ pub(super) fn track_sizing_algorithm<Tree: LayoutPartialTree>(
let gutter_alignment_adjustment = compute_alignment_gutter_adjustment(
other_axis_alignment,
inner_node_size.get(axis.other()),
&get_track_size_estimate,
get_track_size_estimate,
other_axis_tracks,
);
if other_axis_tracks.len() > 3 {
Expand Down Expand Up @@ -516,7 +515,7 @@ fn resolve_intrinsic_track_sizes(
items: &mut [GridItem],
axis_available_grid_space: AvailableSpace,
inner_node_size: Size<Option<f32>>,
get_track_size_estimate: impl Fn(&GridTrack, Option<f32>) -> Option<f32>,
get_track_size_estimate: fn(&GridTrack, Option<f32>) -> Option<f32>,
) {
// Step 1. Shim baseline-aligned items so their intrinsic size contributions reflect their baseline alignment.

Expand Down