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

Update to latest libcosmic commit (#29)

Browse source
This commit is contained in:
Ian Douglas Scott 2023-05-01 09:57:45 -07:00 • committed by GitHub
parent 61861b3f18
commit 9fb6e2f2c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

60
Cargo.lock generated
View file

@ -705,16 +705,15 @@ dependencies = [
[[package]]
name = "cosmic-text"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab5d29bcf58238b07dc456ba16b012513ad1f21eb25dd738fcf833bc4f6a1442"
version = "0.7.0"
source = "git+https://github.com/pop-os/cosmic-text?rev=e788c175#e788c175ec31094b04dcacbc0537dba4433afcfc"
dependencies = [
"fontdb 0.10.0",
"fontdb 0.13.1",
"libm",
"log",
"ouroboros 0.15.5",
"rangemap",
"rustybuzz 0.6.0",
"rustybuzz 0.7.0",
"swash",
"sys-locale",
"unicode-bidi",
@ -726,7 +725,7 @@ dependencies = [
[[package]]
name = "cosmic-theme"
version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-theme.git#5c84b81c67a69e3752bc2fdc451f9d49857ceabf"
source = "git+https://github.com/pop-os/cosmic-theme.git#a1258308a894c5c7bbe6e261271e8476d55955d3"
dependencies = [
"anyhow",
"csscolorparser",
@ -1299,13 +1298,14 @@ dependencies = [
[[package]]
name = "fontdb"
version = "0.10.0"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8131752b3f3b876a20f42b3d08233ad177d6e7ec6d18aaa6954489a201071be5"
checksum = "237ff9f0813bbfc9de836016472e0c9ae7802f174a51594607e5f4ff334cb2f5"
dependencies = [
"log",
"memmap2 0.5.8",
"ttf-parser 0.17.1",
"slotmap",
"ttf-parser 0.18.1",
]
[[package]]
@ -1801,7 +1801,7 @@ dependencies = [
[[package]]
name = "iced"
version = "0.6.0"
source = "git+https://github.com/pop-os/libcosmic?rev=8232e1d249a467673dbc5b0aa2f2e1665fb18dde#8232e1d249a467673dbc5b0aa2f2e1665fb18dde"
source = "git+https://github.com/pop-os/libcosmic?rev=b85c504d72ee1c0d360c56042996474932df97cb#b85c504d72ee1c0d360c56042996474932df97cb"
dependencies = [
"iced_core",
"iced_dyrend",
@ -1819,7 +1819,7 @@ dependencies = [
[[package]]
name = "iced_core"
version = "0.6.2"
source = "git+https://github.com/pop-os/libcosmic?rev=8232e1d249a467673dbc5b0aa2f2e1665fb18dde#8232e1d249a467673dbc5b0aa2f2e1665fb18dde"
source = "git+https://github.com/pop-os/libcosmic?rev=b85c504d72ee1c0d360c56042996474932df97cb#b85c504d72ee1c0d360c56042996474932df97cb"
dependencies = [
"bitflags",
"palette",
@ -1829,7 +1829,7 @@ dependencies = [
[[package]]
name = "iced_dyrend"
version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic?rev=8232e1d249a467673dbc5b0aa2f2e1665fb18dde#8232e1d249a467673dbc5b0aa2f2e1665fb18dde"
source = "git+https://github.com/pop-os/libcosmic?rev=b85c504d72ee1c0d360c56042996474932df97cb#b85c504d72ee1c0d360c56042996474932df97cb"
dependencies = [
"iced_glow",
"iced_graphics",
@ -1843,7 +1843,7 @@ dependencies = [
[[package]]
name = "iced_futures"
version = "0.5.1"
source = "git+https://github.com/pop-os/libcosmic?rev=8232e1d249a467673dbc5b0aa2f2e1665fb18dde#8232e1d249a467673dbc5b0aa2f2e1665fb18dde"
source = "git+https://github.com/pop-os/libcosmic?rev=b85c504d72ee1c0d360c56042996474932df97cb#b85c504d72ee1c0d360c56042996474932df97cb"
dependencies = [
"futures",
"log",
@ -1855,7 +1855,7 @@ dependencies = [
[[package]]
name = "iced_glow"
version = "0.5.1"
source = "git+https://github.com/pop-os/libcosmic?rev=8232e1d249a467673dbc5b0aa2f2e1665fb18dde#8232e1d249a467673dbc5b0aa2f2e1665fb18dde"
source = "git+https://github.com/pop-os/libcosmic?rev=b85c504d72ee1c0d360c56042996474932df97cb#b85c504d72ee1c0d360c56042996474932df97cb"
dependencies = [
"bytemuck",
"euclid",
@ -1870,7 +1870,7 @@ dependencies = [
[[package]]
name = "iced_graphics"
version = "0.5.0"
source = "git+https://github.com/pop-os/libcosmic?rev=8232e1d249a467673dbc5b0aa2f2e1665fb18dde#8232e1d249a467673dbc5b0aa2f2e1665fb18dde"
source = "git+https://github.com/pop-os/libcosmic?rev=b85c504d72ee1c0d360c56042996474932df97cb#b85c504d72ee1c0d360c56042996474932df97cb"
dependencies = [
"bitflags",
"bytemuck",
@ -1890,7 +1890,7 @@ dependencies = [
[[package]]
name = "iced_lazy"
version = "0.3.0"
source = "git+https://github.com/pop-os/libcosmic?rev=8232e1d249a467673dbc5b0aa2f2e1665fb18dde#8232e1d249a467673dbc5b0aa2f2e1665fb18dde"
source = "git+https://github.com/pop-os/libcosmic?rev=b85c504d72ee1c0d360c56042996474932df97cb#b85c504d72ee1c0d360c56042996474932df97cb"
dependencies = [
"iced_native",
"ouroboros 0.13.0",
@ -1899,7 +1899,7 @@ dependencies = [
[[package]]
name = "iced_native"
version = "0.7.0"
source = "git+https://github.com/pop-os/libcosmic?rev=8232e1d249a467673dbc5b0aa2f2e1665fb18dde#8232e1d249a467673dbc5b0aa2f2e1665fb18dde"
source = "git+https://github.com/pop-os/libcosmic?rev=b85c504d72ee1c0d360c56042996474932df97cb#b85c504d72ee1c0d360c56042996474932df97cb"
dependencies = [
"iced_core",
"iced_futures",
@ -1912,7 +1912,7 @@ dependencies = [
[[package]]
name = "iced_softbuffer"
version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic?rev=8232e1d249a467673dbc5b0aa2f2e1665fb18dde#8232e1d249a467673dbc5b0aa2f2e1665fb18dde"
source = "git+https://github.com/pop-os/libcosmic?rev=b85c504d72ee1c0d360c56042996474932df97cb#b85c504d72ee1c0d360c56042996474932df97cb"
dependencies = [
"cosmic-text",
"iced_graphics",
@ -1927,7 +1927,7 @@ dependencies = [
[[package]]
name = "iced_style"
version = "0.5.1"
source = "git+https://github.com/pop-os/libcosmic?rev=8232e1d249a467673dbc5b0aa2f2e1665fb18dde#8232e1d249a467673dbc5b0aa2f2e1665fb18dde"
source = "git+https://github.com/pop-os/libcosmic?rev=b85c504d72ee1c0d360c56042996474932df97cb#b85c504d72ee1c0d360c56042996474932df97cb"
dependencies = [
"iced_core",
"once_cell",
@ -1937,7 +1937,7 @@ dependencies = [
[[package]]
name = "iced_wgpu"
version = "0.7.0"
source = "git+https://github.com/pop-os/libcosmic?rev=8232e1d249a467673dbc5b0aa2f2e1665fb18dde#8232e1d249a467673dbc5b0aa2f2e1665fb18dde"
source = "git+https://github.com/pop-os/libcosmic?rev=b85c504d72ee1c0d360c56042996474932df97cb#b85c504d72ee1c0d360c56042996474932df97cb"
dependencies = [
"bitflags",
"bytemuck",
@ -1957,7 +1957,7 @@ dependencies = [
[[package]]
name = "iced_winit"
version = "0.6.0"
source = "git+https://github.com/pop-os/libcosmic?rev=8232e1d249a467673dbc5b0aa2f2e1665fb18dde#8232e1d249a467673dbc5b0aa2f2e1665fb18dde"
source = "git+https://github.com/pop-os/libcosmic?rev=b85c504d72ee1c0d360c56042996474932df97cb#b85c504d72ee1c0d360c56042996474932df97cb"
dependencies = [
"iced_futures",
"iced_graphics",
@ -2199,7 +2199,7 @@ checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
[[package]]
name = "libcosmic"
version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic?rev=8232e1d249a467673dbc5b0aa2f2e1665fb18dde#8232e1d249a467673dbc5b0aa2f2e1665fb18dde"
source = "git+https://github.com/pop-os/libcosmic?rev=b85c504d72ee1c0d360c56042996474932df97cb#b85c504d72ee1c0d360c56042996474932df97cb"
dependencies = [
"apply",
"cosmic-theme",
@ -3432,15 +3432,15 @@ dependencies = [
[[package]]
name = "rustybuzz"
version = "0.6.0"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab9e34ecf6900625412355a61bda0bd68099fe674de707c67e5e4aed2c05e489"
checksum = "162bdf42e261bee271b3957691018634488084ef577dddeb6420a9684cab2a6a"
dependencies = [
"bitflags",
"bytemuck",
"libm",
"smallvec",
"ttf-parser 0.17.1",
"ttf-parser 0.18.1",
"unicode-bidi-mirroring",
"unicode-ccc",
"unicode-general-category 0.6.0",
@ -3677,7 +3677,7 @@ dependencies = [
[[package]]
name = "softbuffer"
version = "0.2.0"
source = "git+https://github.com/pop-os/softbuffer?rev=8dcb6438b#8dcb6438b6c1688a0015b477dfa76c6c0bee3318"
source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-2.0#98b9099f87113c4a4b577de5670ddf41149966b4"
dependencies = [
"bytemuck",
"cfg_aliases",
@ -3696,7 +3696,7 @@ dependencies = [
"wayland-client 0.30.0",
"wayland-sys 0.30.1",
"web-sys",
"windows-sys 0.42.0",
"windows-sys 0.45.0",
"x11-dl",
"x11rb 0.11.1",
]
@ -4075,12 +4075,6 @@ version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ae2f58a822f08abdaf668897e96a5656fe72f5a9ce66422423e8849384872e6"
[[package]]
name = "ttf-parser"
version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "375812fa44dab6df41c195cd2f7fecb488f6c09fbaafb62807488cefab642bff"
[[package]]
name = "ttf-parser"
version = "0.18.1"

2
Cargo.toml
View file

@ -4,6 +4,6 @@ default-members = ["app"]
[workspace.dependencies.libcosmic]
git = "https://github.com/pop-os/libcosmic"
rev = "8232e1d249a467673dbc5b0aa2f2e1665fb18dde"
rev = "b85c504d72ee1c0d360c56042996474932df97cb"
default-features = false
features = ["debug", "winit", "dyrend", "tokio"]

2
app/src/app.rs
View file

@ -93,7 +93,7 @@ impl Application for SettingsApp {
search_selections: Vec::default(),
show_maximize: true,
show_minimize: true,
theme: Theme::Dark,
theme: Theme::dark(),
window_width: 0,
};

2
app/src/pages/desktop/wallpaper.rs
View file

@ -72,7 +72,7 @@ pub fn settings() -> Section<crate::pages::Message> {
.width(Length::Units(300))
)
.padding(4)
.style(theme::Container::Box),
.style(theme::Container::Background),
horizontal_space(Length::Fill),
)
.into(),

2
app/src/widget/mod.rs
View file

@ -98,7 +98,7 @@ pub fn sub_page_button(entity: page::Entity, page: &page::Info) -> Element<page:
.spacing(16)
.apply(container)
.padding([20, 24])
.style(theme::Container::Custom(list::column::style))
.style(theme::Container::custom(list::column::style))
.apply(button)
.padding(0)
.style(theme::Button::Transparent)