chore: Update libcosmic
This commit is contained in:
Victoria Brekenfeld
parent
4e12957169
commit
2a0b1cf7e9
10 changed files with 267 additions and 206 deletions
|
|
@ -1,10 +1,7 @@
|
|||
use apply::Apply;
|
||||
use cosmic::{
|
||||
font::Font,
|
||||
iced::{
|
||||
widget::{
|
||||
self, container::draw_background, rule::FillMode, text::StyleSheet as TextStyleSheet,
|
||||
},
|
||||
widget::{self, container::draw_background, rule::FillMode},
|
||||
Element,
|
||||
},
|
||||
iced_core::{
|
||||
|
|
@ -13,6 +10,7 @@ use cosmic::{
|
|||
mouse, overlay, renderer,
|
||||
widget::{
|
||||
operation::{Operation, OperationOutputWrapper},
|
||||
text::StyleSheet as TextStyleSheet,
|
||||
tree::Tree,
|
||||
Id, Widget,
|
||||
},
|
||||
|
|
@ -22,9 +20,10 @@ use cosmic::{
|
|||
button::StyleSheet as ButtonStyleSheet, container::StyleSheet as ContainerStyleSheet,
|
||||
rule::StyleSheet as RuleStyleSheet,
|
||||
},
|
||||
iced_widget::scrollable::AbsoluteOffset,
|
||||
iced_widget::{scrollable::AbsoluteOffset, text},
|
||||
theme,
|
||||
widget::{icon, text, Icon},
|
||||
widget::{icon::from_name, Icon},
|
||||
Apply,
|
||||
};
|
||||
|
||||
use super::tab_text::tab_text;
|
||||
|
|
@ -82,6 +81,7 @@ impl Into<theme::Container> for TabBackgroundTheme {
|
|||
match self {
|
||||
Self::ActiveActivated => {
|
||||
theme::Container::custom(move |theme| widget::container::Appearance {
|
||||
icon_color: Some(Color::from(theme.cosmic().accent_text_color())),
|
||||
text_color: Some(Color::from(theme.cosmic().accent_text_color())),
|
||||
background: Some(background_color),
|
||||
border_radius: 0.0.into(),
|
||||
|
|
@ -91,6 +91,7 @@ impl Into<theme::Container> for TabBackgroundTheme {
|
|||
}
|
||||
Self::ActiveDeactivated => {
|
||||
theme::Container::custom(move |_theme| widget::container::Appearance {
|
||||
icon_color: None,
|
||||
text_color: None,
|
||||
background: Some(background_color),
|
||||
border_radius: 0.0.into(),
|
||||
|
|
@ -113,9 +114,9 @@ pub trait TabMessage: Clone {
|
|||
fn scrolled() -> Self;
|
||||
}
|
||||
|
||||
pub struct Tab<'a, Message: TabMessage> {
|
||||
pub struct Tab<Message: TabMessage> {
|
||||
id: Id,
|
||||
app_icon: Icon<'a>,
|
||||
app_icon: Icon,
|
||||
title: String,
|
||||
font: Font,
|
||||
close_message: Option<Message>,
|
||||
|
|
@ -125,11 +126,11 @@ pub struct Tab<'a, Message: TabMessage> {
|
|||
active: bool,
|
||||
}
|
||||
|
||||
impl<'a, Message: TabMessage> Tab<'a, Message> {
|
||||
impl<Message: TabMessage> Tab<Message> {
|
||||
pub fn new(title: impl Into<String>, app_id: impl Into<String>, id: Id) -> Self {
|
||||
Tab {
|
||||
id,
|
||||
app_icon: icon(app_id.into(), 16),
|
||||
app_icon: from_name(app_id.into()).size(16).icon(),
|
||||
title: title.into(),
|
||||
font: cosmic::font::FONT,
|
||||
close_message: None,
|
||||
|
|
@ -175,25 +176,27 @@ impl<'a, Message: TabMessage> Tab<'a, Message> {
|
|||
self
|
||||
}
|
||||
|
||||
pub(super) fn internal<Renderer>(self, idx: usize) -> TabInternal<'a, Message, Renderer>
|
||||
pub(super) fn internal<'a, Renderer>(self, idx: usize) -> TabInternal<'a, Message, Renderer>
|
||||
where
|
||||
Renderer: cosmic::iced_core::Renderer + 'a,
|
||||
Renderer: cosmic::iced_core::text::Renderer<Font = Font>,
|
||||
Renderer::Theme: ButtonStyleSheet<Style = theme::Button>,
|
||||
Renderer::Theme: ButtonStyleSheet<Style = theme::iced::Button>,
|
||||
Renderer::Theme: ContainerStyleSheet,
|
||||
Renderer::Theme: RuleStyleSheet<Style = theme::Rule>,
|
||||
Renderer::Theme: TextStyleSheet,
|
||||
Message: 'a,
|
||||
widget::Button<'a, Message, Renderer>: Into<Element<'a, Message, Renderer>>,
|
||||
widget::Container<'a, Message, Renderer>: Into<Element<'a, Message, Renderer>>,
|
||||
Icon<'a>: Into<Element<'a, Message, Renderer>>,
|
||||
widget::Text<'a, Renderer>: Into<Element<'a, Message, Renderer>>,
|
||||
Icon: Into<Element<'a, Message, Renderer>>,
|
||||
{
|
||||
let mut close_button = icon("window-close-symbolic", 16)
|
||||
.force_svg(true)
|
||||
.style(theme::Svg::Symbolic)
|
||||
let mut close_button = from_name("window-close-symbolic")
|
||||
.size(16)
|
||||
.prefer_svg(true)
|
||||
.icon()
|
||||
.apply(widget::button)
|
||||
.padding(0)
|
||||
.style(theme::Button::Text);
|
||||
.style(theme::iced::Button::Text);
|
||||
if let Some(close_message) = self.close_message {
|
||||
close_button = close_button.on_press(close_message);
|
||||
}
|
||||
|
|
@ -207,16 +210,17 @@ impl<'a, Message: TabMessage> Tab<'a, Message> {
|
|||
.padding([2, 4])
|
||||
.center_y()
|
||||
.into(),
|
||||
text(self.title)
|
||||
.size(14)
|
||||
.font(self.font)
|
||||
.horizontal_alignment(alignment::Horizontal::Left)
|
||||
.vertical_alignment(alignment::Vertical::Center)
|
||||
.apply(tab_text)
|
||||
.background(self.background_theme.background_color())
|
||||
.height(Length::Fill)
|
||||
.width(Length::Fill)
|
||||
.into(),
|
||||
Element::<'a, Message, Renderer>::new(
|
||||
text(self.title)
|
||||
.size(14)
|
||||
.font(self.font)
|
||||
.horizontal_alignment(alignment::Horizontal::Left)
|
||||
.vertical_alignment(alignment::Vertical::Center)
|
||||
.apply(tab_text)
|
||||
.background(self.background_theme.background_color())
|
||||
.height(Length::Fill)
|
||||
.width(Length::Fill),
|
||||
),
|
||||
close_button
|
||||
.apply(widget::container)
|
||||
.height(Length::Fill)
|
||||
|
|
@ -325,7 +329,7 @@ where
|
|||
renderer: &Renderer,
|
||||
operation: &mut dyn Operation<OperationOutputWrapper<Message>>,
|
||||
) {
|
||||
operation.container(None, &mut |operation| {
|
||||
operation.container(None, layout.bounds(), &mut |operation| {
|
||||
self.elements
|
||||
.iter()
|
||||
.zip(&mut tree.children)
|
||||
|
|
@ -347,6 +351,7 @@ where
|
|||
renderer: &Renderer,
|
||||
clipboard: &mut dyn Clipboard,
|
||||
shell: &mut Shell<'_, Message>,
|
||||
viewport: &Rectangle,
|
||||
) -> event::Status {
|
||||
let status = self
|
||||
.elements
|
||||
|
|
@ -362,6 +367,7 @@ where
|
|||
renderer,
|
||||
clipboard,
|
||||
shell,
|
||||
viewport,
|
||||
)
|
||||
})
|
||||
.fold(event::Status::Ignored, event::Status::merge);
|
||||
|
|
@ -434,7 +440,9 @@ where
|
|||
renderer,
|
||||
theme,
|
||||
&renderer::Style {
|
||||
icon_color: style.text_color.unwrap_or(renderer_style.text_color),
|
||||
text_color: style.text_color.unwrap_or(renderer_style.text_color),
|
||||
scale_factor: renderer_style.scale_factor,
|
||||
},
|
||||
layout,
|
||||
cursor,
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ use cosmic::{
|
|||
gradient,
|
||||
layout::{Layout, Limits, Node},
|
||||
mouse::Cursor,
|
||||
renderer,
|
||||
renderer::{self, Renderer as IcedRenderer},
|
||||
widget::{Tree, Widget},
|
||||
Background, Color, Degrees, Gradient, Length, Point, Rectangle, Size,
|
||||
},
|
||||
|
|
@ -13,7 +13,7 @@ use cosmic::{
|
|||
|
||||
pub struct TabText<'a, Message, Renderer>
|
||||
where
|
||||
Renderer: cosmic::iced_core::Renderer,
|
||||
Renderer: IcedRenderer,
|
||||
Renderer::Theme: TextStyleSheet,
|
||||
{
|
||||
text: Element<'a, Message, Renderer>,
|
||||
|
|
@ -26,7 +26,7 @@ pub fn tab_text<'a, Message, Renderer>(
|
|||
text: impl Into<Element<'a, Message, Renderer>>,
|
||||
) -> TabText<'a, Message, Renderer>
|
||||
where
|
||||
Renderer: cosmic::iced_core::Renderer,
|
||||
Renderer: IcedRenderer,
|
||||
Renderer::Theme: TextStyleSheet,
|
||||
{
|
||||
TabText::new(text, Color::TRANSPARENT)
|
||||
|
|
@ -34,7 +34,7 @@ where
|
|||
|
||||
impl<'a, Message, Renderer> TabText<'a, Message, Renderer>
|
||||
where
|
||||
Renderer: cosmic::iced_core::Renderer,
|
||||
Renderer: IcedRenderer,
|
||||
Renderer::Theme: TextStyleSheet,
|
||||
{
|
||||
pub fn new(text: impl Into<Element<'a, Message, Renderer>>, background: Color) -> Self {
|
||||
|
|
@ -66,7 +66,7 @@ where
|
|||
|
||||
impl<'a, Message, Renderer> Widget<Message, Renderer> for TabText<'a, Message, Renderer>
|
||||
where
|
||||
Renderer: cosmic::iced_core::Renderer,
|
||||
Renderer: IcedRenderer,
|
||||
Renderer::Theme: TextStyleSheet,
|
||||
{
|
||||
fn width(&self) -> Length {
|
||||
|
|
@ -148,7 +148,7 @@ where
|
|||
|
||||
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>> for TabText<'a, Message, Renderer>
|
||||
where
|
||||
Renderer: cosmic::iced_core::Renderer + 'a,
|
||||
Renderer: IcedRenderer + 'a,
|
||||
Renderer::Theme: TextStyleSheet,
|
||||
Message: 'a,
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
use super::tab::{Tab, TabBackgroundTheme, TabMessage, TabRuleTheme, MIN_ACTIVE_TAB_WIDTH};
|
||||
use apply::Apply;
|
||||
use cosmic::{
|
||||
font::Font,
|
||||
iced::{id::Id, widget, Element},
|
||||
|
|
@ -24,7 +23,8 @@ use cosmic::{
|
|||
},
|
||||
iced_widget::container::draw_background,
|
||||
theme,
|
||||
widget::{icon, Icon},
|
||||
widget::{icon::from_name, Icon},
|
||||
Apply,
|
||||
};
|
||||
use keyframe::{
|
||||
ease,
|
||||
|
|
@ -122,17 +122,17 @@ impl<'a, Message, Renderer> Tabs<'a, Message, Renderer>
|
|||
where
|
||||
Renderer: cosmic::iced_core::Renderer + 'a,
|
||||
Renderer: cosmic::iced_core::text::Renderer<Font = Font>,
|
||||
Renderer::Theme: ButtonStyleSheet<Style = theme::Button>,
|
||||
Renderer::Theme: ButtonStyleSheet<Style = theme::iced::Button>,
|
||||
Renderer::Theme: ContainerStyleSheet<Style = theme::Container>,
|
||||
Renderer::Theme: RuleStyleSheet<Style = theme::Rule>,
|
||||
Renderer::Theme: TextStyleSheet,
|
||||
Message: TabMessage + 'a,
|
||||
widget::Button<'a, Message, Renderer>: Into<Element<'a, Message, Renderer>>,
|
||||
widget::Container<'a, Message, Renderer>: Into<Element<'a, Message, Renderer>>,
|
||||
Icon<'a>: Into<Element<'a, Message, Renderer>>,
|
||||
Icon: Into<Element<'a, Message, Renderer>>,
|
||||
{
|
||||
pub fn new(
|
||||
tabs: impl IntoIterator<Item = Tab<'a, Message>>,
|
||||
tabs: impl IntoIterator<Item = Tab<Message>>,
|
||||
active: usize,
|
||||
activated: bool,
|
||||
group_focused: bool,
|
||||
|
|
@ -189,22 +189,24 @@ where
|
|||
TabRuleTheme::Default
|
||||
})
|
||||
.into(),
|
||||
icon("go-previous-symbolic", 16)
|
||||
.force_svg(true)
|
||||
.style(theme::Svg::Symbolic)
|
||||
from_name("go-previous-symbolic")
|
||||
.size(16)
|
||||
.prefer_svg(true)
|
||||
.icon()
|
||||
.apply(widget::button)
|
||||
.style(theme::Button::Text)
|
||||
.style(theme::iced::Button::Text)
|
||||
.on_press(Message::scroll_back())
|
||||
.into(),
|
||||
]
|
||||
.into_iter()
|
||||
.chain(tabs)
|
||||
.chain(vec![
|
||||
icon("go-next-symbolic", 16)
|
||||
.force_svg(true)
|
||||
.style(theme::Svg::Symbolic)
|
||||
from_name("go-next-symbolic")
|
||||
.size(16)
|
||||
.prefer_svg(true)
|
||||
.icon()
|
||||
.apply(widget::button)
|
||||
.style(theme::Button::Text)
|
||||
.style(theme::iced::Button::Text)
|
||||
.on_press(Message::scroll_further())
|
||||
.into(),
|
||||
widget::vertical_rule(4)
|
||||
|
|
@ -489,6 +491,7 @@ where
|
|||
let background_style = ContainerStyleSheet::appearance(
|
||||
theme,
|
||||
&theme::Container::custom(|theme| widget::container::Appearance {
|
||||
icon_color: None,
|
||||
text_color: None,
|
||||
background: Some(Background::Color(Color::from(
|
||||
theme.cosmic().palette.neutral_3,
|
||||
|
|
@ -659,11 +662,18 @@ where
|
|||
operation: &mut dyn Operation<OperationOutputWrapper<Message>>,
|
||||
) {
|
||||
let state = tree.state.downcast_mut::<State>();
|
||||
let bounds = layout.bounds();
|
||||
|
||||
state.cleanup_old_animations();
|
||||
|
||||
operation.scrollable(state, self.id.as_ref());
|
||||
operation.scrollable(
|
||||
state,
|
||||
self.id.as_ref(),
|
||||
bounds,
|
||||
Vector { x: 0.0, y: 0.0 }, /* seemingly unused */
|
||||
);
|
||||
|
||||
operation.container(self.id.as_ref(), &mut |operation| {
|
||||
operation.container(self.id.as_ref(), bounds, &mut |operation| {
|
||||
self.elements[2..self.elements.len() - 3]
|
||||
.iter()
|
||||
.zip(tree.children.iter_mut().skip(2))
|
||||
|
|
@ -685,6 +695,7 @@ where
|
|||
renderer: &Renderer,
|
||||
clipboard: &mut dyn Clipboard,
|
||||
shell: &mut Shell<'_, Message>,
|
||||
viewport: &Rectangle,
|
||||
) -> event::Status {
|
||||
let state = tree.state.downcast_mut::<State>();
|
||||
state.cleanup_old_animations();
|
||||
|
|
@ -826,6 +837,7 @@ where
|
|||
renderer,
|
||||
clipboard,
|
||||
&mut internal_shell,
|
||||
viewport,
|
||||
)
|
||||
})
|
||||
.fold(event::Status::Ignored, event::Status::merge)
|
||||
|
|
@ -848,6 +860,7 @@ where
|
|||
renderer,
|
||||
clipboard,
|
||||
&mut internal_shell,
|
||||
viewport,
|
||||
)
|
||||
})
|
||||
.fold(event::Status::Ignored, event::Status::merge)
|
||||
|
|
@ -870,6 +883,7 @@ where
|
|||
renderer,
|
||||
clipboard,
|
||||
&mut internal_shell,
|
||||
viewport,
|
||||
)
|
||||
})
|
||||
.fold(event::Status::Ignored, event::Status::merge)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue