Update libcosmic/iced
This commit is contained in:
Ian Douglas Scott
Victoria Brekenfeld
parent
7234a81672
commit
39ebf39e4f
11 changed files with 547 additions and 461 deletions
|
|
@ -4,28 +4,20 @@ use cosmic::{
|
|||
event, layout, mouse, overlay,
|
||||
renderer::{Quad, Style},
|
||||
widget::{tree, Id, OperationOutputWrapper, Tree, Widget},
|
||||
Background, Clipboard, Color, Event, Layout, Length, Rectangle, Renderer as IcedRenderer,
|
||||
Shell,
|
||||
Background, Border, Clipboard, Color, Event, Layout, Length, Rectangle,
|
||||
Renderer as IcedRenderer, Shell, Size,
|
||||
},
|
||||
widget::button::StyleSheet,
|
||||
};
|
||||
|
||||
pub struct SubmenuItem<'a, Message, Renderer>
|
||||
where
|
||||
Renderer: IcedRenderer,
|
||||
Renderer::Theme: StyleSheet,
|
||||
{
|
||||
elem: Element<'a, Message, Renderer>,
|
||||
pub struct SubmenuItem<'a, Message> {
|
||||
elem: cosmic::Element<'a, Message>,
|
||||
idx: usize,
|
||||
styling: <Renderer::Theme as StyleSheet>::Style,
|
||||
styling: <cosmic::Theme as StyleSheet>::Style,
|
||||
}
|
||||
|
||||
impl<'a, Message, Renderer> SubmenuItem<'a, Message, Renderer>
|
||||
where
|
||||
Renderer: IcedRenderer,
|
||||
Renderer::Theme: StyleSheet,
|
||||
{
|
||||
pub fn new(elem: impl Into<Element<'a, Message, Renderer>>, idx: usize) -> Self {
|
||||
impl<'a, Message> SubmenuItem<'a, Message> {
|
||||
pub fn new(elem: impl Into<cosmic::Element<'a, Message>>, idx: usize) -> Self {
|
||||
Self {
|
||||
elem: elem.into(),
|
||||
idx,
|
||||
|
|
@ -33,7 +25,7 @@ where
|
|||
}
|
||||
}
|
||||
|
||||
pub fn style(mut self, style: <Renderer::Theme as StyleSheet>::Style) -> Self {
|
||||
pub fn style(mut self, style: <cosmic::Theme as StyleSheet>::Style) -> Self {
|
||||
self.styling = style;
|
||||
self
|
||||
}
|
||||
|
|
@ -48,28 +40,22 @@ struct State {
|
|||
cursor_over: bool,
|
||||
}
|
||||
|
||||
impl<'a, Message, Renderer> Widget<Message, Renderer> for SubmenuItem<'a, Message, Renderer>
|
||||
impl<'a, Message> Widget<Message, cosmic::Theme, cosmic::Renderer> for SubmenuItem<'a, Message>
|
||||
where
|
||||
Renderer: IcedRenderer,
|
||||
Renderer::Theme: StyleSheet,
|
||||
Message: CursorEvents,
|
||||
{
|
||||
fn id(&self) -> Option<Id> {
|
||||
None
|
||||
}
|
||||
|
||||
fn width(&self) -> Length {
|
||||
self.elem.as_widget().width()
|
||||
}
|
||||
|
||||
fn height(&self) -> Length {
|
||||
self.elem.as_widget().height()
|
||||
fn size(&self) -> Size<Length> {
|
||||
self.elem.as_widget().size()
|
||||
}
|
||||
|
||||
fn layout(
|
||||
&self,
|
||||
state: &mut Tree,
|
||||
renderer: &Renderer,
|
||||
renderer: &cosmic::Renderer,
|
||||
limits: &layout::Limits,
|
||||
) -> layout::Node {
|
||||
let state = &mut state.children[0];
|
||||
|
|
@ -80,8 +66,8 @@ where
|
|||
fn draw(
|
||||
&self,
|
||||
state: &Tree,
|
||||
renderer: &mut Renderer,
|
||||
theme: &<Renderer as IcedRenderer>::Theme,
|
||||
renderer: &mut cosmic::Renderer,
|
||||
theme: &cosmic::Theme,
|
||||
style: &Style,
|
||||
layout: Layout<'_>,
|
||||
cursor: mouse::Cursor,
|
||||
|
|
@ -89,17 +75,20 @@ where
|
|||
) {
|
||||
let widget_state = state.state.downcast_ref::<State>();
|
||||
let styling = if widget_state.cursor_over {
|
||||
theme.hovered(true, &self.styling)
|
||||
theme.hovered(true, false, &self.styling)
|
||||
} else {
|
||||
theme.active(true, &self.styling)
|
||||
theme.active(true, false, &self.styling)
|
||||
};
|
||||
|
||||
renderer.fill_quad(
|
||||
Quad {
|
||||
bounds: layout.bounds(),
|
||||
border_radius: styling.border_radius,
|
||||
border_width: styling.border_width,
|
||||
border_color: styling.border_color,
|
||||
border: Border {
|
||||
radius: styling.border_radius,
|
||||
width: styling.border_width,
|
||||
color: styling.border_color,
|
||||
},
|
||||
shadow: Default::default(),
|
||||
},
|
||||
styling
|
||||
.background
|
||||
|
|
@ -143,7 +132,7 @@ where
|
|||
&self,
|
||||
state: &mut Tree,
|
||||
layout: Layout<'_>,
|
||||
renderer: &Renderer,
|
||||
renderer: &cosmic::Renderer,
|
||||
operation: &mut dyn cosmic::widget::Operation<OperationOutputWrapper<Message>>,
|
||||
) {
|
||||
let state = &mut state.children[0];
|
||||
|
|
@ -159,7 +148,7 @@ where
|
|||
event: Event,
|
||||
layout: Layout<'_>,
|
||||
cursor: mouse::Cursor,
|
||||
renderer: &Renderer,
|
||||
renderer: &cosmic::Renderer,
|
||||
clipboard: &mut dyn Clipboard,
|
||||
shell: &mut Shell<'_, Message>,
|
||||
viewport: &Rectangle,
|
||||
|
|
@ -203,7 +192,7 @@ where
|
|||
layout: Layout<'_>,
|
||||
cursor: mouse::Cursor,
|
||||
viewport: &Rectangle,
|
||||
renderer: &Renderer,
|
||||
renderer: &cosmic::Renderer,
|
||||
) -> mouse::Interaction {
|
||||
let state = &state.children[0];
|
||||
let layout = layout.children().next().unwrap();
|
||||
|
|
@ -216,22 +205,19 @@ where
|
|||
&'b mut self,
|
||||
state: &'b mut Tree,
|
||||
layout: Layout<'_>,
|
||||
renderer: &Renderer,
|
||||
) -> Option<overlay::Element<'b, Message, Renderer>> {
|
||||
renderer: &cosmic::Renderer,
|
||||
) -> 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)
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
|
||||
for SubmenuItem<'a, Message, Renderer>
|
||||
impl<'a, Message> Into<cosmic::Element<'a, Message>> for SubmenuItem<'a, Message>
|
||||
where
|
||||
Renderer: IcedRenderer + 'a,
|
||||
Renderer::Theme: StyleSheet,
|
||||
Message: CursorEvents + 'a,
|
||||
{
|
||||
fn into(self) -> Element<'a, Message, Renderer> {
|
||||
fn into(self) -> cosmic::Element<'a, Message> {
|
||||
Element::new(self)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ use std::{
|
|||
use calloop::LoopHandle;
|
||||
use cosmic::{
|
||||
iced::Background,
|
||||
iced_core::{alignment::Horizontal, Length, Pixels, Rectangle as IcedRectangle},
|
||||
iced_core::{alignment::Horizontal, Border, Length, Pixels, Rectangle as IcedRectangle},
|
||||
iced_widget::{self, horizontal_rule, text::Appearance as TextAppearance, Column, Row},
|
||||
theme,
|
||||
widget::{button, horizontal_space, icon::from_name, text},
|
||||
|
|
@ -319,7 +319,7 @@ impl Program for ContextMenu {
|
|||
Command::none()
|
||||
}
|
||||
|
||||
fn view(&self) -> crate::utils::iced::Element<'_, Self::Message> {
|
||||
fn view(&self) -> cosmic::Element<'_, Self::Message> {
|
||||
let width = self
|
||||
.row_width
|
||||
.lock()
|
||||
|
|
@ -331,99 +331,93 @@ impl Program for ContextMenu {
|
|||
_ => Length::Fill,
|
||||
};
|
||||
|
||||
Column::with_children(
|
||||
self.items
|
||||
.iter()
|
||||
.enumerate()
|
||||
.map(|(idx, item)| match item {
|
||||
Item::Separator => horizontal_rule(1)
|
||||
.style(theme::Rule::LightDivider)
|
||||
.width(mode)
|
||||
.into(),
|
||||
Item::Submenu { title, .. } => Row::with_children(vec![
|
||||
horizontal_space(16).into(),
|
||||
text(title).width(mode).into(),
|
||||
from_name("go-next-symbolic")
|
||||
.size(16)
|
||||
.prefer_svg(true)
|
||||
.icon()
|
||||
.into(),
|
||||
])
|
||||
.spacing(8)
|
||||
.width(width)
|
||||
.padding([8, 24])
|
||||
.apply(|row| item::SubmenuItem::new(row, idx))
|
||||
.style(theme::Button::MenuItem)
|
||||
Column::with_children(self.items.iter().enumerate().map(|(idx, item)| {
|
||||
match item {
|
||||
Item::Separator => horizontal_rule(1)
|
||||
.style(theme::Rule::LightDivider)
|
||||
.width(mode)
|
||||
.into(),
|
||||
Item::Entry {
|
||||
title,
|
||||
shortcut,
|
||||
toggled,
|
||||
disabled,
|
||||
..
|
||||
} => {
|
||||
let mut components = vec![
|
||||
if *toggled {
|
||||
from_name("object-select-symbolic")
|
||||
.size(16)
|
||||
.prefer_svg(true)
|
||||
.icon()
|
||||
.style(theme::Svg::custom(|theme| {
|
||||
iced_widget::svg::Appearance {
|
||||
color: Some(theme.cosmic().accent.base.into()),
|
||||
}
|
||||
}))
|
||||
.into()
|
||||
} else {
|
||||
horizontal_space(16).into()
|
||||
},
|
||||
text(title)
|
||||
.width(mode)
|
||||
.style(if *disabled {
|
||||
theme::Text::Custom(|theme| {
|
||||
let mut color = theme.cosmic().background.component.on;
|
||||
color.alpha *= 0.5;
|
||||
TextAppearance {
|
||||
color: Some(color.into()),
|
||||
}
|
||||
})
|
||||
} else {
|
||||
theme::Text::Default
|
||||
})
|
||||
.into(),
|
||||
];
|
||||
if let Some(shortcut) = shortcut.as_ref() {
|
||||
components.push(
|
||||
text(shortcut)
|
||||
.line_height(Pixels(20.))
|
||||
.size(14)
|
||||
.horizontal_alignment(Horizontal::Right)
|
||||
.width(Length::Shrink)
|
||||
.style(theme::Text::Custom(|theme| {
|
||||
let mut color = theme.cosmic().background.component.on;
|
||||
color.alpha *= 0.75;
|
||||
TextAppearance {
|
||||
color: Some(color.into()),
|
||||
}
|
||||
}))
|
||||
.into(),
|
||||
);
|
||||
}
|
||||
components.push(horizontal_space(16).into());
|
||||
|
||||
Row::with_children(components)
|
||||
.spacing(8)
|
||||
Item::Submenu { title, .. } => Row::with_children(vec![
|
||||
horizontal_space(16).into(),
|
||||
text(title).width(mode).into(),
|
||||
from_name("go-next-symbolic")
|
||||
.size(16)
|
||||
.prefer_svg(true)
|
||||
.icon()
|
||||
.into(),
|
||||
])
|
||||
.spacing(8)
|
||||
.width(width)
|
||||
.padding([8, 24])
|
||||
.apply(|row| item::SubmenuItem::new(row, idx))
|
||||
.style(theme::Button::MenuItem)
|
||||
.into(),
|
||||
Item::Entry {
|
||||
title,
|
||||
shortcut,
|
||||
toggled,
|
||||
disabled,
|
||||
..
|
||||
} => {
|
||||
let mut components = vec![
|
||||
if *toggled {
|
||||
from_name("object-select-symbolic")
|
||||
.size(16)
|
||||
.prefer_svg(true)
|
||||
.icon()
|
||||
.style(theme::Svg::custom(|theme| iced_widget::svg::Appearance {
|
||||
color: Some(theme.cosmic().accent.base.into()),
|
||||
}))
|
||||
.into()
|
||||
} else {
|
||||
horizontal_space(16).into()
|
||||
},
|
||||
text(title)
|
||||
.width(mode)
|
||||
.apply(button)
|
||||
.width(width)
|
||||
.padding([8, 24])
|
||||
.on_press_maybe((!disabled).then_some(Message::ItemPressed(idx)))
|
||||
.style(theme::Button::MenuItem)
|
||||
.into()
|
||||
.style(if *disabled {
|
||||
theme::Text::Custom(|theme| {
|
||||
let mut color = theme.cosmic().background.component.on;
|
||||
color.alpha *= 0.5;
|
||||
TextAppearance {
|
||||
color: Some(color.into()),
|
||||
}
|
||||
})
|
||||
} else {
|
||||
theme::Text::Default
|
||||
})
|
||||
.into(),
|
||||
];
|
||||
if let Some(shortcut) = shortcut.as_ref() {
|
||||
components.push(
|
||||
text(shortcut)
|
||||
.line_height(Pixels(20.))
|
||||
.size(14)
|
||||
.horizontal_alignment(Horizontal::Right)
|
||||
.width(Length::Shrink)
|
||||
.style(theme::Text::Custom(|theme| {
|
||||
let mut color = theme.cosmic().background.component.on;
|
||||
color.alpha *= 0.75;
|
||||
TextAppearance {
|
||||
color: Some(color.into()),
|
||||
}
|
||||
}))
|
||||
.into(),
|
||||
);
|
||||
}
|
||||
})
|
||||
.collect(),
|
||||
)
|
||||
components.push(horizontal_space(16).into());
|
||||
|
||||
Row::with_children(components)
|
||||
.spacing(8)
|
||||
.width(mode)
|
||||
.apply(button)
|
||||
.width(width)
|
||||
.padding([8, 24])
|
||||
.on_press_maybe((!disabled).then_some(Message::ItemPressed(idx)))
|
||||
.style(theme::Button::MenuItem)
|
||||
.into()
|
||||
}
|
||||
}
|
||||
}))
|
||||
.width(Length::Shrink)
|
||||
.apply(iced_widget::container)
|
||||
.padding(1)
|
||||
|
|
@ -434,9 +428,12 @@ impl Program for ContextMenu {
|
|||
icon_color: Some(cosmic.accent.base.into()),
|
||||
text_color: Some(component.on.into()),
|
||||
background: Some(Background::Color(component.base.into())),
|
||||
border_radius: 8.0.into(),
|
||||
border_width: 1.0,
|
||||
border_color: component.divider.into(),
|
||||
border: Border {
|
||||
radius: 8.0.into(),
|
||||
width: 1.0,
|
||||
color: component.divider.into(),
|
||||
},
|
||||
shadow: Default::default(),
|
||||
}
|
||||
}))
|
||||
.width(Length::Shrink)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue