Skip to content

Commit 6d7727a

Browse files
ids1024wash2
ids1024
authored and
wash2
committed
Update sctk, libcosmic, cosmic-client-toolkit
1 parent 4ce5a8b commit 6d7727a

File tree

15 files changed

+58
-269
lines changed

15 files changed

+58
-269
lines changed

‎Cargo.lock‎

Lines changed: 26 additions & 196 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cosmic-app-list/src/toplevel_handler.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ use crate::toplevel_subscription::{ToplevelRequest, ToplevelUpdate};
22
use cctk::{
33
sctk::{
44
self,
5-
event_loop::WaylandSource,
6-
reexports::client::protocol::wl_seat::WlSeat,
5+
reexports::client::{protocol::wl_seat::WlSeat, WaylandSource},
76
seat::{SeatHandler, SeatState},
87
},
98
toplevel_info::{ToplevelInfoHandler, ToplevelInfoState},

‎cosmic-applet-audio/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ libpulse-binding = "2.26.0"
1111
libpulse-glib-binding = "2.25.0"
1212
tokio = { version = "1.20.1", features=["full"] }
1313
libcosmic = { git = "https://github.com/pop-os/libcosmic/", branch = "master", default-features = false, features = ["tokio", "wayland", "applet"] }
14-
sctk = { package = "smithay-client-toolkit", git = "https://github.com/Smithay/client-toolkit", rev = "3776d4a" }
14+
sctk = { package = "smithay-client-toolkit", git = "https://github.com/Smithay/client-toolkit", rev = "69bffe5" }
1515
log = "0.4.14"
1616
pretty_env_logger = "0.4.0"

‎cosmic-applet-battery/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ edition = "2021"
66
[dependencies]
77
once_cell = "1.16.0"
88
libcosmic = { git = "https://github.com/pop-os/libcosmic/", branch = "master", default-features = false, features = ["tokio", "wayland", "applet"] }
9-
sctk = { package = "smithay-client-toolkit", git = "https://github.com/Smithay/client-toolkit", rev = "3776d4a" }
9+
sctk = { package = "smithay-client-toolkit", git = "https://github.com/Smithay/client-toolkit", rev = "69bffe5" }
1010
futures = "0.3"
1111
zbus = { version = "3.5", default-features = false, features = ["tokio"] }
1212
log = "0.4"

‎cosmic-applet-battery/src/app.rs‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use cosmic::iced::{
2020
};
2121
use cosmic::iced_native::layout::Limits;
2222
use cosmic::iced_style::application::{self, Appearance};
23-
use cosmic::iced_style::{svg, Color};
23+
use cosmic::iced_style::Color;
2424
use cosmic::theme::Svg;
2525
use cosmic::widget::{button, divider, icon, toggler};
2626
use cosmic::{Element, Theme};
@@ -243,11 +243,7 @@ impl Application for CosmicBatteryApplet {
243243
column![
244244
row![
245245
icon(&*self.icon_name, 24)
246-
.style(Svg::Custom(|theme| {
247-
svg::Appearance {
248-
color: Some(theme.palette().text),
249-
}
250-
}))
246+
.style(Svg::Symbolic)
251247
.width(Length::Units(24))
252248
.height(Length::Units(24)),
253249
column![name, description]
@@ -328,11 +324,7 @@ impl Application for CosmicBatteryApplet {
328324
.padding([0, 12]),
329325
row![
330326
icon("display-brightness-symbolic", 24)
331-
.style(Svg::Custom(|theme| {
332-
svg::Appearance {
333-
color: Some(theme.palette().text),
334-
}
335-
}))
327+
.style(Svg::Symbolic)
336328
.width(Length::Units(24))
337329
.height(Length::Units(24)),
338330
slider(
@@ -348,11 +340,7 @@ impl Application for CosmicBatteryApplet {
348340
.spacing(12),
349341
row![
350342
icon("keyboard-brightness-symbolic", 24)
351-
.style(Svg::Custom(|theme| {
352-
svg::Appearance {
353-
color: Some(theme.palette().text),
354-
}
355-
}))
343+
.style(Svg::Symbolic)
356344
.width(Length::Units(24))
357345
.height(Length::Units(24)),
358346
slider(

‎cosmic-applet-bluetooth/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ once_cell = "1.16.0"
99
bluer = { version = "0.15", features = ["bluetoothd", "id"] }
1010
futures-util = "0.3.21"
1111
libcosmic = { git = "https://github.com/pop-os/libcosmic/", branch = "master", default-features = false, features = ["wayland", "applet", "tokio"] }
12-
sctk = { package = "smithay-client-toolkit", git = "https://github.com/Smithay/client-toolkit", rev = "3776d4a" }
12+
sctk = { package = "smithay-client-toolkit", git = "https://github.com/Smithay/client-toolkit", rev = "69bffe5" }
1313
futures = "0.3"
1414
log = "0.4"
1515
pretty_env_logger = "0.4"

‎cosmic-applet-bluetooth/src/app.rs‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use cosmic::{
1717
renderer::BorderRadius,
1818
window,
1919
},
20-
iced_style::{application, button::StyleSheet, svg},
20+
iced_style::{application, button::StyleSheet},
2121
theme::{Button, Svg},
2222
widget::{button, divider, icon, toggler},
2323
Element, Theme,
@@ -325,9 +325,7 @@ impl Application for CosmicBluetoothApplet {
325325
BluerDeviceStatus::Connecting | BluerDeviceStatus::Disconnecting => {
326326
row = row.push(
327327
icon("process-working-symbolic", 24)
328-
.style(Svg::Custom(|theme| svg::Appearance {
329-
color: Some(theme.palette().text),
330-
}))
328+
.style(Svg::Symbolic)
331329
.width(Length::Units(24))
332330
.height(Length::Units(24)),
333331
);
@@ -402,9 +400,7 @@ impl Application for CosmicBluetoothApplet {
402400
.into(),
403401
container(
404402
icon(dropdown_icon, 14)
405-
.style(Svg::Custom(|theme| svg::Appearance {
406-
color: Some(theme.palette().text),
407-
}))
403+
.style(Svg::Symbolic)
408404
.width(Length::Units(14))
409405
.height(Length::Units(14)),
410406
)

‎cosmic-applet-graphics/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ edition = "2021"
88
[dependencies]
99
zbus = "3.4"
1010
libcosmic = { git = "https://github.com/pop-os/libcosmic/", branch = "master", default-features = false, features = ["tokio", "wayland", "applet"] }
11-
sctk = { package = "smithay-client-toolkit", git = "https://github.com/Smithay/client-toolkit", rev = "3776d4a" }
11+
sctk = { package = "smithay-client-toolkit", git = "https://github.com/Smithay/client-toolkit", rev = "69bffe5" }
1212
once_cell = "1"
1313
# Application i18n
1414
i18n-embed = { version = "0.13.4", features = ["fluent-system", "desktop-requester"] }

‎cosmic-applet-network/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ cosmic-dbus-networkmanager = { git = "https://github.com/pop-os/dbus-settings-bi
1010
# cosmic-dbus-networkmanager = { path = "../../../dbus-settings-bindings/networkmanager" }
1111
futures-util = "0.3.21"
1212
libcosmic = { git = "https://github.com/pop-os/libcosmic/", branch = "master", default-features = false, features = ["wayland", "applet", "tokio"] }
13-
sctk = { package = "smithay-client-toolkit", git = "https://github.com/Smithay/client-toolkit", rev = "3776d4a" }
13+
sctk = { package = "smithay-client-toolkit", git = "https://github.com/Smithay/client-toolkit", rev = "69bffe5" }
1414
futures = "0.3"
1515
zbus = { version = "3.7", default-features = false }
1616
log = "0.4"

‎cosmic-applet-network/src/app.rs‎

Lines changed: 11 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use cosmic::{
1515
renderer::BorderRadius,
1616
window,
1717
},
18-
iced_style::{application, button::StyleSheet, svg},
18+
iced_style::{application, button::StyleSheet},
1919
theme::{Button, Svg},
2020
widget::{button, divider, icon, toggler},
2121
Element, Theme,
@@ -415,9 +415,7 @@ impl Application for CosmicNetworkApplet {
415415
}
416416
let mut btn_content = vec![
417417
icon("network-wireless-symbolic", 24)
418-
.style(Svg::Custom(|theme| svg::Appearance {
419-
color: Some(theme.palette().text),
420-
}))
418+
.style(Svg::Symbolic)
421419
.width(Length::Units(24))
422420
.height(Length::Units(24))
423421
.into(),
@@ -430,9 +428,7 @@ impl Application for CosmicNetworkApplet {
430428
| ActiveConnectionState::Deactivating => {
431429
btn_content.push(
432430
icon("process-working-symbolic", 24)
433-
.style(Svg::Custom(|theme| svg::Appearance {
434-
color: Some(theme.palette().text),
435-
}))
431+
.style(Svg::Symbolic)
436432
.width(Length::Units(24))
437433
.height(Length::Units(24))
438434
.into(),
@@ -461,9 +457,7 @@ impl Application for CosmicNetworkApplet {
461457
for known in &self.nm_state.known_access_points {
462458
let mut btn_content = vec![
463459
icon("network-wireless-symbolic", 24)
464-
.style(Svg::Custom(|theme| svg::Appearance {
465-
color: Some(theme.palette().text),
466-
}))
460+
.style(Svg::Symbolic)
467461
.width(Length::Units(24))
468462
.height(Length::Units(24))
469463
.into(),
@@ -473,9 +467,7 @@ impl Application for CosmicNetworkApplet {
473467
if known.working {
474468
btn_content.push(
475469
icon("process-working-symbolic", 24)
476-
.style(Svg::Custom(|theme| svg::Appearance {
477-
color: Some(theme.palette().text),
478-
}))
470+
.style(Svg::Symbolic)
479471
.width(Length::Units(24))
480472
.height(Length::Units(24))
481473
.into(),
@@ -542,9 +534,7 @@ impl Application for CosmicNetworkApplet {
542534
.into(),
543535
container(
544536
icon(dropdown_icon, 14)
545-
.style(Svg::Custom(|theme| svg::Appearance {
546-
color: Some(theme.palette().text),
547-
}))
537+
.style(Svg::Symbolic)
548538
.width(Length::Units(14))
549539
.height(Length::Units(14)),
550540
)
@@ -569,9 +559,7 @@ impl Application for CosmicNetworkApplet {
569559
} => {
570560
let id = row![
571561
icon("network-wireless-symbolic", 24)
572-
.style(Svg::Custom(|theme| svg::Appearance {
573-
color: Some(theme.palette().text),
574-
}))
562+
.style(Svg::Symbolic)
575563
.width(Length::Units(24))
576564
.height(Length::Units(24)),
577565
text(&access_point.ssid).size(14),
@@ -609,9 +597,7 @@ impl Application for CosmicNetworkApplet {
609597
NewConnectionState::Waiting(access_point) => {
610598
let id = row![
611599
icon("network-wireless-symbolic", 24)
612-
.style(Svg::Custom(|theme| svg::Appearance {
613-
color: Some(theme.palette().text),
614-
}))
600+
.style(Svg::Symbolic)
615601
.width(Length::Units(24))
616602
.height(Length::Units(24)),
617603
text(&access_point.ssid).size(14),
@@ -622,9 +608,7 @@ impl Application for CosmicNetworkApplet {
622608
let connecting = row![
623609
id,
624610
icon("process-working-symbolic", 24)
625-
.style(Svg::Custom(|theme| svg::Appearance {
626-
color: Some(theme.palette().text),
627-
}))
611+
.style(Svg::Symbolic)
628612
.width(Length::Units(24))
629613
.height(Length::Units(24)),
630614
]
@@ -635,9 +619,7 @@ impl Application for CosmicNetworkApplet {
635619
NewConnectionState::Failure(access_point) => {
636620
let id = row![
637621
icon("network-wireless-symbolic", 24)
638-
.style(Svg::Custom(|theme| svg::Appearance {
639-
color: Some(theme.palette().text),
640-
}))
622+
.style(Svg::Symbolic)
641623
.width(Length::Units(24))
642624
.height(Length::Units(24)),
643625
text(&access_point.ssid).size(14),
@@ -687,9 +669,7 @@ impl Application for CosmicNetworkApplet {
687669
let button = button(button_style)
688670
.custom(vec![row![
689671
icon("network-wireless-symbolic", 16)
690-
.style(Svg::Custom(|theme| svg::Appearance {
691-
color: Some(theme.palette().text),
692-
}))
672+
.style(Svg::Symbolic)
693673
.width(Length::Units(16))
694674
.height(Length::Units(16)),
695675
text(&ap.ssid)

0 commit comments

Comments
 (0)