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

Set MSRV to 1.71

Browse source
This commit is contained in:
Jeremy Soller 2024-01-29 09:43:06 -07:00
parent 213ede371b
commit 1291a48d4d
No known key found for this signature in database
GPG key ID: D02FD439211AF56F
4 changed files with 45 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.toml
View file

@ -2,6 +2,7 @@
name = "libcosmic" name = "libcosmic"
version = "0.1.0" version = "0.1.0"
edition = "2021" edition = "2021"
rust-version = "1.71"
[lib] [lib]
name = "cosmic" name = "cosmic"

12
src/widget/segmented_button/horizontal.rs
View file

@ -45,11 +45,11 @@ where
} }
#[allow(clippy::cast_precision_loss)] #[allow(clippy::cast_precision_loss)]
fn variant_button_bounds( fn variant_button_bounds<'b>(
&self, &'b self,
state: &LocalState, state: &'b LocalState,
mut bounds: Rectangle, mut bounds: Rectangle,
) -> impl Iterator<Item = (Entity, Rectangle)> { ) -> Box<dyn Iterator<Item = (Entity, Rectangle)> + 'b> {
let num = state.buttons_visible; let num = state.buttons_visible;
let spacing = f32::from(self.spacing); let spacing = f32::from(self.spacing);
let mut homogenous_width = 0.0; let mut homogenous_width = 0.0;
@ -66,6 +66,7 @@ where
/ num as f32; / num as f32;
} }
Box::new(
self.model self.model
.order .order
.iter() .iter()
@ -84,7 +85,8 @@ where
bounds.x += this_bounds.width + spacing; bounds.x += this_bounds.width + spacing;
(key, this_bounds) (key, this_bounds)
}) }),
)
} }
#[allow(clippy::cast_precision_loss)] #[allow(clippy::cast_precision_loss)]

12
src/widget/segmented_button/vertical.rs
View file

@ -45,13 +45,14 @@ where
} }
#[allow(clippy::cast_precision_loss)] #[allow(clippy::cast_precision_loss)]
fn variant_button_bounds( fn variant_button_bounds<'b>(
&self, &'b self,
state: &LocalState, state: &'b LocalState,
mut bounds: Rectangle, mut bounds: Rectangle,
) -> impl Iterator<Item = (Entity, Rectangle)> { ) -> Box<dyn Iterator<Item = (Entity, Rectangle)> + 'b> {
let spacing = f32::from(self.spacing); let spacing = f32::from(self.spacing);
Box::new(
self.model self.model
.order .order
.iter() .iter()
@ -62,7 +63,8 @@ where
this_bounds.height = state.internal_layout[0].height; this_bounds.height = state.internal_layout[0].height;
bounds.y += this_bounds.height + spacing; bounds.y += this_bounds.height + spacing;
(key, this_bounds) (key, this_bounds)
}) }),
)
} }
#[allow(clippy::cast_precision_loss)] #[allow(clippy::cast_precision_loss)]

8
src/widget/segmented_button/widget.rs
View file

@ -33,11 +33,11 @@ pub trait SegmentedVariant {
) -> super::Appearance; ) -> super::Appearance;
/// Calculates the bounds for visible buttons. /// Calculates the bounds for visible buttons.
fn variant_button_bounds( fn variant_button_bounds<'b>(
&self, &'b self,
state: &LocalState, state: &'b LocalState,
bounds: Rectangle, bounds: Rectangle,
) -> impl Iterator<Item = (Entity, Rectangle)>; ) -> Box<dyn Iterator<Item = (Entity, Rectangle)> + 'b>;
/// Calculates the layout of this variant. /// Calculates the layout of this variant.
fn variant_layout( fn variant_layout(