diff --git a/.gitmodules b/.gitmodules index c29e02fd..3e7e97bb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "client-gui"] path = client-gui url = git@gitlab.com:filipriec/komp_ac_client_gui.git +[submodule "shadcn-slint"] + path = shadcn-slint + url = git@gitlab.com:filipriec/shadcn-slint.git diff --git a/Cargo.lock b/Cargo.lock index a251adf1..ac74ead9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3643,6 +3643,26 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "femtovg" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43d05da42e81724c16d34a150fb7fda53d3f786e5a94673ee526ff8602f0f6a" +dependencies = [ + "bitflags 2.13.0", + "bytemuck", + "fnv", + "glow", + "imgref", + "itertools 0.14.0", + "log", + "rgb", + "slotmap", + "swash", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "ff" version = "0.13.1" @@ -4108,6 +4128,28 @@ dependencies = [ "slab", ] +[[package]] +name = "gbm" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce852e998d3ca5e4a97014fb31c940dc5ef344ec7d364984525fd11e8a547e6a" +dependencies = [ + "bitflags 2.13.0", + "drm", + "drm-fourcc", + "gbm-sys", + "libc", +] + +[[package]] +name = "gbm-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c13a5f2acc785d8fb6bf6b7ab6bfb0ef5dad4f4d97e8e70bb8e470722312f76f" +dependencies = [ + "libc", +] + [[package]] name = "generational-arena" version = "0.2.9" @@ -4779,12 +4821,16 @@ dependencies = [ "calloop 0.14.4", "cfg_aliases", "drm", + "gbm", + "glutin", "i-slint-common", "i-slint-core", + "i-slint-renderer-femtovg", "i-slint-renderer-software", "input", "memmap2", "nix 0.31.3", + "raw-window-handle", "xkbcommon", ] @@ -4802,6 +4848,7 @@ dependencies = [ "i-slint-common", "i-slint-core", "i-slint-core-macros", + "i-slint-renderer-femtovg", ] [[package]] @@ -4847,6 +4894,7 @@ dependencies = [ "i-slint-common", "i-slint-core", "i-slint-core-macros", + "i-slint-renderer-femtovg", "i-slint-renderer-skia", "i-slint-renderer-software", "imgref", @@ -4985,6 +5033,28 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "i-slint-renderer-femtovg" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78d0d99a18d66738b684758fe8460743a0aa0f64a96e05940942231a340085b1" +dependencies = [ + "cfg-if", + "const-field-offset", + "derive_more", + "femtovg", + "glow", + "i-slint-common", + "i-slint-core", + "i-slint-core-macros", + "imgref", + "lyon_path", + "pin-weak", + "rgb", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "i-slint-renderer-skia" version = "1.17.1" @@ -9882,6 +9952,7 @@ dependencies = [ "i-slint-common", "i-slint-core", "i-slint-core-macros", + "i-slint-renderer-femtovg", "i-slint-renderer-software", "num-traits", "once_cell", diff --git a/client-gui b/client-gui index cd5824fa..926fe113 160000 --- a/client-gui +++ b/client-gui @@ -1 +1 @@ -Subproject commit cd5824fae37a220a5a1c2dad725e77667c324301 +Subproject commit 926fe113e5781683f57a93289fd47463646cdd18 diff --git a/shadcn-slint b/shadcn-slint new file mode 160000 index 00000000..7914f94b --- /dev/null +++ b/shadcn-slint @@ -0,0 +1 @@ +Subproject commit 7914f94b7d8f95ed7f6a47fbd1eb6c9baf0ac2a0