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

chore: update libcosmic

Browse source
This commit is contained in:
Ashley Wulber 2024-02-02 16:16:32 -05:00 • committed by Ashley Wulber
parent c71420ccf9
commit 0ab6f724fb
9 changed files with 613 additions and 575 deletions
Download patch file Download diff file Expand all files Collapse all files

21
cosmic-applet-status-area/src/components/app.rs
View file

@ -8,7 +8,7 @@ use cosmic::{
},
window, Subscription,
},
iced_style::application,
iced_style::{application, menu},
Theme,
};
use std::collections::BTreeMap;
@ -173,18 +173,13 @@ impl cosmic::Application for App {
fn view(&self) -> cosmic::Element<'_, Msg> {
// XXX connect open event
iced::widget::row(
self.menus
.iter()
.map(|(id, menu)| {
self.core
.applet
.icon_button(menu.icon_name())
.on_press(Msg::TogglePopup(*id))
.into()
})
.collect(),
)
iced::widget::row(self.menus.iter().map(|(id, menu)| {
self.core
.applet
.icon_button(menu.icon_name())
.on_press(Msg::TogglePopup(*id))
.into()
}))
.into()
}

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

@ -79,84 +79,76 @@ impl State {
}
fn layout_view(layout: &Layout, expanded: Option<i32>) -> cosmic::Element<Msg> {
iced::widget::column(
layout
.children()
.iter()
.filter_map(|i| {
if !i.visible() {
None
} else if i.type_() == Some("separator") {
Some(iced::widget::horizontal_rule(2).into())
} else if let Some(label) = i.label() {
// Strip _ when not doubled
// TODO: interpret as "access key"? And label with underline.
let mut is_underscore = false;
let label = label
.chars()
.filter(|c| {
let prev_is_underscore = is_underscore;
is_underscore = !is_underscore && *c == '_';
*c != '_' || prev_is_underscore
})
.collect::<String>();
iced::widget::column(layout.children().iter().filter_map(|i| {
if !i.visible() {
None
} else if i.type_() == Some("separator") {
Some(iced::widget::horizontal_rule(2).into())
} else if let Some(label) = i.label() {
// Strip _ when not doubled
// TODO: interpret as "access key"? And label with underline.
let mut is_underscore = false;
let label = label
.chars()
.filter(|c| {
let prev_is_underscore = is_underscore;
is_underscore = !is_underscore && *c == '_';
*c != '_' || prev_is_underscore
})
.collect::<String>();
let is_submenu = i.children_display() == Some("submenu");
let is_expanded = expanded == Some(i.id());
let is_submenu = i.children_display() == Some("submenu");
let is_expanded = expanded == Some(i.id());
let text = iced::widget::text(label).width(iced::Length::Fill);
let text = iced::widget::text(label).width(iced::Length::Fill);
let mut children: Vec<cosmic::Element<_>> = vec![text.into()];
if is_submenu {
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::from_name(icon_name)
.size(14)
.symbolic(true);
children.insert(0, icon.into());
}
if i.toggle_state() == Some(1) {
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));
if is_submenu && is_expanded {
Some(
iced::widget::column![
button,
// XXX nested
iced::widget::container(layout_view(i, None)).padding(
iced::Padding {
left: 12.,
..iced::Padding::ZERO
}
)
]
.into(),
)
} else {
Some(button.into())
}
let mut children: Vec<cosmic::Element<_>> = vec![text.into()];
if is_submenu {
let icon = cosmic::widget::icon::from_name(if is_expanded {
"go-down-symbolic"
} else {
None
}
})
.collect(),
)
"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::from_name(icon_name)
.size(14)
.symbolic(true);
children.insert(0, icon.into());
}
if i.toggle_state() == Some(1) {
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));
if is_submenu && is_expanded {
Some(
iced::widget::column![
button,
// XXX nested
iced::widget::container(layout_view(i, None)).padding(iced::Padding {
left: 12.,
..iced::Padding::ZERO
})
]
.into(),
)
} else {
Some(button.into())
}
} else {
None
}
}))
.into()
}