@@ -443,20 +443,6 @@ bool FlexFormattingContext::is_cross_auto(Box const& box) const
443
443
return cross_length.is_auto ();
444
444
}
445
445
446
- bool FlexFormattingContext::is_main_axis_margin_first_auto (Box const & box) const
447
- {
448
- if (is_row_layout ())
449
- return box.computed_values ().margin ().left .is_auto ();
450
- return box.computed_values ().margin ().top .is_auto ();
451
- }
452
-
453
- bool FlexFormattingContext::is_main_axis_margin_second_auto (Box const & box) const
454
- {
455
- if (is_row_layout ())
456
- return box.computed_values ().margin ().right .is_auto ();
457
- return box.computed_values ().margin ().bottom .is_auto ();
458
- }
459
-
460
446
void FlexFormattingContext::set_main_size (Box const & box, float size)
461
447
{
462
448
if (is_row_layout ())
@@ -1163,10 +1149,10 @@ void FlexFormattingContext::distribute_any_remaining_free_space()
1163
1149
size_t auto_margins = 0 ;
1164
1150
for (auto & flex_item : flex_line.items ) {
1165
1151
used_main_space += flex_item->main_size ;
1166
- if (is_main_axis_margin_first_auto ( flex_item->box ) )
1152
+ if (flex_item->margins . main_before_is_auto )
1167
1153
++auto_margins;
1168
1154
1169
- if (is_main_axis_margin_second_auto ( flex_item->box ) )
1155
+ if (flex_item->margins . main_after_is_auto )
1170
1156
++auto_margins;
1171
1157
1172
1158
used_main_space += flex_item->margins .main_before + flex_item->margins .main_after
@@ -1177,16 +1163,16 @@ void FlexFormattingContext::distribute_any_remaining_free_space()
1177
1163
if (flex_line.remaining_free_space > 0 ) {
1178
1164
float size_per_auto_margin = flex_line.remaining_free_space / (float )auto_margins;
1179
1165
for (auto & flex_item : flex_line.items ) {
1180
- if (is_main_axis_margin_first_auto ( flex_item->box ) )
1166
+ if (flex_item->margins . main_before_is_auto )
1181
1167
set_main_axis_first_margin (*flex_item, size_per_auto_margin);
1182
- if (is_main_axis_margin_second_auto ( flex_item->box ) )
1168
+ if (flex_item->margins . main_after_is_auto )
1183
1169
set_main_axis_second_margin (*flex_item, size_per_auto_margin);
1184
1170
}
1185
1171
} else {
1186
1172
for (auto & flex_item : flex_line.items ) {
1187
- if (is_main_axis_margin_first_auto ( flex_item->box ) )
1173
+ if (flex_item->margins . main_before_is_auto )
1188
1174
set_main_axis_first_margin (*flex_item, 0 );
1189
- if (is_main_axis_margin_second_auto ( flex_item->box ) )
1175
+ if (flex_item->margins . main_after_is_auto )
1190
1176
set_main_axis_second_margin (*flex_item, 0 );
1191
1177
}
1192
1178
}
0 commit comments