leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(grid): span of widgets across columns and rows

Browse source
This commit is contained in:
Michael Aaron Murphy 2023-10-03 22:54:41 +02:00 • committed by Michael Murphy
parent c937332322
commit 369cede7da
1 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/widget/grid/layout.rs
View file

@ -7,7 +7,7 @@ use iced_core::layout::{Limits, Node};
use iced_core::{Alignment, Length, Padding, Point, Size}; use iced_core::{Alignment, Length, Padding, Point, Size};
use taffy::geometry::{Line, Rect}; use taffy::geometry::{Line, Rect};
use taffy::style::{AlignContent, AlignItems, Display, GridPlacement, Style}; use taffy::style::{AlignItems, Dimension, Display, GridPlacement, Style};
use taffy::style_helpers::{auto, length}; use taffy::style_helpers::{auto, length};
use taffy::Taffy; use taffy::Taffy;
@ -35,7 +35,8 @@ pub fn resolve<Message>(
// Attach widgets as child nodes. // Attach widgets as child nodes.
for (child, assignment) in items.iter().zip(assignments.iter()) { for (child, assignment) in items.iter().zip(assignments.iter()) {
// Calculate the dimensions of the item. // Calculate the dimensions of the item.
let child_node = child.as_widget().layout(renderer, limits); let child_widget = child.as_widget();
let child_node = child_widget.layout(renderer, limits);
let size = child_node.size(); let size = child_node.size();
nodes.push(child_node); nodes.push(child_node);
@ -44,15 +45,23 @@ pub fn resolve<Message>(
let leaf = taffy.new_leaf(Style { let leaf = taffy.new_leaf(Style {
grid_column: Line { grid_column: Line {
start: GridPlacement::Line((assignment.column as i16).into()), start: GridPlacement::Line((assignment.column as i16).into()),
end: GridPlacement::Span(assignment.height.into()), end: GridPlacement::Line(
(assignment.column as i16 + assignment.width as i16).into(),
),
}, },
grid_row: Line { grid_row: Line {
start: GridPlacement::Line((assignment.row as i16).into()), start: GridPlacement::Line((assignment.row as i16).into()),
end: GridPlacement::Span(assignment.width.into()), end: GridPlacement::Line((assignment.row as i16 + assignment.height as i16).into()),
}, },
size: taffy::geometry::Size { size: taffy::geometry::Size {
width: length(size.width), width: match child_widget.width() {
height: length(size.height), Length::Fill | Length::FillPortion(_) => Dimension::Auto,
_ => length(size.width),
},
height: match child_widget.height() {
Length::Fill | Length::FillPortion(_) => Dimension::Auto,
_ => length(size.height),
},
}, },
..Style::default() ..Style::default()