update libcosmic

This commit is contained in:
Ashley Wulber 2023-06-15 15:03:06 -04:00 committed by Ashley Wulber
parent 61d527a84c
commit 5a15ef8d7f
19 changed files with 124 additions and 146 deletions

View file

@ -8,8 +8,8 @@ license = "GPL-3.0-or-later"
cosmic-dbus-networkmanager = { git = "https://github.com/pop-os/dbus-settings-bindings", branch = "main" }
# cosmic-dbus-networkmanager = { path = "../../../dbus-settings-bindings/networkmanager" }
futures-util = "0.3.21"
libcosmic = { git = "https://github.com/pop-os/libcosmic/", rev = "6699aa4", default-features = false, features = ["tokio", "wayland"] }
cosmic-time = { git = "https://github.com/pop-os/cosmic-time", rev = "07f9372", default-features = false, features = ["libcosmic", "once_cell"] }
libcosmic = { git = "https://github.com/pop-os/libcosmic/", default-features = false, features = ["tokio", "wayland"] }
cosmic-time = { git = "https://github.com/pop-os/cosmic-time", rev = "39c96ac", default-features = false, features = ["libcosmic", "once_cell"] }
cosmic-applet = { path = "../applet" }
futures = "0.3"
zbus = { version = "3.13", default-features = false }

View file

@ -385,11 +385,11 @@ impl Application for CosmicNetworkApplet {
fn view(&self, id: window::Id) -> Element<Message> {
let button_style = || Button::Custom {
active: Box::new(|t| iced_style::button::Appearance {
border_radius: 0.0,
border_radius: 0.0.into(),
..t.active(&Button::Text)
}),
hover: Box::new(|t| iced_style::button::Appearance {
border_radius: 0.0,
border_radius: 0.0.into(),
..t.hovered(&Button::Text)
}),
};
@ -729,7 +729,10 @@ impl Application for CosmicNetworkApplet {
fn subscription(&self) -> Subscription<Message> {
let network_sub =
network_manager_subscription(0).map(|e| Message::NetworkManagerEvent(e.1));
let timeline = self.timeline.as_subscription().map(Message::Frame);
let timeline = self
.timeline
.as_subscription()
.map(|(_, now)| Message::Frame(now));
if let Some(conn) = self.conn.as_ref() {
Subscription::batch(vec![