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

chore: udpate libcosmic

Browse source
This commit is contained in:
Ashley Wulber 2025-03-14 13:14:51 -04:00 • committed by Ashley Wulber
parent 61d1d1b91d
commit c54ddeb38a
17 changed files with 139 additions and 426 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,7 +9,7 @@ use cosmic::{
platform_specific::shell::commands::popup::{destroy_popup, get_popup},
window, Limits, Padding, Subscription,
},
surface_message::{MessageWrapper, SurfaceMessage},
surface,
widget::{container, mouse_area},
Element, Task,
};
@ -25,22 +25,7 @@ pub enum Msg {
StatusNotifier(status_notifier_watcher::Event),
TogglePopup(usize),
Hovered(usize),
Surface(SurfaceMessage),
}
impl From<Msg> for MessageWrapper<Msg> {
fn from(value: Msg) -> Self {
match value {
Msg::Surface(s) => MessageWrapper::Surface(s),
m => MessageWrapper::Message(m),
}
}
}
impl From<SurfaceMessage> for Msg {
fn from(value: SurfaceMessage) -> Self {
Msg::Surface(value)
}
Surface(surface::Action),
}
#[derive(Default)]
@ -114,7 +99,7 @@ impl cosmic::Application for App {
Msg::StatusMenu((id, msg)) => match self.menus.get_mut(&id) {
Some(state) => state
.update(msg)
.map(move |msg| app::message::app(Msg::StatusMenu((id, msg)))),
.map(move |msg| cosmic::action::app(Msg::StatusMenu((id, msg)))),
None => Task::none(),
},
Msg::StatusNotifier(event) => match event {
@ -131,13 +116,13 @@ impl cosmic::Application for App {
{
*m = state;
let id = *id;
return cmd.map(move |msg| app::message::app(Msg::StatusMenu((id, msg))));
return cmd.map(move |msg| cosmic::action::app(Msg::StatusMenu((id, msg))));
}
let id = self.next_menu_id();
self.menus.insert(id, state);
app::Task::batch([
self.resize_window(),
cmd.map(move |msg| app::message::app(Msg::StatusMenu((id, msg)))),
cmd.map(move |msg| cosmic::action::app(Msg::StatusMenu((id, msg)))),
])
}
status_notifier_watcher::Event::Unregistered(name) => {
@ -241,9 +226,13 @@ impl cosmic::Application for App {
popup_settings.positioner.anchor_rect.x = i as i32 * suggested_size as i32;
}
cmds.push(get_popup(popup_settings));
app::Task::batch(cmds)
Task::batch(cmds)
}
Msg::Surface(a) => {
return cosmic::task::message(cosmic::Action::Cosmic(
cosmic::app::Action::Surface(a),
));
}
Msg::Surface(surface_message) => unreachable!(),
}
}