itsscb/ratatui
1
0
Fork 0
mirror of https://github.com/ratatui/ratatui.git synced 2025-10-02 15:25:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(layout): rename element to segment in layout (#1397)

Browse Source 
This PR renames `element` to `segment` in a couple of functions in the
layout calculations for clarity. `element` can refer to `segment`s or
`spacer`s and functions that take only `segment`s should use `segment`
as the variable names.
This commit is contained in:
Dheepak Krishnamurthy 2024-10-02 15:34:07 -04:00 committed by GitHub
parent 5ad623c29b
commit edcdc8a814
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/widget_impl.rs
View File

@ -80,7 +80,7 @@ impl App {
/// This allows the `App` type to be rendered as a widget. The `App` type owns several other widgets /// This allows the `App` type to be rendered as a widget. The `App` type owns several other widgets
/// that are rendered as part of the app. The `Widget` trait is implemented on a mutable reference /// that are rendered as part of the app. The `Widget` trait is implemented on a mutable reference
/// to the `App` type, which allows this to be rendered without consuming the `App` type, and allows /// to the `App` type, which allows this to be rendered without consuming the `App` type, and allows
/// the sub-widgets to be mutatable. /// the sub-widgets to be mutable.
impl Widget for &mut App { impl Widget for &mut App {
fn render(self, area: Rect, buf: &mut Buffer) { fn render(self, area: Rect, buf: &mut Buffer) {
let constraints = Constraint::from_lengths([1, 1, 2, 1]); let constraints = Constraint::from_lengths([1, 1, 2, 1]);

26
src/layout/layout.rs
View File

@ -719,35 +719,35 @@ fn configure_constraints(
constraints: &[Constraint], constraints: &[Constraint],
flex: Flex, flex: Flex,
) -> Result<(), AddConstraintError> { ) -> Result<(), AddConstraintError> {
for (&constraint, &element) in constraints.iter().zip(segments.iter()) { for (&constraint, &segment) in constraints.iter().zip(segments.iter()) {
match constraint { match constraint {
Constraint::Max(max) => { Constraint::Max(max) => {
solver.add_constraint(element.has_max_size(max, MAX_SIZE_LE))?; solver.add_constraint(segment.has_max_size(max, MAX_SIZE_LE))?;
solver.add_constraint(element.has_int_size(max, MAX_SIZE_EQ))?; solver.add_constraint(segment.has_int_size(max, MAX_SIZE_EQ))?;
} }
Constraint::Min(min) => { Constraint::Min(min) => {
solver.add_constraint(element.has_min_size(min, MIN_SIZE_GE))?; solver.add_constraint(segment.has_min_size(min, MIN_SIZE_GE))?;
if flex.is_legacy() { if flex.is_legacy() {
solver.add_constraint(element.has_int_size(min, MIN_SIZE_EQ))?; solver.add_constraint(segment.has_int_size(min, MIN_SIZE_EQ))?;
} else { } else {
solver.add_constraint(element.has_size(area, FILL_GROW))?; solver.add_constraint(segment.has_size(area, FILL_GROW))?;
} }
} }
Constraint::Length(length) => { Constraint::Length(length) => {
solver.add_constraint(element.has_int_size(length, LENGTH_SIZE_EQ))?; solver.add_constraint(segment.has_int_size(length, LENGTH_SIZE_EQ))?;
} }
Constraint::Percentage(p) => { Constraint::Percentage(p) => {
let size = area.size() * f64::from(p) / 100.00; let size = area.size() * f64::from(p) / 100.00;
solver.add_constraint(element.has_size(size, PERCENTAGE_SIZE_EQ))?; solver.add_constraint(segment.has_size(size, PERCENTAGE_SIZE_EQ))?;
} }
Constraint::Ratio(num, den) => { Constraint::Ratio(num, den) => {
// avoid division by zero by using 1 when denominator is 0 // avoid division by zero by using 1 when denominator is 0
let size = area.size() * f64::from(num) / f64::from(den.max(1)); let size = area.size() * f64::from(num) / f64::from(den.max(1));
solver.add_constraint(element.has_size(size, RATIO_SIZE_EQ))?; solver.add_constraint(segment.has_size(size, RATIO_SIZE_EQ))?;
} }
Constraint::Fill(_) => { Constraint::Fill(_) => {
// given no other constraints, this segment will grow as much as possible. // given no other constraints, this segment will grow as much as possible.
solver.add_constraint(element.has_size(area, FILL_GROW))?; solver.add_constraint(segment.has_size(area, FILL_GROW))?;
} }
} }
} }
@ -854,7 +854,7 @@ fn configure_fill_constraints(
constraints: &[Constraint], constraints: &[Constraint],
flex: Flex, flex: Flex,
) -> Result<(), AddConstraintError> { ) -> Result<(), AddConstraintError> {
for ((&left_constraint, &left_element), (&right_constraint, &right_element)) in constraints for ((&left_constraint, &left_segment), (&right_constraint, &right_segment)) in constraints
.iter() .iter()
.zip(segments.iter()) .zip(segments.iter())
.filter(|(c, _)| c.is_fill() || (!flex.is_legacy() && c.is_min())) .filter(|(c, _)| c.is_fill() || (!flex.is_legacy() && c.is_min()))
@ -871,9 +871,9 @@ fn configure_fill_constraints(
_ => unreachable!(), _ => unreachable!(),
}; };
solver.add_constraint( solver.add_constraint(
(right_scaling_factor * left_element.size()) (right_scaling_factor * left_segment.size())
| EQ(GROW) | EQ(GROW)
| (left_scaling_factor * right_element.size()), | (left_scaling_factor * right_segment.size()),
)?; )?;
} }
Ok(()) Ok(())