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

If toplevels don't fit, scale by same factor

Browse source
This commit is contained in:
Ian Douglas Scott 2024-01-22 17:19:46 -08:00
parent b60102c908
commit 82951822b9
1 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/widgets/toplevels.rs
View file

@ -73,10 +73,23 @@ impl<'a, Msg> Widget<Msg, cosmic::Renderer> for Toplevels<'a, Msg> {
// TODO configurable // TODO configurable
let spacing = 16; let spacing = 16;
// TODO scaling // Get total requested main axis length if widget could have all the space
let total_spacing = 0.max(spacing * (self.children.len() - 1)) as f32; let total_spacing = spacing * (self.children.len() - 1).max(0);
let max_main = let requested_mains = self
(self.axis.main(limits.max()) - total_spacing) / self.children().len() as f32; .children
.iter()
.zip(tree.children.iter_mut())
.map(|(child, tree)| {
let child_limits = layout::Limits::new(Size::ZERO, limits.max());
let mut layout = child.layout(tree, renderer, &child_limits);
self.axis.main(layout.size())
})
.collect::<Vec<_>>();
let requested_main_total: f32 = requested_mains.iter().sum::<f32>() + total_spacing as f32;
let scale_factor = (self.axis.main(limits.max()) / requested_main_total).min(1.0);
dbg!(scale_factor);
let max_cross = self.axis.cross(limits.max()); let max_cross = self.axis.cross(limits.max());
// XXX sill allocating maximum main axis? // XXX sill allocating maximum main axis?
@ -87,11 +100,15 @@ impl<'a, Msg> Widget<Msg, cosmic::Renderer> for Toplevels<'a, Msg> {
.children .children
.iter() .iter()
.zip(tree.children.iter_mut()) .zip(tree.children.iter_mut())
.map(|(child, tree)| { .zip(requested_mains.iter())
.map(|((child, tree), requested_main)| {
if !first { if !first {
total_main += spacing as f32; total_main += spacing as f32;
} }
first = false; first = false;
let max_main = requested_main * scale_factor;
let (max_width, max_height) = self.axis.pack(max_main, max_cross); let (max_width, max_height) = self.axis.pack(max_main, max_cross);
let child_limits = let child_limits =
layout::Limits::new(Size::ZERO, Size::new(max_width, max_height)); layout::Limits::new(Size::ZERO, Size::new(max_width, max_height));