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

chore: update iced/libcosmic

Browse source
This commit is contained in:
Vukašin Vojinović 2024-10-24 00:15:05 +02:00 • committed by Victoria Brekenfeld
parent 0d0b89d538
commit 7de52054ff
12 changed files with 502 additions and 549 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/shell/grabs/menu/item.rs
View file

@ -3,17 +3,17 @@ use cosmic::{
iced_core::{
event, layout, mouse, overlay,
renderer::{Quad, Style},
widget::{tree, Id, OperationOutputWrapper, Tree, Widget},
widget::{tree, Id, Tree, Widget},
Background, Border, Clipboard, Color, Event, Layout, Length, Rectangle,
Renderer as IcedRenderer, Shell, Size,
},
widget::button::StyleSheet,
widget::button::Catalog,
};
pub struct SubmenuItem<'a, Message> {
elem: cosmic::Element<'a, Message>,
idx: usize,
styling: <cosmic::Theme as StyleSheet>::Style,
styling: <cosmic::Theme as Catalog>::Class,
}
impl<'a, Message> SubmenuItem<'a, Message> {
@ -25,7 +25,7 @@ impl<'a, Message> SubmenuItem<'a, Message> {
}
}
pub fn style(mut self, style: <cosmic::Theme as StyleSheet>::Style) -> Self {
pub fn style(mut self, style: <cosmic::Theme as Catalog>::Class) -> Self {
self.styling = style;
self
}
@ -133,7 +133,7 @@ where
state: &mut Tree,
layout: Layout<'_>,
renderer: &cosmic::Renderer,
operation: &mut dyn cosmic::widget::Operation<OperationOutputWrapper<Message>>,
operation: &mut dyn cosmic::widget::Operation<()>,
) {
let state = &mut state.children[0];
let layout = layout.children().next().unwrap();
@ -206,10 +206,13 @@ where
state: &'b mut Tree,
layout: Layout<'_>,
renderer: &cosmic::Renderer,
translation: cosmic::iced::Vector,
) -> Option<overlay::Element<'b, Message, cosmic::Theme, cosmic::Renderer>> {
let state = &mut state.children[0];
let layout = layout.children().next().unwrap();
self.elem.as_widget_mut().overlay(state, layout, renderer)
self.elem
.as_widget_mut()
.overlay(state, layout, renderer, translation)
}
}

36
src/shell/grabs/menu/mod.rs
View file

@ -7,10 +7,10 @@ use calloop::LoopHandle;
use cosmic::{
iced::{Alignment, Background},
iced_core::{alignment::Horizontal, Border, Length, Rectangle as IcedRectangle},
iced_widget::{self, text::Appearance as TextAppearance, Column, Row},
iced_widget::{self, text::Style as TextStyle, Column, Row},
theme,
widget::{button, divider, horizontal_space, icon::from_name, text},
Apply as _, Command,
Apply as _, Task,
};
use smithay::{
backend::{
@ -202,7 +202,7 @@ impl Program for ContextMenu {
&mut self,
message: Self::Message,
loop_handle: &LoopHandle<'static, crate::state::State>,
) -> Command<Self::Message> {
) -> Task<Self::Message> {
match message {
Message::ItemPressed(idx) => {
if let Some(Item::Entry { on_press, .. }) = self.items.get_mut(idx) {
@ -331,7 +331,7 @@ impl Program for ContextMenu {
}
};
Command::none()
Task::none()
}
fn view(&self) -> cosmic::Element<'_, Self::Message> {
@ -350,7 +350,7 @@ impl Program for ContextMenu {
match item {
Item::Separator => divider::horizontal::light().into(),
Item::Submenu { title, .. } => Row::with_children(vec![
horizontal_space(16).into(),
horizontal_space().width(16).into(),
text::body(title).width(mode).into(),
from_name("go-next-symbolic")
.size(16)
@ -361,7 +361,7 @@ impl Program for ContextMenu {
.spacing(8)
.width(width)
.padding([8, 16])
.align_items(Alignment::Center)
.align_y(Alignment::Center)
.apply(|row| item::SubmenuItem::new(row, idx))
.style(theme::Button::MenuItem)
.into(),
@ -378,20 +378,20 @@ impl Program for ContextMenu {
.size(16)
.prefer_svg(true)
.icon()
.style(theme::Svg::custom(|theme| iced_widget::svg::Appearance {
.class(theme::Svg::custom(|theme| iced_widget::svg::Style {
color: Some(theme.cosmic().accent.base.into()),
}))
.into()
} else {
horizontal_space(16).into()
horizontal_space().width(16).into()
},
text::body(title)
.width(mode)
.style(if *disabled {
.class(if *disabled {
theme::Text::Custom(|theme| {
let mut color = theme.cosmic().background.component.on;
color.alpha *= 0.5;
TextAppearance {
TextStyle {
color: Some(color.into()),
}
})
@ -399,17 +399,17 @@ impl Program for ContextMenu {
theme::Text::Default
})
.into(),
horizontal_space(16).into(),
horizontal_space().width(16).into(),
];
if let Some(shortcut) = shortcut.as_ref() {
components.push(
text::body(shortcut)
.horizontal_alignment(Horizontal::Right)
.align_x(Horizontal::Right)
.width(Length::Shrink)
.style(theme::Text::Custom(|theme| {
.class(theme::Text::Custom(|theme| {
let mut color = theme.cosmic().background.component.on;
color.alpha *= 0.75;
TextAppearance {
TextStyle {
color: Some(color.into()),
}
}))
@ -420,12 +420,12 @@ impl Program for ContextMenu {
Row::with_children(components)
.spacing(8)
.width(mode)
.align_items(Alignment::Center)
.align_y(Alignment::Center)
.apply(button::custom)
.width(width)
.padding([8, 16])
.on_press_maybe((!disabled).then_some(Message::ItemPressed(idx)))
.style(theme::Button::MenuItem)
.class(theme::Button::MenuItem)
.into()
}
}
@ -433,10 +433,10 @@ impl Program for ContextMenu {
.width(Length::Shrink)
.apply(iced_widget::container)
.padding(1)
.style(theme::Container::custom(|theme| {
.class(theme::Container::custom(|theme| {
let cosmic = theme.cosmic();
let component = &cosmic.background.component;
iced_widget::container::Appearance {
iced_widget::container::Style {
icon_color: Some(cosmic.accent.base.into()),
text_color: Some(component.on.into()),
background: Some(Background::Color(component.base.into())),