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

cleanup

Browse source
This commit is contained in:
Vukašin Vojinović 2025-12-09 21:29:39 +01:00 • committed by Michael Murphy
parent e45d2ea694
commit db6fbfbce7
1 changed files with 40 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/view/mod.rs
View file

@ -192,11 +192,9 @@ fn pin_button(workspace: &Workspace) -> cosmic::Element<'static, Msg> {
widget::button::custom( widget::button::custom(
widget::icon::from_name("pin-symbolic") widget::icon::from_name("pin-symbolic")
.symbolic(true) .symbolic(true)
.size(16), //.style(|theme, status| todo!()) .size(16),
) )
.padding([4, 8]) .padding([4, 8])
//.class(cosmic::theme::Button::Icon)
//.class(cosmic::theme::Button::Image)
.class(cosmic::theme::Button::Custom { .class(cosmic::theme::Button::Custom {
// TODO adjust state for hover, etc. // TODO adjust state for hover, etc.
active: Box::new(move |_, theme| pin_button_style(theme, is_pinned)), active: Box::new(move |_, theme| pin_button_style(theme, is_pinned)),
@ -204,7 +202,6 @@ fn pin_button(workspace: &Workspace) -> cosmic::Element<'static, Msg> {
hovered: Box::new(move |_, theme| pin_button_style(theme, is_pinned)), hovered: Box::new(move |_, theme| pin_button_style(theme, is_pinned)),
pressed: Box::new(move |_, theme| pin_button_style(theme, is_pinned)), pressed: Box::new(move |_, theme| pin_button_style(theme, is_pinned)),
}) })
//.class(cosmic::theme::Button::Standard)
// TODO style selected correctly // TODO style selected correctly
.selected(workspace.is_pinned()) .selected(workspace.is_pinned())
.on_press(Msg::TogglePinned(workspace.handle().clone())), .on_press(Msg::TogglePinned(workspace.handle().clone())),
@ -527,10 +524,8 @@ fn toplevel_preview(toplevel: &Toplevel, is_being_dragged: bool) -> cosmic::Elem
row![label] row![label]
} }
.align_y(Alignment::Center); .align_y(Alignment::Center);
let alpha = if is_being_dragged { 0.5 } else { 1.0 };
crate::widgets::size_cross_nth( let title = row![
vec![
row![
widget::button::custom(label) widget::button::custom(label)
.on_press(Msg::ActivateToplevel(toplevel.handle.clone())) .on_press(Msg::ActivateToplevel(toplevel.handle.clone()))
.class(cosmic::theme::Button::Icon) .class(cosmic::theme::Button::Icon)
@ -550,14 +545,15 @@ fn toplevel_preview(toplevel: &Toplevel, is_being_dragged: bool) -> cosmic::Elem
} }
})) }))
.apply(widget::container) .apply(widget::container)
.width(Length::FillPortion(5)), .width(Length::Fill),
widget::horizontal_space().width(Length::Fixed(8.0)),
close_button(Msg::CloseToplevel(toplevel.handle.clone())) close_button(Msg::CloseToplevel(toplevel.handle.clone()))
] ]
.padding([0, 0, 4, 0]) .spacing(8)
.align_y(Alignment::Center) .padding([0, 0, 2, 0])
.into(), .align_y(Alignment::Center);
widget::button::custom(capture_image(toplevel.img.as_ref(), alpha))
let alpha = if is_being_dragged { 0.5 } else { 1.0 };
let preview = widget::button::custom(capture_image(toplevel.img.as_ref(), alpha))
.selected( .selected(
toplevel toplevel
.info .info
@ -565,15 +561,13 @@ fn toplevel_preview(toplevel: &Toplevel, is_being_dragged: bool) -> cosmic::Elem
.contains(&zcosmic_toplevel_handle_v1::State::Activated), .contains(&zcosmic_toplevel_handle_v1::State::Activated),
) )
.class(cosmic::theme::Button::Image) .class(cosmic::theme::Button::Image)
.on_press(Msg::ActivateToplevel(toplevel.handle.clone())) .on_press(Msg::ActivateToplevel(toplevel.handle.clone()));
.into(),
], crate::widgets::size_cross_nth(
vec![title.into(), preview.into()],
Axis::Vertical, Axis::Vertical,
1, // Allocate width to match capture image 1, // Allocate width to match capture image
) )
//.spacing(4)
//.align_items(Alignment::Center)
//.width(Length::Fill)
.into() .into()
} }
@ -615,11 +609,9 @@ fn toplevel_previews<'a>(
.align_x(Alignment::Center) .align_x(Alignment::Center)
.width(width) .width(width)
.height(height) .height(height)
//.spacing(16)
.padding(12), .padding(12),
) )
.on_press(Msg::Close) .on_press(Msg::Close)
//.align_items(Alignment::Center)
.into() .into()
} }