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

wip: fix icons

Browse source
This commit is contained in:
Ashley Wulber 2024-01-02 11:47:58 -05:00 • committed by Ashley Wulber
parent d7163f3b5d
commit aab284f6f1
3 changed files with 534 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

560
Cargo.lock generated
View file

@ -768,7 +768,7 @@ dependencies = [
"i18n-embed 0.13.9", "i18n-embed 0.13.9",
"i18n-embed-fl 0.6.7", "i18n-embed-fl 0.6.7",
"itertools 0.12.0", "itertools 0.12.0",
"libcosmic", "libcosmic 0.1.0",
"log", "log",
"nix 0.26.4", "nix 0.26.4",
"once_cell", "once_cell",
@ -792,7 +792,7 @@ dependencies = [
"i18n-embed 0.13.9", "i18n-embed 0.13.9",
"i18n-embed-fl 0.6.7", "i18n-embed-fl 0.6.7",
"icon-loader", "icon-loader",
"libcosmic", "libcosmic 0.1.0 (git+https://github.com/pop-os/libcosmic)",
"libpulse-binding", "libpulse-binding",
"libpulse-glib-binding", "libpulse-glib-binding",
"mpris2-zbus", "mpris2-zbus",
@ -814,7 +814,7 @@ dependencies = [
"futures", "futures",
"i18n-embed 0.13.9", "i18n-embed 0.13.9",
"i18n-embed-fl 0.6.7", "i18n-embed-fl 0.6.7",
"libcosmic", "libcosmic 0.1.0 (git+https://github.com/pop-os/libcosmic)",
"log", "log",
"once_cell", "once_cell",
"pretty_env_logger 0.5.0", "pretty_env_logger 0.5.0",
@ -836,7 +836,7 @@ dependencies = [
"i18n-embed 0.13.9", "i18n-embed 0.13.9",
"i18n-embed-fl 0.6.7", "i18n-embed-fl 0.6.7",
"itertools 0.10.5", "itertools 0.10.5",
"libcosmic", "libcosmic 0.1.0 (git+https://github.com/pop-os/libcosmic)",
"log", "log",
"once_cell", "once_cell",
"pretty_env_logger 0.5.0", "pretty_env_logger 0.5.0",
@ -852,7 +852,7 @@ version = "0.1.0"
dependencies = [ dependencies = [
"i18n-embed 0.13.9", "i18n-embed 0.13.9",
"i18n-embed-fl 0.6.7", "i18n-embed-fl 0.6.7",
"libcosmic", "libcosmic 0.1.0 (git+https://github.com/pop-os/libcosmic)",
"once_cell", "once_cell",
"rust-embed 6.8.1", "rust-embed 6.8.1",
"tracing", "tracing",
@ -871,7 +871,7 @@ dependencies = [
"i18n-embed 0.13.9", "i18n-embed 0.13.9",
"i18n-embed-fl 0.6.7", "i18n-embed-fl 0.6.7",
"itertools 0.10.5", "itertools 0.10.5",
"libcosmic", "libcosmic 0.1.0 (git+https://github.com/pop-os/libcosmic)",
"log", "log",
"pretty_env_logger 0.5.0", "pretty_env_logger 0.5.0",
"rust-embed 6.8.1", "rust-embed 6.8.1",
@ -892,7 +892,7 @@ dependencies = [
"cosmic-time", "cosmic-time",
"i18n-embed 0.13.9", "i18n-embed 0.13.9",
"i18n-embed-fl 0.6.7", "i18n-embed-fl 0.6.7",
"libcosmic", "libcosmic 0.1.0 (git+https://github.com/pop-os/libcosmic)",
"nix 0.26.4", "nix 0.26.4",
"ron", "ron",
"rust-embed 6.8.1", "rust-embed 6.8.1",
@ -912,7 +912,7 @@ dependencies = [
"i18n-embed 0.13.9", "i18n-embed 0.13.9",
"i18n-embed-fl 0.6.7", "i18n-embed-fl 0.6.7",
"icon-loader", "icon-loader",
"libcosmic", "libcosmic 0.1.0 (git+https://github.com/pop-os/libcosmic)",
"libpulse-binding", "libpulse-binding",
"libpulse-glib-binding", "libpulse-glib-binding",
"logind-zbus", "logind-zbus",
@ -929,7 +929,7 @@ name = "cosmic-applet-status-area"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"futures", "futures",
"libcosmic", "libcosmic 0.1.0 (git+https://github.com/pop-os/libcosmic)",
"serde", "serde",
"tokio", "tokio",
"zbus", "zbus",
@ -942,7 +942,7 @@ dependencies = [
"cosmic-time", "cosmic-time",
"i18n-embed 0.14.1", "i18n-embed 0.14.1",
"i18n-embed-fl 0.7.0", "i18n-embed-fl 0.7.0",
"libcosmic", "libcosmic 0.1.0 (git+https://github.com/pop-os/libcosmic)",
"once_cell", "once_cell",
"rust-embed 8.1.0", "rust-embed 8.1.0",
"tracing", "tracing",
@ -956,7 +956,7 @@ dependencies = [
"i18n-embed 0.13.9", "i18n-embed 0.13.9",
"i18n-embed-fl 0.6.7", "i18n-embed-fl 0.6.7",
"icon-loader", "icon-loader",
"libcosmic", "libcosmic 0.1.0 (git+https://github.com/pop-os/libcosmic)",
"nix 0.26.4", "nix 0.26.4",
"once_cell", "once_cell",
"rust-embed 6.8.1", "rust-embed 6.8.1",
@ -973,7 +973,7 @@ dependencies = [
"futures", "futures",
"i18n-embed 0.13.9", "i18n-embed 0.13.9",
"i18n-embed-fl 0.6.7", "i18n-embed-fl 0.6.7",
"libcosmic", "libcosmic 0.1.0 (git+https://github.com/pop-os/libcosmic)",
"log", "log",
"nix 0.26.4", "nix 0.26.4",
"once_cell", "once_cell",
@ -992,17 +992,31 @@ dependencies = [
"wayland-client 0.31.1", "wayland-client 0.31.1",
] ]
[[package]]
name = "cosmic-config"
version = "0.1.0"
dependencies = [
"atomicwrites",
"cosmic-config-derive 0.1.0",
"dirs 5.0.1",
"iced_futures 0.12.0",
"notify",
"once_cell",
"ron",
"serde",
]
[[package]] [[package]]
name = "cosmic-config" name = "cosmic-config"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#a9df1667409844bbc333623705830c4da031960a" source = "git+https://github.com/pop-os/libcosmic#a9df1667409844bbc333623705830c4da031960a"
dependencies = [ dependencies = [
"atomicwrites", "atomicwrites",
"cosmic-config-derive", "cosmic-config-derive 0.1.0 (git+https://github.com/pop-os/libcosmic)",
"cosmic-settings-daemon", "cosmic-settings-daemon",
"dirs 5.0.1", "dirs 5.0.1",
"futures-util", "futures-util",
"iced_futures", "iced_futures 0.12.0 (git+https://github.com/pop-os/libcosmic)",
"notify", "notify",
"once_cell", "once_cell",
"ron", "ron",
@ -1010,6 +1024,14 @@ dependencies = [
"zbus", "zbus",
] ]
[[package]]
name = "cosmic-config-derive"
version = "0.1.0"
dependencies = [
"quote",
"syn 1.0.109",
]
[[package]] [[package]]
name = "cosmic-config-derive" name = "cosmic-config-derive"
version = "0.1.0" version = "0.1.0"
@ -1038,7 +1060,7 @@ name = "cosmic-notifications-config"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-notifications#4775bc063e61db18f3e1d3c6d6a1405b1e11a92b" source = "git+https://github.com/pop-os/cosmic-notifications#4775bc063e61db18f3e1d3c6d6a1405b1e11a92b"
dependencies = [ dependencies = [
"cosmic-config", "cosmic-config 0.1.0 (git+https://github.com/pop-os/libcosmic)",
"serde", "serde",
] ]
@ -1060,7 +1082,7 @@ name = "cosmic-panel-button"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"freedesktop-desktop-entry", "freedesktop-desktop-entry",
"libcosmic", "libcosmic 0.1.0 (git+https://github.com/pop-os/libcosmic)",
] ]
[[package]] [[package]]
@ -1069,7 +1091,7 @@ version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-panel#dcfa3eaf124571d039320d0dd9da6ae00743b153" source = "git+https://github.com/pop-os/cosmic-panel#dcfa3eaf124571d039320d0dd9da6ae00743b153"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"cosmic-config", "cosmic-config 0.1.0 (git+https://github.com/pop-os/libcosmic)",
"ron", "ron",
"serde", "serde",
"tracing", "tracing",
@ -1104,7 +1126,7 @@ version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75acbfb314aeb4f5210d379af45ed1ec2c98c7f1790bf57b8a4c562ac0c51b71" checksum = "75acbfb314aeb4f5210d379af45ed1ec2c98c7f1790bf57b8a4c562ac0c51b71"
dependencies = [ dependencies = [
"fontdb", "fontdb 0.15.0",
"libm", "libm",
"log", "log",
"rangemap", "rangemap",
@ -1119,13 +1141,47 @@ dependencies = [
"unicode-segmentation", "unicode-segmentation",
] ]
[[package]]
name = "cosmic-text"
version = "0.10.0"
source = "git+https://github.com/pop-os/cosmic-text.git?branch=refactor#8fc93d90933ded737ea4f7ca63ab064a5331710d"
dependencies = [
"bitflags 2.4.1",
"fontdb 0.16.0",
"libm",
"log",
"rangemap",
"rustc-hash",
"rustybuzz 0.12.1",
"self_cell 1.0.2",
"swash",
"sys-locale",
"unicode-bidi",
"unicode-linebreak",
"unicode-script",
"unicode-segmentation",
]
[[package]]
name = "cosmic-theme"
version = "0.1.0"
dependencies = [
"almost",
"cosmic-config 0.1.0",
"csscolorparser",
"lazy_static",
"palette",
"ron",
"serde",
]
[[package]] [[package]]
name = "cosmic-theme" name = "cosmic-theme"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#a9df1667409844bbc333623705830c4da031960a" source = "git+https://github.com/pop-os/libcosmic#a9df1667409844bbc333623705830c4da031960a"
dependencies = [ dependencies = [
"almost", "almost",
"cosmic-config", "cosmic-config 0.1.0 (git+https://github.com/pop-os/libcosmic)",
"csscolorparser", "csscolorparser",
"lazy_static", "lazy_static",
"palette", "palette",
@ -1139,7 +1195,7 @@ version = "0.4.0"
source = "git+https://github.com/pop-os/cosmic-time#4dc1fcec44aa7471a8e707fa391f9882d23250d7" source = "git+https://github.com/pop-os/cosmic-time#4dc1fcec44aa7471a8e707fa391f9882d23250d7"
dependencies = [ dependencies = [
"float-cmp", "float-cmp",
"libcosmic", "libcosmic 0.1.0 (git+https://github.com/pop-os/libcosmic)",
"once_cell", "once_cell",
] ]
@ -1915,7 +1971,7 @@ version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4" checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4"
dependencies = [ dependencies = [
"roxmltree", "roxmltree 0.18.1",
] ]
[[package]] [[package]]
@ -1932,6 +1988,20 @@ dependencies = [
"ttf-parser 0.19.2", "ttf-parser 0.19.2",
] ]
[[package]]
name = "fontdb"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "98b88c54a38407f7352dd2c4238830115a6377741098ffd1f997c813d0e088a6"
dependencies = [
"fontconfig-parser",
"log",
"memmap2 0.9.0",
"slotmap",
"tinyvec",
"ttf-parser 0.20.0",
]
[[package]] [[package]]
name = "foreign-types" name = "foreign-types"
version = "0.5.0" version = "0.5.0"
@ -2284,12 +2354,23 @@ dependencies = [
"gl_generator", "gl_generator",
] ]
[[package]]
name = "glyphon"
version = "0.3.0"
source = "git+https://github.com/jackpot51/glyphon.git?branch=refactor#c28dc99c86b6b598633e6623096b21632f266976"
dependencies = [
"cosmic-text 0.10.0 (git+https://github.com/pop-os/cosmic-text.git?branch=refactor)",
"etagere",
"lru",
"wgpu",
]
[[package]] [[package]]
name = "glyphon" name = "glyphon"
version = "0.3.0" version = "0.3.0"
source = "git+https://github.com/grovesNL/glyphon.git?rev=2caa9fc5e5923c1d827d177c3619cab7e9885b85#2caa9fc5e5923c1d827d177c3619cab7e9885b85" source = "git+https://github.com/grovesNL/glyphon.git?rev=2caa9fc5e5923c1d827d177c3619cab7e9885b85#2caa9fc5e5923c1d827d177c3619cab7e9885b85"
dependencies = [ dependencies = [
"cosmic-text", "cosmic-text 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
"etagere", "etagere",
"lru", "lru",
"wgpu", "wgpu",
@ -2606,18 +2687,40 @@ dependencies = [
[[package]] [[package]]
name = "iced" name = "iced"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#a9df1667409844bbc333623705830c4da031960a"
dependencies = [ dependencies = [
"iced_accessibility", "iced_accessibility 0.1.0",
"iced_core", "iced_core 0.12.0",
"iced_futures", "iced_futures 0.12.0",
"iced_renderer", "iced_renderer 0.12.0",
"iced_sctk", "iced_sctk 0.1.0",
"iced_widget", "iced_widget 0.12.0",
"image", "image",
"thiserror", "thiserror",
] ]
[[package]]
name = "iced"
version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#a9df1667409844bbc333623705830c4da031960a"
dependencies = [
"iced_accessibility 0.1.0 (git+https://github.com/pop-os/libcosmic)",
"iced_core 0.12.0 (git+https://github.com/pop-os/libcosmic)",
"iced_futures 0.12.0 (git+https://github.com/pop-os/libcosmic)",
"iced_renderer 0.12.0 (git+https://github.com/pop-os/libcosmic)",
"iced_sctk 0.1.0 (git+https://github.com/pop-os/libcosmic)",
"iced_widget 0.12.0 (git+https://github.com/pop-os/libcosmic)",
"image",
"thiserror",
]
[[package]]
name = "iced_accessibility"
version = "0.1.0"
dependencies = [
"accesskit",
"accesskit_unix",
]
[[package]] [[package]]
name = "iced_accessibility" name = "iced_accessibility"
version = "0.1.0" version = "0.1.0"
@ -2627,13 +2730,30 @@ dependencies = [
"accesskit_unix", "accesskit_unix",
] ]
[[package]]
name = "iced_core"
version = "0.12.0"
dependencies = [
"bitflags 1.3.2",
"iced_accessibility 0.1.0",
"instant",
"log",
"num-traits",
"palette",
"raw-window-handle",
"serde",
"smithay-client-toolkit 0.18.0",
"thiserror",
"xxhash-rust",
]
[[package]] [[package]]
name = "iced_core" name = "iced_core"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#a9df1667409844bbc333623705830c4da031960a" source = "git+https://github.com/pop-os/libcosmic#a9df1667409844bbc333623705830c4da031960a"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"iced_accessibility", "iced_accessibility 0.1.0 (git+https://github.com/pop-os/libcosmic)",
"instant", "instant",
"log", "log",
"num-traits", "num-traits",
@ -2645,19 +2765,53 @@ dependencies = [
"xxhash-rust", "xxhash-rust",
] ]
[[package]]
name = "iced_futures"
version = "0.12.0"
dependencies = [
"futures",
"iced_core 0.12.0",
"log",
"tokio",
"wasm-bindgen-futures",
"wasm-timer",
]
[[package]] [[package]]
name = "iced_futures" name = "iced_futures"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#a9df1667409844bbc333623705830c4da031960a" source = "git+https://github.com/pop-os/libcosmic#a9df1667409844bbc333623705830c4da031960a"
dependencies = [ dependencies = [
"futures", "futures",
"iced_core", "iced_core 0.12.0 (git+https://github.com/pop-os/libcosmic)",
"log", "log",
"tokio", "tokio",
"wasm-bindgen-futures", "wasm-bindgen-futures",
"wasm-timer", "wasm-timer",
] ]
[[package]]
name = "iced_graphics"
version = "0.12.0"
dependencies = [
"bitflags 1.3.2",
"bytemuck",
"cosmic-text 0.10.0 (git+https://github.com/pop-os/cosmic-text.git?branch=refactor)",
"glam",
"half",
"iced_core 0.12.0",
"image",
"kamadak-exif",
"log",
"lyon_path",
"once_cell",
"raw-window-handle",
"rustc-hash",
"thiserror",
"unicode-segmentation",
"xxhash-rust",
]
[[package]] [[package]]
name = "iced_graphics" name = "iced_graphics"
version = "0.12.0" version = "0.12.0"
@ -2665,10 +2819,10 @@ source = "git+https://github.com/pop-os/libcosmic#a9df1667409844bbc333623705830c
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"bytemuck", "bytemuck",
"cosmic-text", "cosmic-text 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
"glam", "glam",
"half", "half",
"iced_core", "iced_core 0.12.0 (git+https://github.com/pop-os/libcosmic)",
"image", "image",
"kamadak-exif", "kamadak-exif",
"log", "log",
@ -2681,14 +2835,26 @@ dependencies = [
"xxhash-rust", "xxhash-rust",
] ]
[[package]]
name = "iced_renderer"
version = "0.12.0"
dependencies = [
"iced_graphics 0.12.0",
"iced_tiny_skia 0.12.0",
"iced_wgpu 0.12.0",
"log",
"raw-window-handle",
"thiserror",
]
[[package]] [[package]]
name = "iced_renderer" name = "iced_renderer"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#a9df1667409844bbc333623705830c4da031960a" source = "git+https://github.com/pop-os/libcosmic#a9df1667409844bbc333623705830c4da031960a"
dependencies = [ dependencies = [
"iced_graphics", "iced_graphics 0.12.0 (git+https://github.com/pop-os/libcosmic)",
"iced_tiny_skia", "iced_tiny_skia 0.12.0 (git+https://github.com/pop-os/libcosmic)",
"iced_wgpu", "iced_wgpu 0.12.0 (git+https://github.com/pop-os/libcosmic)",
"log", "log",
"raw-window-handle", "raw-window-handle",
"thiserror", "thiserror",
@ -2697,15 +2863,49 @@ dependencies = [
[[package]] [[package]]
name = "iced_runtime" name = "iced_runtime"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#a9df1667409844bbc333623705830c4da031960a"
dependencies = [ dependencies = [
"iced_accessibility", "iced_accessibility 0.1.0",
"iced_core", "iced_core 0.12.0",
"iced_futures", "iced_futures 0.12.0",
"smithay-client-toolkit 0.18.0", "smithay-client-toolkit 0.18.0",
"thiserror", "thiserror",
] ]
[[package]]
name = "iced_runtime"
version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#a9df1667409844bbc333623705830c4da031960a"
dependencies = [
"iced_accessibility 0.1.0 (git+https://github.com/pop-os/libcosmic)",
"iced_core 0.12.0 (git+https://github.com/pop-os/libcosmic)",
"iced_futures 0.12.0 (git+https://github.com/pop-os/libcosmic)",
"smithay-client-toolkit 0.18.0",
"thiserror",
]
[[package]]
name = "iced_sctk"
version = "0.1.0"
dependencies = [
"enum-repr",
"float-cmp",
"futures",
"iced_futures 0.12.0",
"iced_graphics 0.12.0",
"iced_runtime 0.12.0",
"iced_style 0.12.0",
"itertools 0.10.5",
"lazy_static",
"raw-window-handle",
"smithay-client-toolkit 0.18.0",
"smithay-clipboard",
"thiserror",
"tracing",
"wayland-backend 0.3.2",
"wayland-protocols 0.31.0",
"xkeysym",
]
[[package]] [[package]]
name = "iced_sctk" name = "iced_sctk"
version = "0.1.0" version = "0.1.0"
@ -2714,10 +2914,10 @@ dependencies = [
"enum-repr", "enum-repr",
"float-cmp", "float-cmp",
"futures", "futures",
"iced_futures", "iced_futures 0.12.0 (git+https://github.com/pop-os/libcosmic)",
"iced_graphics", "iced_graphics 0.12.0 (git+https://github.com/pop-os/libcosmic)",
"iced_runtime", "iced_runtime 0.12.0 (git+https://github.com/pop-os/libcosmic)",
"iced_style", "iced_style 0.12.0 (git+https://github.com/pop-os/libcosmic)",
"itertools 0.10.5", "itertools 0.10.5",
"lazy_static", "lazy_static",
"raw-window-handle", "raw-window-handle",
@ -2733,31 +2933,76 @@ dependencies = [
[[package]] [[package]]
name = "iced_style" name = "iced_style"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#a9df1667409844bbc333623705830c4da031960a"
dependencies = [ dependencies = [
"iced_core", "iced_core 0.12.0",
"once_cell", "once_cell",
"palette", "palette",
] ]
[[package]]
name = "iced_style"
version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#a9df1667409844bbc333623705830c4da031960a"
dependencies = [
"iced_core 0.12.0 (git+https://github.com/pop-os/libcosmic)",
"once_cell",
"palette",
]
[[package]]
name = "iced_tiny_skia"
version = "0.12.0"
dependencies = [
"bytemuck",
"cosmic-text 0.10.0 (git+https://github.com/pop-os/cosmic-text.git?branch=refactor)",
"iced_graphics 0.12.0",
"kurbo",
"log",
"raw-window-handle",
"resvg 0.37.0",
"rustc-hash",
"softbuffer",
"tiny-skia",
"xxhash-rust",
]
[[package]] [[package]]
name = "iced_tiny_skia" name = "iced_tiny_skia"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#a9df1667409844bbc333623705830c4da031960a" source = "git+https://github.com/pop-os/libcosmic#a9df1667409844bbc333623705830c4da031960a"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"cosmic-text", "cosmic-text 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
"iced_graphics", "iced_graphics 0.12.0 (git+https://github.com/pop-os/libcosmic)",
"kurbo", "kurbo",
"log", "log",
"raw-window-handle", "raw-window-handle",
"resvg", "resvg 0.36.0",
"rustc-hash", "rustc-hash",
"softbuffer", "softbuffer",
"tiny-skia", "tiny-skia",
"xxhash-rust", "xxhash-rust",
] ]
[[package]]
name = "iced_wgpu"
version = "0.12.0"
dependencies = [
"bitflags 1.3.2",
"bytemuck",
"futures",
"glam",
"glyphon 0.3.0 (git+https://github.com/jackpot51/glyphon.git?branch=refactor)",
"guillotiere",
"iced_graphics 0.12.0",
"log",
"lyon",
"once_cell",
"raw-window-handle",
"resvg 0.37.0",
"wgpu",
]
[[package]] [[package]]
name = "iced_wgpu" name = "iced_wgpu"
version = "0.12.0" version = "0.12.0"
@ -2767,25 +3012,39 @@ dependencies = [
"bytemuck", "bytemuck",
"futures", "futures",
"glam", "glam",
"glyphon", "glyphon 0.3.0 (git+https://github.com/grovesNL/glyphon.git?rev=2caa9fc5e5923c1d827d177c3619cab7e9885b85)",
"guillotiere", "guillotiere",
"iced_graphics", "iced_graphics 0.12.0 (git+https://github.com/pop-os/libcosmic)",
"log", "log",
"lyon", "lyon",
"once_cell", "once_cell",
"raw-window-handle", "raw-window-handle",
"resvg", "resvg 0.36.0",
"wgpu", "wgpu",
] ]
[[package]]
name = "iced_widget"
version = "0.12.0"
dependencies = [
"iced_renderer 0.12.0",
"iced_runtime 0.12.0",
"iced_style 0.12.0",
"num-traits",
"ouroboros",
"smithay-client-toolkit 0.18.0",
"thiserror",
"unicode-segmentation",
]
[[package]] [[package]]
name = "iced_widget" name = "iced_widget"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#a9df1667409844bbc333623705830c4da031960a" source = "git+https://github.com/pop-os/libcosmic#a9df1667409844bbc333623705830c4da031960a"
dependencies = [ dependencies = [
"iced_renderer", "iced_renderer 0.12.0 (git+https://github.com/pop-os/libcosmic)",
"iced_runtime", "iced_runtime 0.12.0 (git+https://github.com/pop-os/libcosmic)",
"iced_style", "iced_style 0.12.0 (git+https://github.com/pop-os/libcosmic)",
"num-traits", "num-traits",
"ouroboros", "ouroboros",
"smithay-client-toolkit 0.18.0", "smithay-client-toolkit 0.18.0",
@ -3046,6 +3305,42 @@ version = "0.2.151"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
[[package]]
name = "libcosmic"
version = "0.1.0"
dependencies = [
"apply",
"ashpd",
"cosmic-client-toolkit",
"cosmic-config 0.1.0",
"cosmic-panel-config",
"cosmic-theme 0.1.0",
"css-color",
"derive_setters",
"fraction",
"freedesktop-icons",
"iced 0.12.0",
"iced_core 0.12.0",
"iced_futures 0.12.0",
"iced_renderer 0.12.0",
"iced_runtime 0.12.0",
"iced_sctk 0.1.0",
"iced_style 0.12.0",
"iced_tiny_skia 0.12.0",
"iced_widget 0.12.0",
"lazy_static",
"palette",
"ron",
"slotmap",
"taffy",
"thiserror",
"tokio",
"tracing",
"unicode-segmentation",
"url",
"zbus",
]
[[package]] [[package]]
name = "libcosmic" name = "libcosmic"
version = "0.1.0" version = "0.1.0"
@ -3054,23 +3349,23 @@ dependencies = [
"apply", "apply",
"ashpd", "ashpd",
"cosmic-client-toolkit", "cosmic-client-toolkit",
"cosmic-config", "cosmic-config 0.1.0 (git+https://github.com/pop-os/libcosmic)",
"cosmic-panel-config", "cosmic-panel-config",
"cosmic-settings-daemon", "cosmic-settings-daemon",
"cosmic-theme", "cosmic-theme 0.1.0 (git+https://github.com/pop-os/libcosmic)",
"css-color", "css-color",
"derive_setters", "derive_setters",
"fraction", "fraction",
"freedesktop-icons", "freedesktop-icons",
"iced", "iced 0.12.0 (git+https://github.com/pop-os/libcosmic)",
"iced_core", "iced_core 0.12.0 (git+https://github.com/pop-os/libcosmic)",
"iced_futures", "iced_futures 0.12.0 (git+https://github.com/pop-os/libcosmic)",
"iced_renderer", "iced_renderer 0.12.0 (git+https://github.com/pop-os/libcosmic)",
"iced_runtime", "iced_runtime 0.12.0 (git+https://github.com/pop-os/libcosmic)",
"iced_sctk", "iced_sctk 0.1.0 (git+https://github.com/pop-os/libcosmic)",
"iced_style", "iced_style 0.12.0 (git+https://github.com/pop-os/libcosmic)",
"iced_tiny_skia", "iced_tiny_skia 0.12.0 (git+https://github.com/pop-os/libcosmic)",
"iced_widget", "iced_widget 0.12.0 (git+https://github.com/pop-os/libcosmic)",
"lazy_static", "lazy_static",
"nix 0.27.1", "nix 0.27.1",
"palette", "palette",
@ -4266,9 +4561,26 @@ dependencies = [
"pico-args", "pico-args",
"png", "png",
"rgb", "rgb",
"svgtypes", "svgtypes 0.12.0",
"tiny-skia", "tiny-skia",
"usvg", "usvg 0.36.0",
]
[[package]]
name = "resvg"
version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cadccb3d99a9efb8e5e00c16fbb732cbe400db2ec7fc004697ee7d97d86cf1f4"
dependencies = [
"gif",
"jpeg-decoder",
"log",
"pico-args",
"png",
"rgb",
"svgtypes 0.13.0",
"tiny-skia",
"usvg 0.37.0",
] ]
[[package]] [[package]]
@ -4301,6 +4613,12 @@ dependencies = [
"xmlparser", "xmlparser",
] ]
[[package]]
name = "roxmltree"
version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f"
[[package]] [[package]]
name = "rust-embed" name = "rust-embed"
version = "6.8.1" version = "6.8.1"
@ -4457,6 +4775,23 @@ dependencies = [
"unicode-script", "unicode-script",
] ]
[[package]]
name = "rustybuzz"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c"
dependencies = [
"bitflags 2.4.1",
"bytemuck",
"libm",
"smallvec",
"ttf-parser 0.20.0",
"unicode-bidi-mirroring",
"unicode-ccc",
"unicode-properties",
"unicode-script",
]
[[package]] [[package]]
name = "ryu" name = "ryu"
version = "1.0.16" version = "1.0.16"
@ -4834,6 +5169,16 @@ dependencies = [
"siphasher", "siphasher",
] ]
[[package]]
name = "svgtypes"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70"
dependencies = [
"kurbo",
"siphasher",
]
[[package]] [[package]]
name = "swash" name = "swash"
version = "0.1.8" version = "0.1.8"
@ -5392,9 +5737,24 @@ dependencies = [
"base64", "base64",
"log", "log",
"pico-args", "pico-args",
"usvg-parser", "usvg-parser 0.36.0",
"usvg-text-layout", "usvg-text-layout 0.36.0",
"usvg-tree", "usvg-tree 0.36.0",
"xmlwriter",
]
[[package]]
name = "usvg"
version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38b0a51b72ab80ca511d126b77feeeb4fb1e972764653e61feac30adc161a756"
dependencies = [
"base64",
"log",
"pico-args",
"usvg-parser 0.37.0",
"usvg-text-layout 0.37.0",
"usvg-tree 0.37.0",
"xmlwriter", "xmlwriter",
] ]
@ -5409,11 +5769,29 @@ dependencies = [
"imagesize", "imagesize",
"kurbo", "kurbo",
"log", "log",
"roxmltree", "roxmltree 0.18.1",
"simplecss", "simplecss",
"siphasher", "siphasher",
"svgtypes", "svgtypes 0.12.0",
"usvg-tree", "usvg-tree 0.36.0",
]
[[package]]
name = "usvg-parser"
version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9bd4e3c291f45d152929a31f0f6c819245e2921bfd01e7bd91201a9af39a2bdc"
dependencies = [
"data-url",
"flate2",
"imagesize",
"kurbo",
"log",
"roxmltree 0.19.0",
"simplecss",
"siphasher",
"svgtypes 0.13.0",
"usvg-tree 0.37.0",
] ]
[[package]] [[package]]
@ -5422,14 +5800,30 @@ version = "0.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4d2374378cb7a3fb8f33894e0fdb8625e1bbc4f25312db8d91f862130b541593" checksum = "4d2374378cb7a3fb8f33894e0fdb8625e1bbc4f25312db8d91f862130b541593"
dependencies = [ dependencies = [
"fontdb", "fontdb 0.15.0",
"kurbo", "kurbo",
"log", "log",
"rustybuzz 0.10.0", "rustybuzz 0.10.0",
"unicode-bidi", "unicode-bidi",
"unicode-script", "unicode-script",
"unicode-vo", "unicode-vo",
"usvg-tree", "usvg-tree 0.36.0",
]
[[package]]
name = "usvg-text-layout"
version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d383a3965de199d7f96d4e11a44dd859f46e86de7f3dca9a39bf82605da0a37c"
dependencies = [
"fontdb 0.16.0",
"kurbo",
"log",
"rustybuzz 0.12.1",
"unicode-bidi",
"unicode-script",
"unicode-vo",
"usvg-tree 0.37.0",
] ]
[[package]] [[package]]
@ -5440,7 +5834,19 @@ checksum = "6cacb0c5edeaf3e80e5afcf5b0d4004cc1d36318befc9a7c6606507e5d0f4062"
dependencies = [ dependencies = [
"rctree", "rctree",
"strict-num", "strict-num",
"svgtypes", "svgtypes 0.12.0",
"tiny-skia-path",
]
[[package]]
name = "usvg-tree"
version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ee3d202ebdb97a6215604b8f5b4d6ef9024efd623cf2e373a6416ba976ec7d3"
dependencies = [
"rctree",
"strict-num",
"svgtypes 0.13.0",
"tiny-skia-path", "tiny-skia-path",
] ]

4
cosmic-app-list/Cargo.toml
View file

@ -7,8 +7,8 @@ edition = "2021"
[dependencies] [dependencies]
cctk.workspace = true cctk.workspace = true
cosmic-protocols.workspace = true cosmic-protocols.workspace = true
libcosmic.workspace = true # libcosmic.workspace = true
# libcosmic = { path = "../../libcosmic", default-features = false, features = ["wayland", "tokio"] } libcosmic = { path = "../../libcosmic", default-features = false, features = ["wayland", "tokio", "applet"] }
ron = "0.8" ron = "0.8"
futures = "0.3" futures = "0.3"
futures-util = "0.3" futures-util = "0.3"

90
cosmic-app-list/src/app.rs
View file

@ -24,6 +24,7 @@ use cosmic::iced::widget::vertical_space;
use cosmic::iced::widget::{column, dnd_source, mouse_area, row, Column, Row}; use cosmic::iced::widget::{column, dnd_source, mouse_area, row, Column, Row};
use cosmic::iced::Color; use cosmic::iced::Color;
use cosmic::iced::{window, Subscription}; use cosmic::iced::{window, Subscription};
use cosmic::iced_core::window::Icon;
use cosmic::iced_runtime::core::alignment::Horizontal; use cosmic::iced_runtime::core::alignment::Horizontal;
use cosmic::iced_runtime::core::event; use cosmic::iced_runtime::core::event;
use cosmic::iced_sctk::commands::data_device::accept_mime_type; use cosmic::iced_sctk::commands::data_device::accept_mime_type;
@ -115,8 +116,9 @@ impl DockItem {
.. ..
} = self; } = self;
let cosmic_icon = cosmic::widget::icon::from_path(PathBuf::from(&desktop_info.icon)) let cosmic_icon = desktop_info
.icon() .icon
.as_cosmic_icon()
.size(applet.suggested_size().0); .size(applet.suggested_size().0);
let dot_radius = 2; let dot_radius = 2;
@ -244,32 +246,46 @@ enum Message {
ConfigUpdated(AppListConfig), ConfigUpdated(AppListConfig),
} }
#[derive(Debug, Clone, PartialEq, Eq)]
pub(crate) enum IconSource {
Name(String),
Path(PathBuf),
}
impl IconSource {
fn from_unknown(icon: &str) -> Self {
let icon_path = Path::new(icon);
if icon_path.is_absolute() && icon_path.exists() {
Self::Path(icon_path.into())
} else {
Self::Name(icon.into())
}
}
fn as_cosmic_icon(&self) -> cosmic::widget::icon::Icon {
match self {
Self::Name(name) => cosmic::widget::icon::from_name(name.as_str()).into(),
Self::Path(path) => cosmic::widget::icon(cosmic::widget::icon::from_path(path.clone())),
}
}
}
impl Default for IconSource {
fn default() -> Self {
Self::Name("application-default".to_string())
}
}
#[derive(Debug, Clone, Default)] #[derive(Debug, Clone, Default)]
struct DesktopInfo { struct DesktopInfo {
id: String, id: String,
wm_class: Option<String>, wm_class: Option<String>,
icon: PathBuf, icon: IconSource,
exec: String, exec: String,
name: String, name: String,
path: PathBuf, path: PathBuf,
} }
fn default_app_icon() -> PathBuf {
freedesktop_icons::lookup("application-default")
.with_theme("Cosmic")
.force_svg()
.with_cache()
.find()
.or_else(|| {
freedesktop_icons::lookup("application-x-executable")
.with_theme("default")
.with_size(128)
.with_cache()
.find()
})
.unwrap_or_default()
}
fn desktop_info_for_app_ids(mut app_ids: Vec<String>) -> Vec<DesktopInfo> { fn desktop_info_for_app_ids(mut app_ids: Vec<String>) -> Vec<DesktopInfo> {
let app_ids_clone = app_ids.clone(); let app_ids_clone = app_ids.clone();
let mut ret = freedesktop_desktop_entry::Iter::new(freedesktop_desktop_entry::default_paths()) let mut ret = freedesktop_desktop_entry::Iter::new(freedesktop_desktop_entry::default_paths())
@ -280,16 +296,12 @@ fn desktop_info_for_app_ids(mut app_ids: Vec<String>) -> Vec<DesktopInfo> {
s == de.appid || s.eq(&de.startup_wm_class().unwrap_or_default()) s == de.appid || s.eq(&de.startup_wm_class().unwrap_or_default())
}) { }) {
// check if absolute path exists and otherwise treat it as a name // check if absolute path exists and otherwise treat it as a name
let icon_path = Path::new(de.icon().unwrap_or(de.appid)); let icon = de.icon().unwrap_or(de.appid);
let icon_path = Path::new(icon);
let icon = if icon_path.is_absolute() && icon_path.exists() { let icon = if icon_path.is_absolute() && icon_path.exists() {
icon_path.into() IconSource::Path(icon_path.into())
} else { } else {
freedesktop_icons::lookup(de.icon().unwrap_or(de.appid)) IconSource::Name(icon.into())
.with_size(128)
.with_theme("Cosmic")
.with_cache()
.find()
.unwrap_or_else(default_app_icon)
}; };
app_ids.remove(i); app_ids.remove(i);
@ -313,7 +325,7 @@ fn desktop_info_for_app_ids(mut app_ids: Vec<String>) -> Vec<DesktopInfo> {
.into_iter() .into_iter()
.map(|id| DesktopInfo { .map(|id| DesktopInfo {
id, id,
icon: default_app_icon(), icon: IconSource::default(),
..Default::default() ..Default::default()
}) })
.collect_vec(), .collect_vec(),
@ -630,21 +642,16 @@ impl cosmic::Application for CosmicAppList {
Message::DndData(file_path) => { Message::DndData(file_path) => {
if let Some(DndOffer { dock_item, .. }) = self.dnd_offer.as_mut() { if let Some(DndOffer { dock_item, .. }) = self.dnd_offer.as_mut() {
if let Some(di) = std::fs::read_to_string(&file_path).ok().and_then(|input| { if let Some(di) = std::fs::read_to_string(&file_path).ok().and_then(|input| {
DesktopEntry::decode(&file_path, &input).ok().map(|de| { DesktopEntry::decode(&file_path, &input)
let icon = freedesktop_icons::lookup(de.icon().unwrap_or(de.appid)) .ok()
.with_size(128) .map(|de| DesktopInfo {
.with_cache()
.find()
.unwrap_or_else(default_app_icon);
DesktopInfo {
id: de.id().to_string(), id: de.id().to_string(),
wm_class: de.startup_wm_class().map(ToString::to_string), wm_class: de.startup_wm_class().map(ToString::to_string),
icon, icon: IconSource::from_unknown(de.icon().unwrap_or(de.appid)),
exec: de.exec().unwrap_or_default().to_string(), exec: de.exec().unwrap_or_default().to_string(),
name: de.name(None).unwrap_or_default().to_string(), name: de.name(None).unwrap_or_default().to_string(),
path: file_path.clone(), path: file_path.clone(),
} })
})
}) { }) {
self.item_ctr += 1; self.item_ctr += 1;
*dock_item = Some(DockItem::new(self.item_ctr, Vec::new(), di)); *dock_item = Some(DockItem::new(self.item_ctr, Vec::new(), di));
@ -749,7 +756,7 @@ impl cosmic::Application for CosmicAppList {
.unwrap_or_else(|| DesktopInfo { .unwrap_or_else(|| DesktopInfo {
id: info.app_id.clone(), id: info.app_id.clone(),
wm_class: None, wm_class: None,
icon: default_app_icon(), icon: IconSource::default(),
exec: String::new(), exec: String::new(),
name: info.app_id.clone(), name: info.app_id.clone(),
path: PathBuf::new(), path: PathBuf::new(),
@ -1031,8 +1038,9 @@ impl cosmic::Application for CosmicAppList {
fn view_window(&self, id: window::Id) -> Element<Message> { fn view_window(&self, id: window::Id) -> Element<Message> {
if let Some((_, item, _)) = self.dnd_source.as_ref().filter(|s| s.0 == id) { if let Some((_, item, _)) = self.dnd_source.as_ref().filter(|s| s.0 == id) {
cosmic::widget::icon::from_path(PathBuf::from(&item.desktop_info.icon)) item.desktop_info
.icon() .icon
.as_cosmic_icon()
.size(self.core.applet.suggested_size().0) .size(self.core.applet.suggested_size().0)
.into() .into()
} else if let Some(( } else if let Some((