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

Update libcosmic

Browse source
This commit is contained in:
Eduardo Flores 2023-09-18 00:24:21 -07:00 • committed by Ashley Wulber
parent 3353dc95ac
commit c7b25daa71
22 changed files with 1049 additions and 715 deletions
Download patch file Download diff file Expand all files Collapse all files

43
cosmic-applet-status-area/src/components/status_menu.rs
View file

@ -1,4 +1,5 @@
use cosmic::{iced, theme};
use cosmic::app::applet::applet_button_theme;
use cosmic::iced;
use crate::subscriptions::status_notifier_item::{Layout, StatusNotifierItem};
@ -107,27 +108,28 @@ fn layout_view(layout: &Layout, expanded: Option<i32>) -> cosmic::Element<Msg> {
let mut children: Vec<cosmic::Element<_>> = vec![text.into()];
if is_submenu {
let icon = cosmic::widget::icon(
if is_expanded {
"go-down-symbolic"
} else {
"go-next-symbolic"
},
14,
)
.style(theme::Svg::Symbolic);
let icon = cosmic::widget::icon::from_name(if is_expanded {
"go-down-symbolic"
} else {
"go-next-symbolic"
})
.size(14)
.symbolic(true);
children.push(icon.into());
}
if let Some(icon_data) = i.icon_data() {
let handle = iced::widget::image::Handle::from_memory(icon_data.to_vec());
children.insert(0, iced::widget::Image::new(handle).into());
} else if let Some(icon_name) = i.icon_name() {
let icon = cosmic::widget::icon(icon_name, 14).style(theme::Svg::Symbolic);
let icon = cosmic::widget::icon::from_name(icon_name)
.size(14)
.symbolic(true);
children.insert(0, icon.into());
}
if i.toggle_state() == Some(1) {
let icon = cosmic::widget::icon("emblem-ok-symbolic", 14)
.style(theme::Svg::Symbolic);
let icon = cosmic::widget::icon::from_name("emblem-ok-symbolic")
.size(14)
.symbolic(true);
children.push(icon.into());
}
let button = row_button(children).on_press(Msg::Click(i.id(), is_submenu));
@ -158,13 +160,14 @@ fn layout_view(layout: &Layout, expanded: Option<i32>) -> cosmic::Element<Msg> {
.into()
}
fn row_button(content: Vec<cosmic::Element<Msg>>) -> iced::widget::Button<Msg, cosmic::Renderer> {
cosmic::widget::button(cosmic::app::applet::applet_button_theme())
.custom(vec![iced::widget::Row::with_children(content)
fn row_button(content: Vec<cosmic::Element<Msg>>) -> cosmic::widget::Button<Msg, cosmic::Renderer> {
cosmic::widget::button(
iced::widget::Row::with_children(content)
.spacing(8)
.align_items(iced::Alignment::Center)
.width(iced::Length::Fill)
.into()])
.width(iced::Length::Fill)
.padding([8, 24])
.width(iced::Length::Fill),
)
.style(applet_button_theme())
.width(iced::Length::Fill)
.padding([8, 24])
}