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

2
src/view/mod.rs
View file

@ -250,7 +250,7 @@ pub(crate) fn toplevel_preview(toplevel: &Toplevel) -> cosmic::Element<Msg> {
row![label] row![label]
} }
.padding(4); .padding(4);
crate::widgets::workspace_item( crate::widgets::toplevel_item(
vec![ vec![
close_button(Msg::CloseToplevel(toplevel.handle.clone())), close_button(Msg::CloseToplevel(toplevel.handle.clone())),
widget::button(capture_image(toplevel.img.as_ref())) widget::button(capture_image(toplevel.img.as_ref()))

4
src/widgets/mod.rs
View file

@ -13,8 +13,8 @@ mod image_bg;
pub use image_bg::image_bg; pub use image_bg::image_bg;
mod workspace_bar; mod workspace_bar;
pub use workspace_bar::workspace_bar; pub use workspace_bar::workspace_bar;
mod workspace_item; mod toplevel_item;
pub use workspace_item::workspace_item; pub use toplevel_item::toplevel_item;
mod mouse_interaction_wrapper; mod mouse_interaction_wrapper;
pub use mouse_interaction_wrapper::mouse_interaction_wrapper; pub use mouse_interaction_wrapper::mouse_interaction_wrapper;
mod toplevels; mod toplevels;

15
src/widgets/workspace_item.rs → src/widgets/toplevel_item.rs
View file

@ -1,4 +1,3 @@
// TODO rename
// combine widgets // combine widgets
// Hack: this widget defines it's width as the second child's width // Hack: this widget defines it's width as the second child's width
// So the width of the image will be the overall width. // So the width of the image will be the overall width.
@ -45,26 +44,26 @@ impl AxisExt for Axis {
} }
} }
pub fn workspace_item<Msg>(children: Vec<cosmic::Element<Msg>>, axis: Axis) -> WorkspaceItem<Msg> { pub fn toplevel_item<Msg>(children: Vec<cosmic::Element<Msg>>, axis: Axis) -> ToplevelItem<Msg> {
WorkspaceItem { ToplevelItem {
axis, axis,
children, children,
_msg: PhantomData, _msg: PhantomData,
} }
} }
pub struct WorkspaceItem<'a, Msg> { pub struct ToplevelItem<'a, Msg> {
axis: Axis, axis: Axis,
children: Vec<cosmic::Element<'a, Msg>>, children: Vec<cosmic::Element<'a, Msg>>,
_msg: PhantomData<Msg>, _msg: PhantomData<Msg>,
} }
impl<'a, Msg> Widget<Msg, cosmic::Theme, cosmic::Renderer> for WorkspaceItem<'a, Msg> { impl<'a, Msg> Widget<Msg, cosmic::Theme, cosmic::Renderer> for ToplevelItem<'a, Msg> {
fn size(&self) -> Size<Length> { fn size(&self) -> Size<Length> {
Size { Size {
// width: Length::Fill // width: Length::Fill
// XXX doesn't work when used in standard `row` widget // XXX doesn't work when used in standard `row` widget
// But fixes allocation of `dnd_source` wrapping this, within `Workspaces` row // But fixes allocation of `dnd_source` wrapping this, within `Toplevels` row
width: Length::Shrink, width: Length::Shrink,
// TODO Make depend on orientation or drop that option // TODO Make depend on orientation or drop that option
height: Length::Shrink, height: Length::Shrink,
@ -220,8 +219,8 @@ impl<'a, Msg> Widget<Msg, cosmic::Theme, cosmic::Renderer> for WorkspaceItem<'a,
} }
} }
impl<'a, Msg: 'static> From<WorkspaceItem<'a, Msg>> for cosmic::Element<'a, Msg> { impl<'a, Msg: 'static> From<ToplevelItem<'a, Msg>> for cosmic::Element<'a, Msg> {
fn from(widget: WorkspaceItem<'a, Msg>) -> Self { fn from(widget: ToplevelItem<'a, Msg>) -> Self {
cosmic::Element::new(widget) cosmic::Element::new(widget)
} }
} }