Re-land taffy 0.8.3 (#34939)
Re #34938 - **chore: Bump taffy to 0.8.3** - **editor: Fix sticky multi-buffer header not extending to the full width** Release Notes: - N/A
This commit is contained in:
parent
b63d820be2
commit
3da23cc65b
5 changed files with 20 additions and 20 deletions
9
Cargo.lock
generated
9
Cargo.lock
generated
|
@ -7402,9 +7402,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "grid"
|
name = "grid"
|
||||||
version = "0.14.0"
|
version = "0.17.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "be136d9dacc2a13cc70bb6c8f902b414fb2641f8db1314637c6b7933411a8f82"
|
checksum = "71b01d27060ad58be4663b9e4ac9e2d4806918e8876af8912afbddd1a91d5eaa"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "group"
|
name = "group"
|
||||||
|
@ -15961,13 +15961,12 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "taffy"
|
name = "taffy"
|
||||||
version = "0.5.1"
|
version = "0.8.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e8b61630cba2afd2c851821add2e1bb1b7851a2436e839ab73b56558b009035e"
|
checksum = "7aaef0ac998e6527d6d0d5582f7e43953bb17221ac75bb8eb2fcc2db3396db1c"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"arrayvec",
|
"arrayvec",
|
||||||
"grid",
|
"grid",
|
||||||
"num-traits",
|
|
||||||
"serde",
|
"serde",
|
||||||
"slotmap",
|
"slotmap",
|
||||||
]
|
]
|
||||||
|
|
|
@ -844,7 +844,7 @@ impl CompletionsMenu {
|
||||||
.with_sizing_behavior(ListSizingBehavior::Infer)
|
.with_sizing_behavior(ListSizingBehavior::Infer)
|
||||||
.w(rems(34.));
|
.w(rems(34.));
|
||||||
|
|
||||||
Popover::new().child(list).into_any_element()
|
Popover::new().child(div().child(list)).into_any_element()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn render_aside(
|
fn render_aside(
|
||||||
|
|
|
@ -4010,6 +4010,7 @@ impl EditorElement {
|
||||||
let available_width = hitbox.bounds.size.width - right_margin;
|
let available_width = hitbox.bounds.size.width - right_margin;
|
||||||
|
|
||||||
let mut header = v_flex()
|
let mut header = v_flex()
|
||||||
|
.w_full()
|
||||||
.relative()
|
.relative()
|
||||||
.child(
|
.child(
|
||||||
div()
|
div()
|
||||||
|
|
|
@ -121,7 +121,7 @@ smallvec.workspace = true
|
||||||
smol.workspace = true
|
smol.workspace = true
|
||||||
strum.workspace = true
|
strum.workspace = true
|
||||||
sum_tree.workspace = true
|
sum_tree.workspace = true
|
||||||
taffy = "=0.5.1"
|
taffy = "=0.8.3"
|
||||||
thiserror.workspace = true
|
thiserror.workspace = true
|
||||||
util.workspace = true
|
util.workspace = true
|
||||||
uuid.workspace = true
|
uuid.workspace = true
|
||||||
|
|
|
@ -283,7 +283,7 @@ impl ToTaffy<taffy::style::LengthPercentageAuto> for Length {
|
||||||
fn to_taffy(&self, rem_size: Pixels) -> taffy::prelude::LengthPercentageAuto {
|
fn to_taffy(&self, rem_size: Pixels) -> taffy::prelude::LengthPercentageAuto {
|
||||||
match self {
|
match self {
|
||||||
Length::Definite(length) => length.to_taffy(rem_size),
|
Length::Definite(length) => length.to_taffy(rem_size),
|
||||||
Length::Auto => taffy::prelude::LengthPercentageAuto::Auto,
|
Length::Auto => taffy::prelude::LengthPercentageAuto::auto(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -292,7 +292,7 @@ impl ToTaffy<taffy::style::Dimension> for Length {
|
||||||
fn to_taffy(&self, rem_size: Pixels) -> taffy::prelude::Dimension {
|
fn to_taffy(&self, rem_size: Pixels) -> taffy::prelude::Dimension {
|
||||||
match self {
|
match self {
|
||||||
Length::Definite(length) => length.to_taffy(rem_size),
|
Length::Definite(length) => length.to_taffy(rem_size),
|
||||||
Length::Auto => taffy::prelude::Dimension::Auto,
|
Length::Auto => taffy::prelude::Dimension::auto(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -302,14 +302,14 @@ impl ToTaffy<taffy::style::LengthPercentage> for DefiniteLength {
|
||||||
match self {
|
match self {
|
||||||
DefiniteLength::Absolute(length) => match length {
|
DefiniteLength::Absolute(length) => match length {
|
||||||
AbsoluteLength::Pixels(pixels) => {
|
AbsoluteLength::Pixels(pixels) => {
|
||||||
taffy::style::LengthPercentage::Length(pixels.into())
|
taffy::style::LengthPercentage::length(pixels.into())
|
||||||
}
|
}
|
||||||
AbsoluteLength::Rems(rems) => {
|
AbsoluteLength::Rems(rems) => {
|
||||||
taffy::style::LengthPercentage::Length((*rems * rem_size).into())
|
taffy::style::LengthPercentage::length((*rems * rem_size).into())
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
DefiniteLength::Fraction(fraction) => {
|
DefiniteLength::Fraction(fraction) => {
|
||||||
taffy::style::LengthPercentage::Percent(*fraction)
|
taffy::style::LengthPercentage::percent(*fraction)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -320,14 +320,14 @@ impl ToTaffy<taffy::style::LengthPercentageAuto> for DefiniteLength {
|
||||||
match self {
|
match self {
|
||||||
DefiniteLength::Absolute(length) => match length {
|
DefiniteLength::Absolute(length) => match length {
|
||||||
AbsoluteLength::Pixels(pixels) => {
|
AbsoluteLength::Pixels(pixels) => {
|
||||||
taffy::style::LengthPercentageAuto::Length(pixels.into())
|
taffy::style::LengthPercentageAuto::length(pixels.into())
|
||||||
}
|
}
|
||||||
AbsoluteLength::Rems(rems) => {
|
AbsoluteLength::Rems(rems) => {
|
||||||
taffy::style::LengthPercentageAuto::Length((*rems * rem_size).into())
|
taffy::style::LengthPercentageAuto::length((*rems * rem_size).into())
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
DefiniteLength::Fraction(fraction) => {
|
DefiniteLength::Fraction(fraction) => {
|
||||||
taffy::style::LengthPercentageAuto::Percent(*fraction)
|
taffy::style::LengthPercentageAuto::percent(*fraction)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -337,12 +337,12 @@ impl ToTaffy<taffy::style::Dimension> for DefiniteLength {
|
||||||
fn to_taffy(&self, rem_size: Pixels) -> taffy::style::Dimension {
|
fn to_taffy(&self, rem_size: Pixels) -> taffy::style::Dimension {
|
||||||
match self {
|
match self {
|
||||||
DefiniteLength::Absolute(length) => match length {
|
DefiniteLength::Absolute(length) => match length {
|
||||||
AbsoluteLength::Pixels(pixels) => taffy::style::Dimension::Length(pixels.into()),
|
AbsoluteLength::Pixels(pixels) => taffy::style::Dimension::length(pixels.into()),
|
||||||
AbsoluteLength::Rems(rems) => {
|
AbsoluteLength::Rems(rems) => {
|
||||||
taffy::style::Dimension::Length((*rems * rem_size).into())
|
taffy::style::Dimension::length((*rems * rem_size).into())
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
DefiniteLength::Fraction(fraction) => taffy::style::Dimension::Percent(*fraction),
|
DefiniteLength::Fraction(fraction) => taffy::style::Dimension::percent(*fraction),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -350,9 +350,9 @@ impl ToTaffy<taffy::style::Dimension> for DefiniteLength {
|
||||||
impl ToTaffy<taffy::style::LengthPercentage> for AbsoluteLength {
|
impl ToTaffy<taffy::style::LengthPercentage> for AbsoluteLength {
|
||||||
fn to_taffy(&self, rem_size: Pixels) -> taffy::style::LengthPercentage {
|
fn to_taffy(&self, rem_size: Pixels) -> taffy::style::LengthPercentage {
|
||||||
match self {
|
match self {
|
||||||
AbsoluteLength::Pixels(pixels) => taffy::style::LengthPercentage::Length(pixels.into()),
|
AbsoluteLength::Pixels(pixels) => taffy::style::LengthPercentage::length(pixels.into()),
|
||||||
AbsoluteLength::Rems(rems) => {
|
AbsoluteLength::Rems(rems) => {
|
||||||
taffy::style::LengthPercentage::Length((*rems * rem_size).into())
|
taffy::style::LengthPercentage::length((*rems * rem_size).into())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue