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

Update libcosmic, fixing race conditions

Browse source
This commit is contained in:
Jeremy Soller 2024-04-05 09:45:20 -06:00
parent 1bded07bfd
commit df5564e55a
No known key found for this signature in database
GPG key ID: D02FD439211AF56F
5 changed files with 657 additions and 749 deletions
Download patch file Download diff file Expand all files Collapse all files

1388
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

11
Cargo.toml
View file

@ -19,13 +19,15 @@ shlex = "1.2.0"
xdg = "2.5.2" xdg = "2.5.2"
#TODO: reduce features #TODO: reduce features
tokio = { workspace = true, features = ["full"] } tokio = { workspace = true, features = ["full"] }
wayland-client = "0.31.1" wayland-client = "0.31.2"
# For network status using networkmanager feature # For network status using networkmanager feature
cosmic-dbus-networkmanager = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } cosmic-dbus-networkmanager = { git = "https://github.com/pop-os/dbus-settings-bindings", rev = "3644bc909984842f35adb1057ef6e0a277c1aa6a", optional = true }
# For logind integration using logind feature # For logind integration using logind feature
logind-zbus = { version = "3.1.2", optional = true } logind-zbus = { version = "3.1.2", optional = true }
# Fix zbus compilation by manually adding nix with user feature
nix = { workspace = true, optional = true }
# For power status with upower feature # For power status with upower feature
upower_dbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } upower_dbus = { git = "https://github.com/pop-os/dbus-settings-bindings", rev = "3644bc909984842f35adb1057ef6e0a277c1aa6a", optional = true }
# Required for some features # Required for some features
zbus = { workspace = true, optional = true } zbus = { workspace = true, optional = true }
@ -38,6 +40,7 @@ default = ["logind", "networkmanager", "upower"]
logind = ["logind-zbus", "zbus"] logind = ["logind-zbus", "zbus"]
networkmanager = ["cosmic-dbus-networkmanager", "zbus"] networkmanager = ["cosmic-dbus-networkmanager", "zbus"]
upower = ["upower_dbus", "zbus"] upower = ["upower_dbus", "zbus"]
zbus = ["dep:zbus", "nix"]
[workspace] [workspace]
members = ["daemon"] members = ["daemon"]
@ -45,6 +48,8 @@ members = ["daemon"]
[workspace.dependencies] [workspace.dependencies]
env_logger = "0.10.0" env_logger = "0.10.0"
log = "0.4.20" log = "0.4.20"
# Fix zbus compilation by manually adding nix with user feature
nix = { version = "0.26", features = ["user"] }
pwd = "1.4.0" pwd = "1.4.0"
ron = "0.8" ron = "0.8"
serde = "1" serde = "1"

1
daemon/Cargo.toml
View file

@ -12,6 +12,7 @@ cosmic-theme.workspace = true
env_logger.workspace = true env_logger.workspace = true
libc = "0.2" libc = "0.2"
log.workspace = true log.workspace = true
nix.workspace = true
pwd.workspace = true pwd.workspace = true
ron.workspace = true ron.workspace = true
serde.workspace = true serde.workspace = true

4
src/greeter.rs
View file

@ -901,7 +901,7 @@ impl cosmic::Application for App {
row = row.push( row = row.push(
widget::MouseArea::new( widget::MouseArea::new(
widget::cosmic_container::container(column) widget::layer_container(column)
.layer(cosmic::cosmic_theme::Layer::Primary) .layer(cosmic::cosmic_theme::Layer::Primary)
.padding(16) .padding(16)
.style(cosmic::theme::Container::Card), .style(cosmic::theme::Container::Card),
@ -986,7 +986,7 @@ impl cosmic::Application for App {
crate::image_container::ImageContainer::new( crate::image_container::ImageContainer::new(
widget::container( widget::container(
widget::cosmic_container::container( widget::layer_container(
iced::widget::row![left_element, right_element] iced::widget::row![left_element, right_element]
.align_items(alignment::Alignment::Center), .align_items(alignment::Alignment::Center),
) )

2
src/locker.rs
View file

@ -619,7 +619,7 @@ impl cosmic::Application for App {
crate::image_container::ImageContainer::new( crate::image_container::ImageContainer::new(
widget::container( widget::container(
widget::cosmic_container::container( widget::layer_container(
iced::widget::row![left_element, right_element] iced::widget::row![left_element, right_element]
.align_items(alignment::Alignment::Center), .align_items(alignment::Alignment::Center),
) )