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

fix: compilation with latest taffy commit

Browse source 
Also adds `rev =` to `Cargo.toml` specifying the latest commit.

A library like `libcosmic` shouldn't use git dependencies without
specifying a commit or tag.
This commit is contained in:
Ian Douglas Scott 2023-11-22 11:12:59 -08:00 • committed by GitHub
parent 57f4abb8a0
commit d1537b4c39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.toml
View file

@ -128,6 +128,7 @@ optional = true
[dependencies.taffy] [dependencies.taffy]
git = "https://github.com/DioxusLabs/taffy" git = "https://github.com/DioxusLabs/taffy"
rev = "7781c70"
features = ["grid"] features = ["grid"]
[workspace] [workspace]

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

@ -9,7 +9,7 @@ use iced_core::{Alignment, Length, Padding, Point, Size};
use taffy::geometry::{Line, Rect}; use taffy::geometry::{Line, Rect};
use taffy::style::{AlignItems, Dimension, 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::TaffyTree;
#[allow(clippy::too_many_lines)] #[allow(clippy::too_many_lines)]
pub fn resolve<Message>( pub fn resolve<Message>(
@ -30,7 +30,7 @@ pub fn resolve<Message>(
let mut leafs = Vec::with_capacity(items.len()); let mut leafs = Vec::with_capacity(items.len());
let mut nodes = Vec::with_capacity(items.len()); let mut nodes = Vec::with_capacity(items.len());
let mut taffy = Taffy::<()>::with_capacity(items.len() + 1); let mut taffy = TaffyTree::<()>::with_capacity(items.len() + 1);
// 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()) {