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

fix: condensed padding

Browse source
This commit is contained in:
Vukašin Vojinović 2024-11-01 02:18:38 +01:00 • committed by Michael Murphy
parent ef051c3b13
commit d9735c9b76
15 changed files with 246 additions and 209 deletions
Download patch file Download diff file Expand all files Collapse all files

228
Cargo.lock generated
View file

@ -318,7 +318,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -575,7 +575,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -610,7 +610,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -760,7 +760,7 @@ dependencies = [
"regex", "regex",
"rustc-hash 1.1.0", "rustc-hash 1.1.0",
"shlex", "shlex",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -885,7 +885,7 @@ dependencies = [
"proc-macro-crate 3.2.0", "proc-macro-crate 3.2.0",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
"syn_derive", "syn_derive",
] ]
@ -957,7 +957,7 @@ checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -1002,13 +1002,38 @@ dependencies = [
"thiserror", "thiserror",
] ]
[[package]]
name = "calloop"
version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1ead1e1514bce44c0f40e027899fbc595907fc112635bed21b3b5d975c0a5e7"
dependencies = [
"bitflags 2.6.0",
"polling 3.7.3",
"rustix 0.38.38",
"slab",
"tracing",
]
[[package]] [[package]]
name = "calloop-wayland-source" name = "calloop-wayland-source"
version = "0.3.0" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20"
dependencies = [ dependencies = [
"calloop", "calloop 0.13.0",
"rustix 0.38.38",
"wayland-backend",
"wayland-client",
]
[[package]]
name = "calloop-wayland-source"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "876a7a1dbbe026a55ef47a500b123af5a9a0914520f061d467914cf21be95daf"
dependencies = [
"calloop 0.14.1",
"rustix 0.38.38", "rustix 0.38.38",
"wayland-backend", "wayland-backend",
"wayland-client", "wayland-client",
@ -1136,7 +1161,7 @@ dependencies = [
"heck 0.5.0", "heck 0.5.0",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -1455,14 +1480,14 @@ source = "git+https://github.com/pop-os/cosmic-protocols?rev=c8d3a1c#c8d3a1c3d40
dependencies = [ dependencies = [
"cosmic-protocols", "cosmic-protocols",
"libc", "libc",
"smithay-client-toolkit", "smithay-client-toolkit 0.19.2 (registry+https://github.com/rust-lang/crates.io-index)",
"wayland-client", "wayland-client",
] ]
[[package]] [[package]]
name = "cosmic-comp-config" name = "cosmic-comp-config"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-comp#eb64fdaf8fe4f5e6957a35e74004b183acc905c8" source = "git+https://github.com/pop-os/cosmic-comp#90883c6ab12533da08a31da338881c38aa773634"
dependencies = [ dependencies = [
"cosmic-config", "cosmic-config",
"input", "input",
@ -1517,7 +1542,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-idle-config" name = "cosmic-idle-config"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-idle#f682e19f2105f7bb4b722b858bf747dcb60be2c0" source = "git+https://github.com/pop-os/cosmic-idle#08c1cf318e91831b6cbfd2c94d2fafbedb90919f"
dependencies = [ dependencies = [
"cosmic-config", "cosmic-config",
"serde", "serde",
@ -1526,13 +1551,13 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-panel-config" name = "cosmic-panel-config"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-panel#041a44eb6f825b7e0b3d45ccf745252b136d5da9" source = "git+https://github.com/pop-os/cosmic-panel#d114bd9c84ca6dec44fee6297d822ecde41ea403"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"cosmic-config", "cosmic-config",
"ron", "ron",
"serde", "serde",
"smithay-client-toolkit", "smithay-client-toolkit 0.19.2 (git+https://github.com/Smithay/client-toolkit)",
"tracing", "tracing",
"wayland-protocols-wlr", "wayland-protocols-wlr",
"xdg-shell-wrapper-config", "xdg-shell-wrapper-config",
@ -1928,7 +1953,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"strsim 0.11.1", "strsim 0.11.1",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -1950,7 +1975,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
dependencies = [ dependencies = [
"darling_core 0.20.10", "darling_core 0.20.10",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -2034,7 +2059,7 @@ dependencies = [
"darling 0.20.10", "darling 0.20.10",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -2092,7 +2117,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -2121,7 +2146,7 @@ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"mime", "mime",
"raw-window-handle", "raw-window-handle",
"smithay-client-toolkit", "smithay-client-toolkit 0.19.2 (registry+https://github.com/rust-lang/crates.io-index)",
"smithay-clipboard", "smithay-clipboard",
] ]
@ -2214,7 +2239,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -2298,15 +2323,14 @@ dependencies = [
[[package]] [[package]]
name = "exr" name = "exr"
version = "1.72.0" version = "1.73.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" checksum = "f83197f59927b46c04a183a619b7c29df34e63e63c7869320862268c0ef687e0"
dependencies = [ dependencies = [
"bit_field", "bit_field",
"flume",
"half", "half",
"lebe", "lebe",
"miniz_oxide 0.7.4", "miniz_oxide 0.8.0",
"rayon-core", "rayon-core",
"smallvec", "smallvec",
"zune-inflate", "zune-inflate",
@ -2463,15 +2487,6 @@ dependencies = [
"thiserror", "thiserror",
] ]
[[package]]
name = "flume"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095"
dependencies = [
"spin",
]
[[package]] [[package]]
name = "fnv" name = "fnv"
version = "1.0.7" version = "1.0.7"
@ -2542,7 +2557,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -2699,7 +2714,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -3077,7 +3092,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"strsim 0.11.1", "strsim 0.11.1",
"syn 2.0.85", "syn 2.0.86",
"unic-langid", "unic-langid",
] ]
@ -3091,7 +3106,7 @@ dependencies = [
"i18n-config", "i18n-config",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -3162,7 +3177,7 @@ dependencies = [
"raw-window-handle", "raw-window-handle",
"rustc-hash 2.0.0", "rustc-hash 2.0.0",
"serde", "serde",
"smithay-client-toolkit", "smithay-client-toolkit 0.19.2 (registry+https://github.com/rust-lang/crates.io-index)",
"smol_str", "smol_str",
"thiserror", "thiserror",
"web-time", "web-time",
@ -3240,7 +3255,7 @@ dependencies = [
"iced_core", "iced_core",
"iced_futures", "iced_futures",
"raw-window-handle", "raw-window-handle",
"smithay-client-toolkit", "smithay-client-toolkit 0.19.2 (registry+https://github.com/rust-lang/crates.io-index)",
"thiserror", "thiserror",
"window_clipboard", "window_clipboard",
] ]
@ -3281,7 +3296,7 @@ dependencies = [
"resvg", "resvg",
"rustc-hash 2.0.0", "rustc-hash 2.0.0",
"rustix 0.38.38", "rustix 0.38.38",
"smithay-client-toolkit", "smithay-client-toolkit 0.19.2 (registry+https://github.com/rust-lang/crates.io-index)",
"thiserror", "thiserror",
"tiny-xlib", "tiny-xlib",
"wayland-backend", "wayland-backend",
@ -3305,7 +3320,7 @@ dependencies = [
"once_cell", "once_cell",
"ouroboros", "ouroboros",
"rustc-hash 2.0.0", "rustc-hash 2.0.0",
"smithay-client-toolkit", "smithay-client-toolkit 0.19.2 (registry+https://github.com/rust-lang/crates.io-index)",
"thiserror", "thiserror",
"unicode-segmentation", "unicode-segmentation",
"window_clipboard", "window_clipboard",
@ -3324,7 +3339,7 @@ dependencies = [
"log", "log",
"raw-window-handle", "raw-window-handle",
"rustc-hash 2.0.0", "rustc-hash 2.0.0",
"smithay-client-toolkit", "smithay-client-toolkit 0.19.2 (registry+https://github.com/rust-lang/crates.io-index)",
"thiserror", "thiserror",
"tracing", "tracing",
"wasm-bindgen-futures", "wasm-bindgen-futures",
@ -3687,7 +3702,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -3914,7 +3929,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -4671,7 +4686,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -4951,7 +4966,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -5023,7 +5038,7 @@ dependencies = [
"proc-macro-crate 3.2.0", "proc-macro-crate 3.2.0",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -5330,7 +5345,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"proc-macro2-diagnostics", "proc-macro2-diagnostics",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -5376,7 +5391,7 @@ dependencies = [
"by_address", "by_address",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -5475,7 +5490,7 @@ dependencies = [
"phf_shared", "phf_shared",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -5510,7 +5525,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -5702,7 +5717,7 @@ dependencies = [
"proc-macro-error-attr2", "proc-macro-error-attr2",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -5722,7 +5737,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
"version_check", "version_check",
"yansi", "yansi",
] ]
@ -5766,7 +5781,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a65f2e60fbf1063868558d69c6beacf412dc755f9fc020f514b7955fc914fe30" checksum = "a65f2e60fbf1063868558d69c6beacf412dc755f9fc020f514b7955fc914fe30"
dependencies = [ dependencies = [
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -6176,7 +6191,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"rust-embed-utils", "rust-embed-utils",
"syn 2.0.85", "syn 2.0.86",
"walkdir", "walkdir",
] ]
@ -6320,7 +6335,7 @@ dependencies = [
"ab_glyph", "ab_glyph",
"log", "log",
"memmap2 0.9.5", "memmap2 0.9.5",
"smithay-client-toolkit", "smithay-client-toolkit 0.19.2 (registry+https://github.com/rust-lang/crates.io-index)",
"tiny-skia", "tiny-skia",
] ]
@ -6384,7 +6399,7 @@ checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -6408,7 +6423,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -6447,7 +6462,7 @@ dependencies = [
"darling 0.20.10", "darling 0.20.10",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -6580,8 +6595,35 @@ checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"bytemuck", "bytemuck",
"calloop", "calloop 0.13.0",
"calloop-wayland-source", "calloop-wayland-source 0.3.0",
"cursor-icon",
"libc",
"log",
"memmap2 0.9.5",
"pkg-config",
"rustix 0.38.38",
"thiserror",
"wayland-backend",
"wayland-client",
"wayland-csd-frame",
"wayland-cursor",
"wayland-protocols",
"wayland-protocols-wlr",
"wayland-scanner",
"xkbcommon",
"xkeysym",
]
[[package]]
name = "smithay-client-toolkit"
version = "0.19.2"
source = "git+https://github.com/Smithay/client-toolkit#618a876400cb6c6b07a8ac5d3557f404602ec077"
dependencies = [
"bitflags 2.6.0",
"bytemuck",
"calloop 0.14.1",
"calloop-wayland-source 0.4.0",
"cursor-icon", "cursor-icon",
"libc", "libc",
"log", "log",
@ -6607,7 +6649,7 @@ source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-5#5a3007de
dependencies = [ dependencies = [
"libc", "libc",
"raw-window-handle", "raw-window-handle",
"smithay-client-toolkit", "smithay-client-toolkit 0.19.2 (registry+https://github.com/rust-lang/crates.io-index)",
"wayland-backend", "wayland-backend",
] ]
@ -6670,15 +6712,6 @@ dependencies = [
"x11rb", "x11rb",
] ]
[[package]]
name = "spin"
version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
dependencies = [
"lock_api",
]
[[package]] [[package]]
name = "spirv" name = "spirv"
version = "0.3.0+sdk-1.3.268.0" version = "0.3.0+sdk-1.3.268.0"
@ -6798,9 +6831,9 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "2.0.85" version = "2.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56" checksum = "e89275301d38033efb81a6e60e3497e734dfcc62571f2854bf4b16690398824c"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -6816,7 +6849,7 @@ dependencies = [
"proc-macro-error", "proc-macro-error",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -6827,7 +6860,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -6938,22 +6971,22 @@ checksum = "7f1835c76a9d443834c04539860f3ce46b9d93ef8c260057f939e967ca81180a"
[[package]] [[package]]
name = "thiserror" name = "thiserror"
version = "1.0.65" version = "1.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5" checksum = "5d171f59dbaa811dbbb1aee1e73db92ec2b122911a48e1390dfe327a821ddede"
dependencies = [ dependencies = [
"thiserror-impl", "thiserror-impl",
] ]
[[package]] [[package]]
name = "thiserror-impl" name = "thiserror-impl"
version = "1.0.65" version = "1.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" checksum = "b08be0f17bd307950653ce45db00cd31200d82b624b36e181337d9c7d92765b5"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -7115,7 +7148,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -7189,6 +7222,7 @@ version = "0.1.40"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
dependencies = [ dependencies = [
"log",
"pin-project-lite", "pin-project-lite",
"tracing-attributes", "tracing-attributes",
"tracing-core", "tracing-core",
@ -7202,7 +7236,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -7575,7 +7609,7 @@ dependencies = [
"once_cell", "once_cell",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -7609,7 +7643,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
"wasm-bindgen-backend", "wasm-bindgen-backend",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -8024,7 +8058,7 @@ checksum = "942ac266be9249c84ca862f0a164a39533dc2f6f33dc98ec89c8da99b82ea0bd"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -8035,7 +8069,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -8046,7 +8080,7 @@ checksum = "da33557140a288fae4e1d5f8873aaf9eb6613a9cf82c3e070223ff177f598b60"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -8057,7 +8091,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -8294,7 +8328,7 @@ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"block2", "block2",
"bytemuck", "bytemuck",
"calloop", "calloop 0.13.0",
"cfg_aliases 0.2.1", "cfg_aliases 0.2.1",
"concurrent-queue", "concurrent-queue",
"core-foundation", "core-foundation",
@ -8316,7 +8350,7 @@ dependencies = [
"redox_syscall 0.4.1", "redox_syscall 0.4.1",
"rustix 0.38.38", "rustix 0.38.38",
"sctk-adwaita", "sctk-adwaita",
"smithay-client-toolkit", "smithay-client-toolkit 0.19.2 (registry+https://github.com/rust-lang/crates.io-index)",
"smol_str", "smol_str",
"tracing", "tracing",
"unicode-segmentation", "unicode-segmentation",
@ -8433,7 +8467,7 @@ dependencies = [
[[package]] [[package]]
name = "xdg-shell-wrapper-config" name = "xdg-shell-wrapper-config"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-panel#041a44eb6f825b7e0b3d45ccf745252b136d5da9" source = "git+https://github.com/pop-os/cosmic-panel#d114bd9c84ca6dec44fee6297d822ecde41ea403"
dependencies = [ dependencies = [
"serde", "serde",
"wayland-protocols-wlr", "wayland-protocols-wlr",
@ -8535,7 +8569,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
"synstructure", "synstructure",
] ]
@ -8637,7 +8671,7 @@ dependencies = [
"proc-macro-crate 3.2.0", "proc-macro-crate 3.2.0",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
"zvariant_utils 2.1.0", "zvariant_utils 2.1.0",
] ]
@ -8687,7 +8721,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -8707,7 +8741,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
"synstructure", "synstructure",
] ]
@ -8747,7 +8781,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]
[[package]] [[package]]
@ -8824,7 +8858,7 @@ dependencies = [
"proc-macro-crate 3.2.0", "proc-macro-crate 3.2.0",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
"zvariant_utils 2.1.0", "zvariant_utils 2.1.0",
] ]
@ -8847,5 +8881,5 @@ checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.85", "syn 2.0.86",
] ]

2
cosmic-settings/src/app.rs
View file

@ -1082,7 +1082,7 @@ impl SettingsApp {
let theme = cosmic::theme::active(); let theme = cosmic::theme::active();
let padding = if self.core.is_condensed() { let padding = if self.core.is_condensed() {
theme.cosmic().space_xxs() theme.cosmic().space_s()
} else { } else {
theme.cosmic().space_l() theme.cosmic().space_l()
}; };

6
cosmic-settings/src/pages/bluetooth/mod.rs
View file

@ -1,7 +1,7 @@
// Copyright 2024 System76 <info@system76.com> // Copyright 2024 System76 <info@system76.com>
// SPDX-License-Identifier: GPL-3.0-only // SPDX-License-Identifier: GPL-3.0-only
use cosmic::iced::{alignment, color, Length}; use cosmic::iced::{color, Alignment, Length};
use cosmic::iced_core::text::Wrapping; use cosmic::iced_core::text::Wrapping;
use cosmic::widget::{self, settings, text}; use cosmic::widget::{self, settings, text};
use cosmic::Task; use cosmic::Task;
@ -121,7 +121,7 @@ impl page::Page<crate::pages::Message> for Page {
let pin = widget::text::title1(itoa::Buffer::new().format(*passkey).to_owned()) let pin = widget::text::title1(itoa::Buffer::new().format(*passkey).to_owned())
.width(Length::Fill) .width(Length::Fill)
.align_x(alignment::Horizontal::Center) .align_x(Alignment::Center)
.wrapping(Wrapping::None); .wrapping(Wrapping::None);
let control = widget::column::with_capacity(2) let control = widget::column::with_capacity(2)
@ -641,7 +641,7 @@ fn popup_button(message: Option<Message>, text: &str) -> Element<'_, Message> {
let theme = cosmic::theme::active(); let theme = cosmic::theme::active();
let theme = theme.cosmic(); let theme = theme.cosmic();
widget::text::body(text) widget::text::body(text)
.align_y(alignment::Vertical::Center) .align_y(Alignment::Center)
.apply(widget::button::custom) .apply(widget::button::custom)
.padding([theme.space_xxxs(), theme.space_xs()]) .padding([theme.space_xxxs(), theme.space_xs()])
.width(Length::Fill) .width(Length::Fill)

24
cosmic-settings/src/pages/desktop/appearance/mod.rs
View file

@ -17,7 +17,7 @@ use cosmic::cosmic_theme::{
CornerRadii, Density, Spacing, Theme, ThemeBuilder, ThemeMode, DARK_THEME_BUILDER_ID, CornerRadii, Density, Spacing, Theme, ThemeBuilder, ThemeMode, DARK_THEME_BUILDER_ID,
LIGHT_THEME_BUILDER_ID, LIGHT_THEME_BUILDER_ID,
}; };
use cosmic::iced_core::{alignment, Color, Length}; use cosmic::iced_core::{Alignment, Color, Length};
use cosmic::iced_widget::scrollable::{Direction, Scrollbar}; use cosmic::iced_widget::scrollable::{Direction, Scrollbar};
use cosmic::widget::icon::{from_name, icon}; use cosmic::widget::icon::{from_name, icon};
use cosmic::widget::{ use cosmic::widget::{
@ -1431,7 +1431,7 @@ impl page::Page<crate::pages::Message> for Page {
.push(button::standard(fl!("export")).on_press(Message::StartExport)) .push(button::standard(fl!("export")).on_press(Message::StartExport))
.apply(container) .apply(container)
.width(Length::Fill) .width(Length::Fill)
.align_x(alignment::Horizontal::Right) .align_x(Alignment::End)
.apply(Element::from) .apply(Element::from)
.map(crate::pages::Message::Appearance); .map(crate::pages::Message::Appearance);
@ -1609,7 +1609,7 @@ pub fn mode_and_colors() -> Section<crate::pages::Message> {
] ]
.spacing(space_xxs) .spacing(space_xxs)
.width(Length::FillPortion(1)) .width(Length::FillPortion(1))
.align_x(cosmic::iced_core::Alignment::Center), .align_x(Alignment::Center),
cosmic::iced::widget::column![ cosmic::iced::widget::column![
button::custom( button::custom(
icon(light_mode_illustration.clone(),) icon(light_mode_illustration.clone(),)
@ -1624,14 +1624,13 @@ pub fn mode_and_colors() -> Section<crate::pages::Message> {
] ]
.spacing(space_xxs) .spacing(space_xxs)
.width(Length::FillPortion(1)) .width(Length::FillPortion(1))
.align_x(cosmic::iced_core::Alignment::Center) .align_x(Alignment::Center)
] ]
.spacing(48) .spacing(48)
.align_y(cosmic::iced_core::Alignment::Center) .align_y(Alignment::Center)
.width(Length::Fixed(424.0)), .width(Length::Fixed(424.0)),
) )
.width(Length::Fill) .center_x(Length::Fill),
.align_x(cosmic::iced_core::alignment::Horizontal::Center),
) )
.add( .add(
settings::item::builder(&descriptions[auto_switch]) settings::item::builder(&descriptions[auto_switch])
@ -1864,7 +1863,7 @@ pub fn style() -> Section<crate::pages::Message> {
] ]
.spacing(8) .spacing(8)
.width(Length::FillPortion(1)) .width(Length::FillPortion(1))
.align_x(cosmic::iced_core::Alignment::Center), .align_x(Alignment::Center),
cosmic::iced::widget::column![ cosmic::iced::widget::column![
button::custom( button::custom(
icon( icon(
@ -1886,7 +1885,7 @@ pub fn style() -> Section<crate::pages::Message> {
] ]
.spacing(8) .spacing(8)
.width(Length::FillPortion(1)) .width(Length::FillPortion(1))
.align_x(cosmic::iced_core::Alignment::Center), .align_x(Alignment::Center),
cosmic::iced::widget::column![ cosmic::iced::widget::column![
button::custom( button::custom(
icon( icon(
@ -1908,15 +1907,14 @@ pub fn style() -> Section<crate::pages::Message> {
text::body(&descriptions[square]) text::body(&descriptions[square])
] ]
.spacing(8) .spacing(8)
.align_x(cosmic::iced_core::Alignment::Center) .align_x(Alignment::Center)
.width(Length::FillPortion(1)) .width(Length::FillPortion(1))
] ]
.spacing(12) .spacing(12)
.width(Length::Fixed(628.0)) .width(Length::Fixed(628.0))
.align_y(cosmic::iced_core::Alignment::Center), .align_y(Alignment::Center),
) )
.width(Length::Fill) .center_x(Length::Fill),
.align_x(cosmic::iced_core::alignment::Horizontal::Center),
) )
.apply(Element::from) .apply(Element::from)
.map(crate::pages::Message::Appearance) .map(crate::pages::Message::Appearance)

9
cosmic-settings/src/pages/desktop/dock/applets.rs
View file

@ -1,6 +1,6 @@
use cosmic::{ use cosmic::{
cosmic_config::CosmicConfigEntry, cosmic_config::CosmicConfigEntry,
iced::{alignment, Length}, iced::{Alignment, Length},
widget::{button, container, row}, widget::{button, container, row},
Apply, Element, Task, Apply, Element, Task,
}; };
@ -82,17 +82,16 @@ impl page::Page<crate::pages::Message> for Page {
} }
fn header_view(&self) -> Option<Element<'_, crate::pages::Message>> { fn header_view(&self) -> Option<Element<'_, crate::pages::Message>> {
let theme = cosmic::theme::active(); let space_xxs = cosmic::theme::active().cosmic().spacing.space_xxs;
let spacing = theme.cosmic().spacing;
let content = row::with_capacity(2) let content = row::with_capacity(2)
.spacing(spacing.space_xxs) .spacing(space_xxs)
.push( .push(
button::standard(fl!("add-applet")) button::standard(fl!("add-applet"))
.on_press(Message(applets_inner::Message::AddAppletDrawer)), .on_press(Message(applets_inner::Message::AddAppletDrawer)),
) )
.apply(container) .apply(container)
.width(Length::Fill) .width(Length::Fill)
.align_x(alignment::Horizontal::Right) .align_x(Alignment::End)
.apply(Element::from) .apply(Element::from)
.map(crate::pages::Message::DockApplet); .map(crate::pages::Message::DockApplet);

80
cosmic-settings/src/pages/desktop/panel/applets_inner.rs
View file

@ -4,7 +4,7 @@ use cosmic::iced::clipboard::dnd::{
}; };
use cosmic::iced::clipboard::mime::AsMimeTypes; use cosmic::iced::clipboard::mime::AsMimeTypes;
use cosmic::iced::id::Internal; use cosmic::iced::id::Internal;
use cosmic::iced::{alignment, Vector}; use cosmic::iced::Vector;
use cosmic::iced_core; use cosmic::iced_core;
use cosmic::widget::{button, column, container, icon, list_column, row, text, text_input, Column}; use cosmic::widget::{button, column, container, icon, list_column, row, text, text_input, Column};
@ -12,9 +12,8 @@ use cosmic::widget::{button, column, container, icon, list_column, row, text, te
use cosmic::{ use cosmic::{
cosmic_config::{Config, CosmicConfigEntry}, cosmic_config::{Config, CosmicConfigEntry},
iced::{ iced::{
alignment::{Horizontal, Vertical}, core::window, event, mouse, overlay, touch, Alignment, Color, Length, Point, Rectangle,
core::window, Size,
event, mouse, overlay, touch, Alignment, Color, Length, Point, Rectangle, Size,
}, },
iced_runtime::{core::id::Id, Task}, iced_runtime::{core::id::Id, Task},
iced_widget::core::{ iced_widget::core::{
@ -120,14 +119,13 @@ impl page::Page<crate::pages::Message> for Page {
} }
fn header_view(&self) -> Option<Element<'_, crate::pages::Message>> { fn header_view(&self) -> Option<Element<'_, crate::pages::Message>> {
let theme = cosmic::theme::active(); let space_xxs = theme::active().cosmic().spacing.space_xxs;
let spacing = theme.cosmic().spacing;
let content = row::with_capacity(2) let content = row::with_capacity(2)
.spacing(spacing.space_xxs) .spacing(space_xxs)
.push(button::standard(fl!("add-applet")).on_press(Message::AddAppletDrawer)) .push(button::standard(fl!("add-applet")).on_press(Message::AddAppletDrawer))
.apply(container) .apply(container)
.width(Length::Fill) .width(Length::Fill)
.align_x(alignment::Horizontal::Right) .align_x(Alignment::End)
.apply(Element::from) .apply(Element::from)
.map(crate::pages::Message::PanelApplet); .map(crate::pages::Message::PanelApplet);
@ -226,7 +224,13 @@ impl Page {
&self, &self,
msg_map: T, msg_map: T,
) -> Element<crate::pages::Message> { ) -> Element<crate::pages::Message> {
let spacing = cosmic::theme::active().cosmic().spacing; let cosmic::cosmic_theme::Spacing {
space_xxxs,
space_xxs,
space_xs,
space_l,
..
} = theme::active().cosmic().spacing;
let mut list_column = list_column(); let mut list_column = list_column();
let mut has_some = false; let mut has_some = false;
for info in self for info in self
@ -259,7 +263,7 @@ impl Page {
column::with_capacity(2) column::with_capacity(2)
.push(text::body(info.name.clone())) .push(text::body(info.name.clone()))
.push(text::caption(info.description.clone())) .push(text::caption(info.description.clone()))
.spacing(spacing.space_xxxs) .spacing(space_xxxs)
.width(Length::Fill) .width(Length::Fill)
.into(), .into(),
button::standard(fl!("add")) button::standard(fl!("add"))
@ -291,8 +295,8 @@ impl Page {
.on_press(msg_map(Message::AddApplet(info.clone()))) .on_press(msg_map(Message::AddApplet(info.clone())))
.into(), .into(),
]) ])
.padding([0, spacing.space_l]) .padding([0, space_l])
.spacing(spacing.space_xs) .spacing(space_xs)
.align_y(Alignment::Center), .align_y(Alignment::Center),
); );
} }
@ -300,7 +304,7 @@ impl Page {
list_column = list_column.add( list_column = list_column.add(
text::body(fl!("no-applets-found")) text::body(fl!("no-applets-found"))
.width(Length::Fill) .width(Length::Fill)
.align_x(Horizontal::Center), .align_x(Alignment::Center),
); );
} }
@ -313,7 +317,7 @@ impl Page {
list_column.into(), list_column.into(),
]) ])
.align_x(Alignment::Center) .align_x(Alignment::Center)
.spacing(spacing.space_xxs) .spacing(space_xxs)
.into() .into()
} }
@ -456,7 +460,12 @@ pub fn lists<
msg_map: T, msg_map: T,
) -> Section<crate::pages::Message> { ) -> Section<crate::pages::Message> {
Section::default().view::<P>(move |_binder, page, _section| { Section::default().view::<P>(move |_binder, page, _section| {
let spacing = cosmic::theme::active().cosmic().spacing; let cosmic::cosmic_theme::Spacing {
space_xxs,
space_xs,
space_s,
..
} = theme::active().cosmic().spacing;
let page = page.inner(); let page = page.inner();
let Some(config) = page.current_config.as_ref() else { let Some(config) = page.current_config.as_ref() else {
return Element::from(text::body(fl!("unknown"))); return Element::from(text::body(fl!("unknown")));
@ -492,7 +501,7 @@ pub fn lists<
) )
.into(), .into(),
]) ])
.spacing(spacing.space_xxs) .spacing(space_xxs)
.into(), .into(),
column::with_children(vec![ column::with_children(vec![
text::body(fl!("center-segment")).into(), text::body(fl!("center-segment")).into(),
@ -522,7 +531,7 @@ pub fn lists<
) )
.into(), .into(),
]) ])
.spacing(spacing.space_xxs) .spacing(space_xxs)
.into(), .into(),
column::with_children(vec![ column::with_children(vec![
text::body(fl!("end-segment")).into(), text::body(fl!("end-segment")).into(),
@ -553,11 +562,11 @@ pub fn lists<
) )
.into(), .into(),
]) ])
.spacing(spacing.space_xxs) .spacing(space_xxs)
.into(), .into(),
]) ])
.padding([0, spacing.space_s]) .padding([0, space_s])
.spacing(spacing.space_xs) .spacing(space_xs)
.apply(Element::from) .apply(Element::from)
.map(msg_map) .map(msg_map)
}) })
@ -651,7 +660,12 @@ impl<'a, Message: 'static + Clone> AppletReorderList<'a, Message> {
on_cancel: Message, on_cancel: Message,
active_dnd: Option<Applet<'a>>, active_dnd: Option<Applet<'a>>,
) -> Self { ) -> Self {
let spacing = cosmic::theme::active().cosmic().spacing; let cosmic::cosmic_theme::Spacing {
space_xxxs,
space_xxs,
space_xs,
..
} = theme::active().cosmic().spacing;
let applet_buttons = info let applet_buttons = info
.clone() .clone()
.into_iter() .into_iter()
@ -666,7 +680,7 @@ impl<'a, Message: 'static + Clone> AppletReorderList<'a, Message> {
.into(), .into(),
icon::from_name(info.icon).size(32).into(), icon::from_name(info.icon).size(32).into(),
column::with_capacity(2) column::with_capacity(2)
.spacing(spacing.space_xxxs) .spacing(space_xxxs)
.width(Length::Fill) .width(Length::Fill)
.push(text::body(info.name)) .push(text::body(info.name))
.push_maybe(if info.description.is_empty() { .push_maybe(if info.description.is_empty() {
@ -680,7 +694,7 @@ impl<'a, Message: 'static + Clone> AppletReorderList<'a, Message> {
.on_press(on_remove(id_clone.clone())) .on_press(on_remove(id_clone.clone()))
.into(), .into(),
]) ])
.spacing(spacing.space_xs) .spacing(space_xs)
.align_y(Alignment::Center), .align_y(Alignment::Center),
) )
.width(Length::Fill) .width(Length::Fill)
@ -711,8 +725,8 @@ impl<'a, Message: 'static + Clone> AppletReorderList<'a, Message> {
text::body(fl!("drop-here")) text::body(fl!("drop-here"))
.width(Length::Fill) .width(Length::Fill)
.height(Length::Fill) .height(Length::Fill)
.align_y(Vertical::Center) .align_y(Alignment::Center)
.align_x(Horizontal::Center), .align_x(Alignment::Center),
) )
.width(Length::Fill) .width(Length::Fill)
.height(Length::Fixed(48.0)) .height(Length::Fixed(48.0))
@ -728,7 +742,7 @@ impl<'a, Message: 'static + Clone> AppletReorderList<'a, Message> {
.into() .into()
} else { } else {
Column::with_children(applet_buttons) Column::with_children(applet_buttons)
.spacing(spacing.space_xxs) .spacing(space_xxs)
.into() .into()
}, },
active_applet_offer: active_dnd, active_applet_offer: active_dnd,
@ -746,7 +760,7 @@ impl<'a, Message: 'static + Clone> AppletReorderList<'a, Message> {
pos: Point, pos: Point,
offered_applet: Applet<'a>, offered_applet: Applet<'a>,
) -> Vec<Applet<'a>> { ) -> Vec<Applet<'a>> {
let spacing = cosmic::theme::active().cosmic().spacing; let space_xxs = theme::active().cosmic().spacing.space_xxs;
let mut reordered: Vec<_> = self.info.clone(); let mut reordered: Vec<_> = self.info.clone();
if !layout.bounds().contains(pos) { if !layout.bounds().contains(pos) {
@ -767,8 +781,7 @@ impl<'a, Message: 'static + Clone> AppletReorderList<'a, Message> {
return reordered; return reordered;
} }
let height = (layout.bounds().height let height = (layout.bounds().height - space_xxs as f32 * (self.info.len() - 1) as f32)
- spacing.space_xxs as f32 * (self.info.len() - 1) as f32)
/ self.info.len() as f32; / self.info.len() as f32;
let mut found = false; let mut found = false;
@ -778,7 +791,7 @@ impl<'a, Message: 'static + Clone> AppletReorderList<'a, Message> {
if i == 0 || i == reordered.len() { if i == 0 || i == reordered.len() {
y += height / 2.0; y += height / 2.0;
} else { } else {
y += height + spacing.space_xxs as f32; y += height + space_xxs as f32;
} }
if pos.y <= y { if pos.y <= y {
reordered.insert(i, offered_applet.clone()); reordered.insert(i, offered_applet.clone());
@ -926,7 +939,7 @@ where
shell: &mut Shell<'_, Message>, shell: &mut Shell<'_, Message>,
viewport: &Rectangle, viewport: &Rectangle,
) -> event::Status { ) -> event::Status {
let spacing = cosmic::theme::active().cosmic().spacing; let space_xxs = theme::active().cosmic().spacing.space_xxs;
let mut ret = match self.inner.as_widget_mut().on_event( let mut ret = match self.inner.as_widget_mut().on_event(
&mut tree.children[0], &mut tree.children[0],
event.clone(), event.clone(),
@ -942,7 +955,7 @@ where
}; };
let height = (layout.bounds().height let height = (layout.bounds().height
- spacing.space_xxs as f32 * (self.info.len().saturating_sub(1)) as f32) - space_xxs as f32 * (self.info.len().saturating_sub(1)) as f32)
/ self.info.len() as f32; / self.info.len() as f32;
let state = tree.state.downcast_mut::<ReorderWidgetState>(); let state = tree.state.downcast_mut::<ReorderWidgetState>();
@ -995,8 +1008,7 @@ where
self.info.iter().enumerate().find(|(i, _)| { self.info.iter().enumerate().find(|(i, _)| {
start.y start.y
< layout.bounds().y < layout.bounds().y
+ (*i + 1) as f32 + (*i + 1) as f32 * (height + space_xxs as f32)
* (height + spacing.space_xxs as f32)
}) })
{ {
let applet = applet.clone().into_owned(); let applet = applet.clone().into_owned();

19
cosmic-settings/src/pages/desktop/wallpaper/mod.rs
View file

@ -16,19 +16,17 @@ use std::{
#[cfg(feature = "xdg-portal")] #[cfg(feature = "xdg-portal")]
use cosmic::dialog::file_chooser; use cosmic::dialog::file_chooser;
use cosmic::iced::{Color, Length}; use cosmic::iced::{Alignment, Color, Length};
use cosmic::iced_runtime::core::image::Handle as ImageHandle;
use cosmic::widget::{ use cosmic::widget::{
button, dropdown, list_column, row, button, dropdown, list_column, row,
segmented_button::{self, SingleSelectModel}, segmented_button::{self, SingleSelectModel},
settings, tab_bar, text, toggler, settings, tab_bar, text, toggler,
}; };
use cosmic::{iced_core::alignment, iced_runtime::core::image::Handle as ImageHandle};
use cosmic::{iced_core::Alignment, widget::icon};
use cosmic::{ use cosmic::{
widget::{color_picker::ColorPickerUpdate, ColorPickerModel}, widget::{color_picker::ColorPickerUpdate, icon, ColorPickerModel},
Element, Apply, Element, Task,
}; };
use cosmic::{Apply, Task};
use cosmic_bg_config::Source; use cosmic_bg_config::Source;
use cosmic_settings_page::Section; use cosmic_settings_page::Section;
use cosmic_settings_page::{self as page, section}; use cosmic_settings_page::{self as page, section};
@ -1214,10 +1212,9 @@ pub fn settings() -> Section<crate::pages::Message> {
)); ));
if page.wallpaper_service_config.same_on_all { if page.wallpaper_service_config.same_on_all {
let element = text(fl!("all-displays")) let element = text::heading(fl!("all-displays"))
.font(cosmic::font::semibold()) .align_x(Alignment::Center)
.align_x(alignment::Horizontal::Center) .align_y(Alignment::Center)
.align_y(alignment::Vertical::Center)
.width(Length::Fill) .width(Length::Fill)
.height(Length::Fill) .height(Length::Fill)
.apply(cosmic::widget::container) .apply(cosmic::widget::container)
@ -1374,7 +1371,7 @@ pub fn settings() -> Section<crate::pages::Message> {
// .push(content) // .push(content)
// .width(Length::Fill) // .width(Length::Fill)
// .height(Length::Fill) // .height(Length::Fill)
// .align_items(cosmic::iced_core::Alignment::Center) // .align_y(Alignment::Center)
// .apply(Element::from) // .apply(Element::from)
// } // }

10
cosmic-settings/src/pages/input/keyboard/mod.rs
View file

@ -4,7 +4,7 @@ use std::cmp;
use cosmic::{ use cosmic::{
cosmic_config::{self, ConfigSet}, cosmic_config::{self, ConfigSet},
iced::{self, Length}, iced::{Alignment, Color, Length},
iced_core::Border, iced_core::Border,
theme, theme,
widget::{self, button, container, icon, radio, row, settings, ListColumn}, widget::{self, button, container, icon, radio, row, settings, ListColumn},
@ -203,7 +203,7 @@ fn popover_menu(id: DefaultKey) -> cosmic::Element<'static, Message> {
container::Style { container::Style {
icon_color: Some(theme.cosmic().background.on.into()), icon_color: Some(theme.cosmic().background.on.into()),
text_color: Some(theme.cosmic().background.on.into()), text_color: Some(theme.cosmic().background.on.into()),
background: Some(iced::Color::from(theme.cosmic().background.base).into()), background: Some(Color::from(theme.cosmic().background.base).into()),
border: Border { border: Border {
radius: cosmic.corner_radii.radius_m.into(), radius: cosmic.corner_radii.radius_m.into(),
..Default::default() ..Default::default()
@ -654,7 +654,7 @@ fn input_sources() -> Section<crate::pages::Message> {
.push( .push(
widget::container(add_input_source) widget::container(add_input_source)
.width(Length::Fill) .width(Length::Fill)
.align_x(iced::alignment::Horizontal::Right), .align_x(Alignment::End),
) )
.apply(Element::from) .apply(Element::from)
.map(crate::pages::Message::Keyboard) .map(crate::pages::Message::Keyboard)
@ -752,7 +752,7 @@ fn keyboard_typing_assist() -> Section<crate::pages::Message> {
.max_width(250); .max_width(250);
row::with_capacity(3) row::with_capacity(3)
.align_y(iced::Alignment::Center) .align_y(Alignment::Center)
.spacing(theme.cosmic().space_s()) .spacing(theme.cosmic().space_s())
.push(widget::text::body(&descriptions[short])) .push(widget::text::body(&descriptions[short]))
.push(delay_slider) .push(delay_slider)
@ -772,7 +772,7 @@ fn keyboard_typing_assist() -> Section<crate::pages::Message> {
.max_width(250); .max_width(250);
row::with_capacity(3) row::with_capacity(3)
.align_y(iced::Alignment::Center) .align_y(Alignment::Center)
.spacing(theme.cosmic().space_s()) .spacing(theme.cosmic().space_s())
.push(widget::text::body(&descriptions[slow])) .push(widget::text::body(&descriptions[slow]))
.push(rate_slider) .push(rate_slider)

3
cosmic-settings/src/pages/input/keyboard/shortcuts/common.rs
View file

@ -1,4 +1,3 @@
use cosmic::iced::alignment::Horizontal;
use cosmic::iced::{Alignment, Length}; use cosmic::iced::{Alignment, Length};
use cosmic::widget::{self, button, icon, settings, text}; use cosmic::widget::{self, button, icon, settings, text};
use cosmic::{theme, Apply, Element, Task}; use cosmic::{theme, Apply, Element, Task};
@ -546,7 +545,7 @@ fn context_drawer(
.spacing(space_xs) .spacing(space_xs)
.apply(widget::container) .apply(widget::container)
.width(Length::Fill) .width(Length::Fill)
.align_x(Horizontal::Right); .align_x(Alignment::End);
widget::column::with_capacity(if show_action { 3 } else { 2 }) widget::column::with_capacity(if show_action { 3 } else { 2 })
.spacing(space_l) .spacing(space_l)

8
cosmic-settings/src/pages/input/keyboard/shortcuts/custom.rs
View file

@ -1,8 +1,8 @@
use std::str::FromStr; use std::str::FromStr;
use super::{ShortcutBinding, ShortcutMessage, ShortcutModel}; use super::{ShortcutBinding, ShortcutMessage, ShortcutModel};
use cosmic::iced::alignment::Horizontal;
use cosmic::iced::Length; use cosmic::iced::{Alignment, Length};
use cosmic::widget::{self, button, icon}; use cosmic::widget::{self, button, icon};
use cosmic::{Apply, Element, Task}; use cosmic::{Apply, Element, Task};
use cosmic_settings_config::shortcuts::{Action, Shortcuts}; use cosmic_settings_config::shortcuts::{Action, Shortcuts};
@ -279,7 +279,7 @@ impl Page {
.on_press(Message::AddShortcut) .on_press(Message::AddShortcut)
.apply(widget::container) .apply(widget::container)
.width(Length::Fill) .width(Length::Fill)
.align_x(Horizontal::Right); .align_x(Alignment::End);
widget::column() widget::column()
.spacing(32) .spacing(32)
@ -435,7 +435,7 @@ fn shortcuts() -> Section<crate::pages::Message> {
.on_press(Message::ShortcutContext) .on_press(Message::ShortcutContext)
.apply(widget::container) .apply(widget::container)
.width(Length::Fill) .width(Length::Fill)
.align_x(Horizontal::Right); .align_x(Alignment::End);
widget::column() widget::column()
.push(content) .push(content)

10
cosmic-settings/src/pages/networking/vpn/mod.rs
View file

@ -8,7 +8,7 @@ use std::sync::Arc;
use anyhow::Context; use anyhow::Context;
use ashpd::desktop::file_chooser::FileFilter; use ashpd::desktop::file_chooser::FileFilter;
use cosmic::{ use cosmic::{
iced::{alignment, Length}, iced::{Alignment, Length},
iced_core::text::Wrapping, iced_core::text::Wrapping,
widget::{self, icon}, widget::{self, icon},
Apply, Element, Task, Apply, Element, Task,
@ -324,7 +324,7 @@ impl page::Page<crate::pages::Message> for Page {
.on_press(Message::AddNetwork) .on_press(Message::AddNetwork)
.apply(widget::container) .apply(widget::container)
.width(Length::Fill) .width(Length::Fill)
.align_x(alignment::Horizontal::Right) .align_x(Alignment::End)
.apply(Element::from) .apply(Element::from)
.map(crate::pages::Message::Vpn), .map(crate::pages::Message::Vpn),
) )
@ -781,7 +781,7 @@ fn devices_view() -> Section<crate::pages::Message> {
widget::button::text(connect_txt).on_press(msg).into() widget::button::text(connect_txt).on_press(msg).into()
} else { } else {
widget::text::body(connect_txt) widget::text::body(connect_txt)
.align_y(alignment::Vertical::Center) .align_y(Alignment::Center)
.into() .into()
}; };
@ -826,7 +826,7 @@ fn devices_view() -> Section<crate::pages::Message> {
let controls = widget::row::with_capacity(2) let controls = widget::row::with_capacity(2)
.push(connect) .push(connect)
.push_maybe(view_more) .push_maybe(view_more)
.align_y(alignment::Alignment::Center) .align_y(Alignment::Center)
.spacing(spacing.space_xxs); .spacing(spacing.space_xxs);
let widget = widget::settings::item_row(vec![ let widget = widget::settings::item_row(vec![
@ -852,7 +852,7 @@ fn popup_button(message: Message, text: &str) -> Element<'_, Message> {
let theme = cosmic::theme::active(); let theme = cosmic::theme::active();
let theme = theme.cosmic(); let theme = theme.cosmic();
widget::text::body(text) widget::text::body(text)
.align_y(alignment::Vertical::Center) .align_y(Alignment::Center)
.apply(widget::button::custom) .apply(widget::button::custom)
.padding([theme.space_xxxs(), theme.space_xs()]) .padding([theme.space_xxxs(), theme.space_xs()])
.width(Length::Fill) .width(Length::Fill)

18
cosmic-settings/src/pages/networking/wifi.rs
View file

@ -8,7 +8,7 @@ use std::{
use anyhow::Context; use anyhow::Context;
use cosmic::{ use cosmic::{
iced::{alignment, Length}, iced::{Alignment, Length},
iced_core::text::Wrapping, iced_core::text::Wrapping,
widget::{self, icon}, widget::{self, icon},
Apply, Element, Task, Apply, Element, Task,
@ -193,7 +193,7 @@ impl page::Page<crate::pages::Message> for Page {
.on_press(Message::AddNetwork) .on_press(Message::AddNetwork)
.apply(widget::container) .apply(widget::container)
.width(Length::Fill) .width(Length::Fill)
.align_x(alignment::Horizontal::Right) .align_x(Alignment::End)
.apply(Element::from) .apply(Element::from)
.map(crate::pages::Message::WiFi), .map(crate::pages::Message::WiFi),
) )
@ -545,10 +545,9 @@ fn devices_view() -> Section<crate::pages::Message> {
.push(icon::from_name("airplane-mode-symbolic")) .push(icon::from_name("airplane-mode-symbolic"))
.push(widget::text::body(&section.descriptions[airplane_mode_txt])) .push(widget::text::body(&section.descriptions[airplane_mode_txt]))
.spacing(8) .spacing(8)
.align_y(alignment::Alignment::Center) .align_y(Alignment::Center)
.apply(widget::container) .apply(widget::container)
.width(Length::Fill) .center_x(Length::Fill)
.align_x(alignment::Horizontal::Center)
})); }));
if !state.airplane_mode if !state.airplane_mode
@ -557,8 +556,7 @@ fn devices_view() -> Section<crate::pages::Message> {
{ {
let no_networks_found = let no_networks_found =
widget::container(widget::text::body(&section.descriptions[no_networks_txt])) widget::container(widget::text::body(&section.descriptions[no_networks_txt]))
.align_x(alignment::Horizontal::Center) .center_x(Length::Fill);
.width(Length::Fill);
view = view.push(no_networks_found); view = view.push(no_networks_found);
} else { } else {
@ -622,7 +620,7 @@ fn devices_view() -> Section<crate::pages::Message> {
widget::button::text(connect_txt).on_press(msg).into() widget::button::text(connect_txt).on_press(msg).into()
} else { } else {
widget::text::body(connect_txt) widget::text::body(connect_txt)
.align_y(alignment::Vertical::Center) .align_y(Alignment::Center)
.into() .into()
}; };
@ -671,7 +669,7 @@ fn devices_view() -> Section<crate::pages::Message> {
let controls = widget::row::with_capacity(2) let controls = widget::row::with_capacity(2)
.push(connect) .push(connect)
.push_maybe(view_more) .push_maybe(view_more)
.align_y(alignment::Alignment::Center) .align_y(Alignment::Center)
.spacing(spacing.space_xxs); .spacing(spacing.space_xxs);
let widget = widget::settings::item_row(vec![ let widget = widget::settings::item_row(vec![
@ -721,7 +719,7 @@ fn popup_button(message: Message, text: &str) -> Element<'_, Message> {
let theme = cosmic::theme::active(); let theme = cosmic::theme::active();
let theme = theme.cosmic(); let theme = theme.cosmic();
widget::text::body(text) widget::text::body(text)
.align_y(alignment::Vertical::Center) .align_y(Alignment::Center)
.apply(widget::button::custom) .apply(widget::button::custom)
.padding([theme.space_xxxs(), theme.space_xs()]) .padding([theme.space_xxxs(), theme.space_xs()])
.width(Length::Fill) .width(Length::Fill)

10
cosmic-settings/src/pages/networking/wired.rs
View file

@ -5,7 +5,7 @@ use std::{collections::BTreeSet, sync::Arc};
use anyhow::Context; use anyhow::Context;
use cosmic::{ use cosmic::{
iced::{alignment, Length}, iced::{Alignment, Length},
iced_core::text::Wrapping, iced_core::text::Wrapping,
widget::{self, icon}, widget::{self, icon},
Apply, Element, Task, Apply, Element, Task,
@ -149,7 +149,7 @@ impl page::Page<crate::pages::Message> for Page {
.on_press(Message::AddNetwork) .on_press(Message::AddNetwork)
.apply(widget::container) .apply(widget::container)
.width(Length::Fill) .width(Length::Fill)
.align_x(alignment::Horizontal::Right) .align_x(Alignment::End)
.apply(Element::from) .apply(Element::from)
.map(crate::pages::Message::Wired), .map(crate::pages::Message::Wired),
) )
@ -487,7 +487,7 @@ impl Page {
widget::button::text(connect_txt).on_press(msg).into() widget::button::text(connect_txt).on_press(msg).into()
} else { } else {
widget::text::body(connect_txt) widget::text::body(connect_txt)
.align_y(alignment::Vertical::Center) .align_y(Alignment::Center)
.into() .into()
}; };
@ -535,7 +535,7 @@ impl Page {
let controls = widget::row::with_capacity(2) let controls = widget::row::with_capacity(2)
.push(connect) .push(connect)
.push_maybe(view_more) .push_maybe(view_more)
.align_y(alignment::Alignment::Center) .align_y(Alignment::Center)
.spacing(spacing.space_xxs); .spacing(spacing.space_xxs);
let widget = widget::settings::item_row(vec![ let widget = widget::settings::item_row(vec![
@ -607,7 +607,7 @@ fn popup_button(message: Message, text: &str) -> Element<'_, Message> {
let theme = cosmic::theme::active(); let theme = cosmic::theme::active();
let theme = theme.cosmic(); let theme = theme.cosmic();
widget::text::body(text) widget::text::body(text)
.align_y(alignment::Vertical::Center) .align_y(Alignment::Center)
.apply(widget::button::custom) .apply(widget::button::custom)
.padding([theme.space_xxxs(), theme.space_xs()]) .padding([theme.space_xxxs(), theme.space_xs()])
.width(Length::Fill) .width(Length::Fill)

13
cosmic-settings/src/pages/power/mod.rs
View file

@ -386,6 +386,7 @@ fn power_saving() -> Section<crate::pages::Message> {
.title(fl!("power-saving")) .title(fl!("power-saving"))
.descriptions(descriptions) .descriptions(descriptions)
.view::<Page>(move |_binder, page, section| { .view::<Page>(move |_binder, page, section| {
let descriptions = &section.descriptions;
let screen_off_time = page let screen_off_time = page
.idle_conf .idle_conf
.screen_off_time .screen_off_time
@ -398,17 +399,17 @@ fn power_saving() -> Section<crate::pages::Message> {
.idle_conf .idle_conf
.suspend_on_battery_time .suspend_on_battery_time
.map(|t| Duration::from_millis(t.into())); .map(|t| Duration::from_millis(t.into()));
let mut section_view = settings::section() let mut section = settings::section()
.title(&section.title) .title(&section.title)
.add(power_saving_row( .add(power_saving_row(
&section.descriptions[turn_off_screen_desc], &descriptions[turn_off_screen_desc],
&page.screen_off_labels, &page.screen_off_labels,
screen_off_time, screen_off_time,
SCREEN_OFF_TIMES, SCREEN_OFF_TIMES,
Message::ScreenOffTimeChange, Message::ScreenOffTimeChange,
)) ))
.add(power_saving_row( .add(power_saving_row(
&section.descriptions[if page.battery.is_present { &descriptions[if page.battery.is_present {
auto_suspend_ac_desc auto_suspend_ac_desc
} else { } else {
auto_suspend_desc auto_suspend_desc
@ -419,15 +420,15 @@ fn power_saving() -> Section<crate::pages::Message> {
Message::SuspendOnAcTimeChange, Message::SuspendOnAcTimeChange,
)); ));
if page.battery.is_present { if page.battery.is_present {
section_view = section_view.add(power_saving_row( section = section.add(power_saving_row(
&section.descriptions[auto_suspend_battery_desc], &descriptions[auto_suspend_battery_desc],
&page.suspend_labels, &page.suspend_labels,
suspend_on_battery_time, suspend_on_battery_time,
SUSPEND_TIMES, SUSPEND_TIMES,
Message::SuspendOnBatteryTimeChange, Message::SuspendOnBatteryTimeChange,
)); ));
} }
section_view section
.apply(cosmic::Element::from) .apply(cosmic::Element::from)
.map(crate::pages::Message::Power) .map(crate::pages::Message::Power)
}) })

15
cosmic-settings/src/widget/mod.rs
View file

@ -4,7 +4,7 @@
use std::borrow::Cow; use std::borrow::Cow;
use cosmic::cosmic_theme::Spacing; use cosmic::cosmic_theme::Spacing;
use cosmic::iced::{alignment, Length}; use cosmic::iced::{Alignment, Length};
use cosmic::iced_core::text::Wrapping; use cosmic::iced_core::text::Wrapping;
use cosmic::widget::color_picker::ColorPickerUpdate; use cosmic::widget::color_picker::ColorPickerUpdate;
use cosmic::widget::{ use cosmic::widget::{
@ -37,13 +37,12 @@ pub fn color_picker_context_view<'a, Message: Clone + 'static>(
) )
.apply(container) .apply(container)
.width(Length::Fixed(248.0)) .width(Length::Fixed(248.0))
.align_x(alignment::Horizontal::Center) .align_x(Alignment::Center)
.apply(container) .apply(container)
.width(Length::Fill) .center_x(Length::Fill),
.align_x(alignment::Horizontal::Center),
) )
.padding(spacing.space_l) .padding(spacing.space_l)
.align_x(cosmic::iced_core::Alignment::Center) .align_x(Alignment::Center)
.spacing(spacing.space_m) .spacing(spacing.space_m)
.width(Length::Fill) .width(Length::Fill)
.apply(Element::from) .apply(Element::from)
@ -147,13 +146,13 @@ pub fn page_list_item<'a, Message: 'static + Clone>(
row::with_capacity(2) row::with_capacity(2)
.push(text::body(info)) .push(text::body(info))
.push(container(icon::from_name("go-next-symbolic").size(20)).padding(8)) .push(container(icon::from_name("go-next-symbolic").size(20)).padding(8))
.align_y(alignment::Alignment::Center), .align_y(Alignment::Center),
) )
.padding(0) .padding(0)
.spacing(space_xxs) .spacing(space_xxs)
.apply(container) .apply(container)
.padding([space_s, space_m]) .padding([space_s, space_m])
.align_x(alignment::Horizontal::Center) .align_x(Alignment::Center)
.class(theme::Container::List) .class(theme::Container::List)
.apply(button::custom) .apply(button::custom)
.padding(0) .padding(0)
@ -211,7 +210,7 @@ pub fn go_next_with_item<'a, Msg: Clone + 'static>(
widget::row::with_capacity(2) widget::row::with_capacity(2)
.push(item) .push(item)
.push(icon::from_name("go-next-symbolic").size(16).icon()) .push(icon::from_name("go-next-symbolic").size(16).icon())
.align_y(alignment::Alignment::Center) .align_y(Alignment::Center)
.spacing(cosmic::theme::active().cosmic().spacing.space_s) .spacing(cosmic::theme::active().cosmic().spacing.space_s)
.into(), .into(),
]) ])