Skip to content

Commit b56f22f

Browse files
committed
Convert scrollbar_width from u8 to f32
1 parent 383d550 commit b56f22f

26 files changed

+29
-32
lines changed

scripts/gentest/src/main.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -391,10 +391,7 @@ fn generate_node(ident: &str, node: &Value) -> TokenStream {
391391
let overflow_x = overflow_x.unwrap_or(quote!(taffy::style::Overflow::Visible));
392392
let overflow_y = overflow_y.unwrap_or(quote!(taffy::style::Overflow::Visible));
393393
let overflow = quote!(overflow: taffy::geometry::Point { x: #overflow_x, y: #overflow_y },);
394-
let scrollbar_width = quote_number_prop("scrollbar_width", style, |value: f32| {
395-
let value = value as u8;
396-
quote!(#value)
397-
});
394+
let scrollbar_width = quote_number_prop("scrollbar_width", style, |value: f32| quote!(#value));
398395
(overflow, scrollbar_width)
399396
} else {
400397
(quote!(), quote!())

src/compute/flexbox.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ fn compute_constants(
435435
// However, the axis are switched (transposed) because a node that scrolls vertically needs
436436
// *horizontal* space to be reserved for a scrollbar
437437
let scrollbar_gutter = style.overflow.transpose().map(|overflow| match overflow {
438-
Overflow::Scroll => style.scrollbar_width as f32,
438+
Overflow::Scroll => style.scrollbar_width,
439439
_ => 0.0,
440440
});
441441
// TODO: make side configurable based on the `direction` property

src/style/mod.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ pub struct Style {
164164
/// How children overflowing their container should affect layout
165165
pub overflow: Point<Overflow>,
166166
/// How much space (in points) should be reserved for the scrollbars of `Overflow::Scroll` and `Overflow::Auto` nodes.
167-
pub scrollbar_width: u8,
167+
pub scrollbar_width: f32,
168168

169169
// Position properties
170170
/// What should the `position` value of this struct use as a base offset?
@@ -277,7 +277,7 @@ impl Style {
277277
pub const DEFAULT: Style = Style {
278278
display: Display::DEFAULT,
279279
overflow: Point { x: Overflow::Visible, y: Overflow::Visible },
280-
scrollbar_width: 0,
280+
scrollbar_width: 0.0,
281281
position: Position::Relative,
282282
inset: Rect::auto(),
283283
margin: Rect::zero(),
@@ -350,7 +350,7 @@ mod tests {
350350
let old_defaults = Style {
351351
display: Default::default(),
352352
overflow: Default::default(),
353-
scrollbar_width: 0,
353+
scrollbar_width: 0.0,
354354
position: Default::default(),
355355
#[cfg(feature = "flexbox")]
356356
flex_direction: Default::default(),
@@ -467,6 +467,6 @@ mod tests {
467467
assert_type_size::<Line<GridPlacement>>(8);
468468

469469
// Overall
470-
assert_type_size::<Style>(344);
470+
assert_type_size::<Style>(352);
471471
}
472472
}

tests/generated/do_not_clamp_height_of_absolute_node_to_height_of_its_overflow_hidden_parent.rs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/generated/grid_fit_content_percent_indefinite_max_content_hidden.rs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/generated/grid_fit_content_percent_indefinite_min_content_hidden.rs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/generated/grid_fit_content_points_min_content_hidden.rs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/generated/grid_overflow_inline_axis_hidden.rs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/generated/grid_overflow_inline_axis_scroll.rs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/generated/grid_span_13_most_non_flex_with_minmax_indefinite_hidden.rs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/generated/grid_span_2_max_content_fit_content_10px_indefinite_hidden.rs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/generated/grid_span_2_max_content_fit_content_80px_indefinite_hidden.rs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/generated/grid_span_2_min_content_auto_indefinite_hidden.rs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/generated/grid_span_2_min_content_fit_content_10px_indefinite_hidden.rs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/generated/grid_span_2_min_content_fit_content_30px_indefinite_hidden.rs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/generated/grid_span_2_min_content_fit_content_80px_indefinite_hidden.rs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/generated/grid_span_6_all_non_flex_indefinite_hidden.rs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/generated/measure_child_with_flex_shrink_hidden.rs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/generated/overflow_main_axis_shrink_hidden.rs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/generated/overflow_main_axis_shrink_scroll.rs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/generated/overflow_scrollbars_overriden_by_available_space.rs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/generated/overflow_scrollbars_overriden_by_max_size.rs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/generated/overflow_scrollbars_overriden_by_size.rs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/generated/overflow_scrollbars_take_up_space_both_axis.rs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/generated/overflow_scrollbars_take_up_space_cross_axis.rs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/generated/overflow_scrollbars_take_up_space_main_axis.rs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)