leyoda/cosmic-workspaces
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

toplevel_layout: Move logic into a requested_main_total method

Browse source
This commit is contained in:
Ian Douglas Scott 2025-02-06 13:40:45 -08:00
parent 136d02ce28
commit eb69aba7b2
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/widgets/toplevels/toplevel_layout/row_col_toplevel_layout.rs
View file

@ -7,6 +7,18 @@ pub(crate) struct RowColToplevelLayout {
pub spacing: u32, pub spacing: u32,
} }
impl RowColToplevelLayout {
// Get total requested main axis length if widget could have all the space
fn requested_main_total(&self, toplevels: &[LayoutToplevel<'_>]) -> f32 {
let total_spacing = self.spacing as usize * (toplevels.len().saturating_sub(1)).max(0);
toplevels
.iter()
.map(|t| self.axis.main(t.preferred_size))
.sum::<f32>()
+ total_spacing as f32
}
}
impl ToplevelLayout for RowColToplevelLayout { impl ToplevelLayout for RowColToplevelLayout {
fn size(&self) -> Size<Length> { fn size(&self) -> Size<Length> {
Size { Size {
@ -21,13 +33,7 @@ impl ToplevelLayout for RowColToplevelLayout {
max_limit: Size, max_limit: Size,
toplevels: &[LayoutToplevel<'_>], toplevels: &[LayoutToplevel<'_>],
) -> impl Iterator<Item = Rectangle> { ) -> impl Iterator<Item = Rectangle> {
// Get total requested main axis length if widget could have all the space let requested_main_total = self.requested_main_total(toplevels);
let total_spacing = self.spacing as usize * (toplevels.len().saturating_sub(1)).max(0);
let requested_main_total: f32 = toplevels
.iter()
.map(|t| self.axis.main(t.preferred_size))
.sum::<f32>()
+ total_spacing as f32;
let scale_factor = (self.axis.main(max_limit) / requested_main_total).min(1.0); let scale_factor = (self.axis.main(max_limit) / requested_main_total).min(1.0);
let max_cross = self.axis.cross(max_limit); let max_cross = self.axis.cross(max_limit);