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

Rename inaccurately named widget

Browse source
This commit is contained in:
Ian Douglas Scott 2024-04-25 14:17:43 -07:00
parent 8f571e9e25
commit 96cca005b7
3 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

227
src/widgets/workspace_item.rs
View file

@ -1,227 +0,0 @@
// TODO rename
// combine widgets
// Hack: this widget defines it's width as the second child's width
// So the width of the image will be the overall width.
use cosmic::iced::{
advanced::{
layout::{self, flex::Axis},
mouse, renderer,
widget::{Operation, OperationOutputWrapper, Tree},
Clipboard, Layout, Shell, Widget,
},
event::{self, Event},
Length, Point, Rectangle, Size,
};
use std::marker::PhantomData;
// Duplicate of private methods
trait AxisExt {
fn main(&self, size: Size) -> f32;
fn cross(&self, size: Size) -> f32;
fn pack(&self, main: f32, cross: f32) -> (f32, f32);
}
impl AxisExt for Axis {
fn main(&self, size: Size) -> f32 {
match self {
Axis::Horizontal => size.width,
Axis::Vertical => size.height,
}
}
fn cross(&self, size: Size) -> f32 {
match self {
Axis::Horizontal => size.height,
Axis::Vertical => size.width,
}
}
fn pack(&self, main: f32, cross: f32) -> (f32, f32) {
match self {
Axis::Horizontal => (main, cross),
Axis::Vertical => (cross, main),
}
}
}
pub fn workspace_item<Msg>(children: Vec<cosmic::Element<Msg>>, axis: Axis) -> WorkspaceItem<Msg> {
WorkspaceItem {
axis,
children,
_msg: PhantomData,
}
}
pub struct WorkspaceItem<'a, Msg> {
axis: Axis,
children: Vec<cosmic::Element<'a, Msg>>,
_msg: PhantomData<Msg>,
}
impl<'a, Msg> Widget<Msg, cosmic::Theme, cosmic::Renderer> for WorkspaceItem<'a, Msg> {
fn size(&self) -> Size<Length> {
Size {
// width: Length::Fill
// XXX doesn't work when used in standard `row` widget
// But fixes allocation of `dnd_source` wrapping this, within `Workspaces` row
width: Length::Shrink,
// TODO Make depend on orientation or drop that option
height: Length::Shrink,
}
}
fn layout(
&self,
tree: &mut Tree,
renderer: &cosmic::Renderer,
limits: &layout::Limits,
) -> layout::Node {
let max_main = self.axis.main(limits.max());
let max_cross = self.axis.cross(limits.max());
// XXX cleaner solution
// Get layout of main widget, to set overall cross axis size
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 layout = self.children[1]
.as_widget()
.layout(tree, renderer, &child_limits);
let max_cross = self.axis.cross(layout.size());
// XXX sill allocating maximum main axis?
// - what was it doing before?
let mut total_main = 0.0;
let nodes = self
.children
.iter()
.zip(tree.children.iter_mut())
.map(|(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);
// Center on cross axis
let cross = ((max_cross - self.axis.cross(layout.size())) / 2.).max(0.);
let (x, y) = self.axis.pack(total_main, cross);
layout = layout.move_to(Point::new(x, y));
total_main += self.axis.main(layout.size());
layout
})
.collect();
let (total_width, total_height) = self.axis.pack(total_main, max_cross);
let size = Size::new(total_width, total_height);
layout::Node::with_children(size, nodes)
}
fn operate(
&self,
tree: &mut Tree,
layout: Layout<'_>,
renderer: &cosmic::Renderer,
operation: &mut dyn Operation<OperationOutputWrapper<Msg>>,
) {
operation.container(None, layout.bounds(), &mut |operation| {
self.children
.iter()
.zip(&mut tree.children)
.zip(layout.children())
.for_each(|((child, state), layout)| {
child
.as_widget()
.operate(state, layout, renderer, operation);
});
});
}
fn on_event(
&mut self,
tree: &mut Tree,
event: Event,
layout: Layout<'_>,
cursor: mouse::Cursor,
renderer: &cosmic::Renderer,
clipboard: &mut dyn Clipboard,
shell: &mut Shell<'_, Msg>,
viewport: &Rectangle,
) -> event::Status {
self.children
.iter_mut()
.zip(&mut tree.children)
.zip(layout.children())
.map(|((child, state), layout)| {
child.as_widget_mut().on_event(
state,
event.clone(),
layout,
cursor,
renderer,
clipboard,
shell,
viewport,
)
})
.fold(event::Status::Ignored, event::Status::merge)
}
fn mouse_interaction(
&self,
tree: &Tree,
layout: Layout<'_>,
cursor: mouse::Cursor,
viewport: &Rectangle,
renderer: &cosmic::Renderer,
) -> mouse::Interaction {
self.children
.iter()
.zip(&tree.children)
.zip(layout.children())
.map(|((child, state), layout)| {
child
.as_widget()
.mouse_interaction(state, layout, cursor, viewport, renderer)
})
.max()
.unwrap_or_default()
}
fn draw(
&self,
tree: &Tree,
renderer: &mut cosmic::Renderer,
theme: &cosmic::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor: mouse::Cursor,
viewport: &Rectangle,
) {
if let Some(viewport) = layout.bounds().intersection(viewport) {
for ((child, state), layout) in self
.children
.iter()
.zip(&tree.children)
.zip(layout.children())
{
child
.as_widget()
.draw(state, renderer, theme, style, layout, cursor, &viewport);
}
}
}
fn children(&self) -> Vec<Tree> {
self.children.iter().map(Tree::new).collect()
}
fn diff(&mut self, tree: &mut Tree) {
tree.diff_children(&mut self.children);
}
}
impl<'a, Msg: 'static> From<WorkspaceItem<'a, Msg>> for cosmic::Element<'a, Msg> {
fn from(widget: WorkspaceItem<'a, Msg>) -> Self {
cosmic::Element::new(widget)
}
}