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

Run cargo update`, adjust for changes in gtk-rs/relm4, and format

Browse source
This commit is contained in:
Ian Douglas Scott 2022-07-21 14:02:01 -07:00
parent 0aaa0dd74d
commit eabe58f62c
10 changed files with 81 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

13
applets/cosmic-app-list/src/dock_item/imp.rs
View file

@ -30,17 +30,8 @@ impl ObjectSubclass for DockItem {
impl ObjectImpl for DockItem {
fn signals() -> &'static [Signal] {
static SIGNALS: Lazy<Vec<Signal>> = Lazy::new(|| {
vec![Signal::builder(
// Signal name
"popover-closed",
// Types of the values which will be sent to the signal handler
&[],
// Type of the value the signal handler sends back
<()>::static_type().into(),
)
.build()]
});
static SIGNALS: Lazy<Vec<Signal>> =
Lazy::new(|| vec![Signal::builder("popover-closed").build()]);
SIGNALS.as_ref()
}
}

5
applets/cosmic-app-list/src/dock_list/mod.rs
View file

@ -2,9 +2,10 @@
use crate::{
dock_item::DockItem,
utils::{AppListEvent, BoxedWindowList, data_path},
dock_object::DockObject,
utils::{data_path, AppListEvent, BoxedWindowList},
wayland::{Toplevel, ToplevelEvent},
{TX, WAYLAND_TX}, dock_object::DockObject,
{TX, WAYLAND_TX},
};
use cascade::cascade;
use cosmic_panel_config::{CosmicPanelConfig, PanelAnchor};

13
applets/cosmic-app-list/src/dock_popover/imp.rs
View file

@ -34,17 +34,8 @@ impl ObjectSubclass for DockPopover {
impl ObjectImpl for DockPopover {
fn signals() -> &'static [Signal] {
static SIGNALS: Lazy<Vec<Signal>> = Lazy::new(|| {
vec![Signal::builder(
// Signal name
"menu-hide",
// Types of the values which will be sent to the signal handler
&[],
// Type of the value the signal handler sends back
<()>::static_type().into(),
)
.build()]
});
static SIGNALS: Lazy<Vec<Signal>> =
Lazy::new(|| vec![Signal::builder("menu-hide").build()]);
SIGNALS.as_ref()
}
}

2
applets/cosmic-app-list/src/main.rs
View file

@ -203,7 +203,7 @@ fn main() {
} else {
cached_results.push(top_level);
}
true
true
}
};
if should_apply_changes {

8
applets/cosmic-app-list/src/wayland.rs
View file

@ -16,8 +16,8 @@ use cosmic_protocols::{
zcosmic_workspace_manager_v1::{self, ZcosmicWorkspaceManagerV1},
},
};
use wayland_client::protocol::wl_seat::{WlSeat, self};
use std::{env, os::unix::net::UnixStream, path::PathBuf, time::Duration};
use wayland_client::protocol::wl_seat::{self, WlSeat};
use wayland_client::{
event_created_child,
protocol::{
@ -89,8 +89,9 @@ pub fn spawn_toplevels() -> SyncSender<ToplevelEvent> {
Event::Msg(ToplevelEvent::Activate(toplevel)) => {
if let Some(manager) = &state.toplevel_manager {
for seat in &state.seats {
manager.activate(&toplevel,seat)
} }
manager.activate(&toplevel, seat)
}
}
}
Event::Msg(ToplevelEvent::Close(t)) => {
if let Some(manager) = &state.toplevel_manager {
@ -582,7 +583,6 @@ impl Dispatch<WlOutput, ()> for State {
}
}
impl Dispatch<WlSeat, ()> for State {
fn event(
state: &mut Self,

2
applets/cosmic-applet-audio/src/pa/future.rs
View file

@ -59,5 +59,3 @@ impl<T, F: ?Sized> Drop for PAFut<T, F> {
self.operation.cancel();
}
}

5
applets/cosmic-applet-audio/src/pa/mod.rs
View file

@ -10,10 +10,7 @@ use libpulse_binding::{
volume::ChannelVolumes,
};
use libpulse_glib_binding::Mainloop;
use std::{
cell::RefCell,
rc::Rc,
};
use std::{cell::RefCell, rc::Rc};
mod future;
use future::{PAFut, PAFutWaker};

4
applets/cosmic-applet-battery/src/main.rs
View file

@ -358,6 +358,6 @@ impl SimpleComponent for AppModel {
}
fn main() {
let app: RelmApp<AppModel> = RelmApp::new("com.system76.CosmicAppletBattery");
app.run(());
let app = RelmApp::new("com.system76.CosmicAppletBattery");
app.run::<AppModel>(());
}

18
applets/cosmic-applet-notifications/src/notifications.rs
View file

@ -169,18 +169,12 @@ impl ObjectImpl for NotificationsInner {
fn signals() -> &'static [Signal] {
static SIGNALS: Lazy<Vec<Signal>> = Lazy::new(|| {
vec![
Signal::builder(
"notification-received",
&[NotificationId::static_type().into()],
glib::Type::UNIT.into(),
)
.build(),
Signal::builder(
"notification-closed",
&[NotificationId::static_type().into()],
glib::Type::UNIT.into(),
)
.build(),
Signal::builder("notification-received")
.param_types(&[NotificationId::static_type().into()])
.build(),
Signal::builder("notification-closed")
.param_types(&[NotificationId::static_type().into()])
.build(),
]
});
SIGNALS.as_ref()