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

improv(view): make workspace item sizing more dynamic

Browse source 
This makes the `workspace_bar` more responsive to different child sizes, which enables fixing the size of the smaller dimension of the screencopy, while allowing it to expand unrestricted in the larger dimension (to match the aspect ratio).
This commit is contained in:
Vukašin Vojinović 2025-04-09 13:40:08 +02:00 • committed by Ian Douglas Scott
parent d4ddae7799
commit 2b7a8b133e
5 changed files with 322 additions and 289 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/widgets/workspace_bar.rs
View file

@ -61,8 +61,8 @@ pub struct WorkspaceBar<'a, Msg> {
impl<Msg> Widget<Msg, cosmic::Theme, cosmic::Renderer> for WorkspaceBar<'_, Msg> {
fn size(&self) -> Size<Length> {
Size {
width: Length::Fill,
height: Length::Fill,
width: Length::Shrink,
height: Length::Shrink,
}
}
@ -72,48 +72,45 @@ impl<Msg> Widget<Msg, cosmic::Theme, cosmic::Renderer> for WorkspaceBar<'_, Msg>
renderer: &cosmic::Renderer,
limits: &layout::Limits,
) -> layout::Node {
// TODO configurable
let spacing = 8.0;
/*
layout::flex::resolve(
layout::flex::Axis::Vertical,
renderer,
&limits,
iced::Padding::ZERO,
0.0, // spacing
iced::Alignment::Start,
&self.children,
&mut tree.children,
)
*/
if self.children.is_empty() {
return layout::Node::new(limits.min());
}
let total_spacing = spacing * (self.children.len().saturating_sub(1)).max(0) as f32;
let max_main =
(self.axis.main(limits.max()) - total_spacing) / self.children().len() as f32;
// TODO configurable
let spacing = 8.0;
let total_spacing = spacing * (self.children.len() - 1) as f32;
let max_main = (self.axis.main(limits.max()) - total_spacing) / self.children.len() as f32;
let max_cross = self.axis.cross(limits.max());
let mut total_main = 0.0;
let mut max_child_cross = 0.0;
let nodes = self
.children
.iter()
.zip(tree.children.iter_mut())
.map(|(child, tree)| {
.enumerate()
.map(|(i, (child, tree))| {
let (max_width, max_height) = self.axis.pack(max_main, max_cross);
let child_limits =
layout::Limits::new(Size::ZERO, Size::new(max_width, max_height));
let mut layout = child.as_widget().layout(tree, renderer, &child_limits);
let child_size = layout.size();
let (x, y) = self.axis.pack(total_main, 0.0);
layout = layout.move_to(Point::new(x, y));
total_main += self.axis.main(layout.size()) + spacing;
max_child_cross = f32::max(max_child_cross, self.axis.cross(child_size));
let main = self.axis.main(child_size);
// XXX Don't add spacing for 0 length `dnd_source` placeholder widget
if main != 0.0 {
total_main += main;
if i < self.children.len() - 1 {
total_main += spacing;
}
}
layout
})
.collect();
let (total_width, total_height) = self.axis.pack(total_main, max_cross);
let (total_width, total_height) = self.axis.pack(total_main, max_child_cross);
let size = Size::new(total_width, total_height);
layout::Node::with_children(size, nodes)
}