diff --git a/Cargo.lock b/Cargo.lock index d5450e13..5335f53d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1167,7 +1167,7 @@ dependencies = [ [[package]] name = "clipboard_macos" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13-2#6b9faab87bea9cebec6ae036906fd67fed254f5f" dependencies = [ "objc", "objc-foundation", @@ -1177,7 +1177,7 @@ dependencies = [ [[package]] name = "clipboard_wayland" version = "0.2.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13-2#6b9faab87bea9cebec6ae036906fd67fed254f5f" dependencies = [ "dnd", "mime 0.1.0", @@ -1187,7 +1187,7 @@ dependencies = [ [[package]] name = "clipboard_x11" version = "0.4.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13-2#6b9faab87bea9cebec6ae036906fd67fed254f5f" dependencies = [ "thiserror 1.0.69", "x11rb", @@ -1432,7 +1432,7 @@ dependencies = [ "colorgrad", "cosmic-config", "derive_setters", - "image 0.25.5", + "image", "ron", "serde", "tracing", @@ -1463,7 +1463,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" +source = "git+https://github.com/pop-os/libcosmic#4a97b3ddd2f972cb8fdc6b7c0482596aa31a8fb8" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1485,7 +1485,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" +source = "git+https://github.com/pop-os/libcosmic#4a97b3ddd2f972cb8fdc6b7c0482596aa31a8fb8" dependencies = [ "quote", "syn 1.0.109", @@ -1636,7 +1636,7 @@ dependencies = [ "i18n-embed", "i18n-embed-fl", "icu", - "image 0.25.5", + "image", "indexmap 2.7.0", "itertools 0.13.0", "itoa", @@ -1752,7 +1752,7 @@ dependencies = [ "fast_image_resize", "futures-lite 2.5.0", "futures-util", - "image 0.25.5", + "image", "infer", "jxl-oxide", "tokio", @@ -1784,7 +1784,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" +source = "git+https://github.com/pop-os/libcosmic#4a97b3ddd2f972cb8fdc6b7c0482596aa31a8fb8" dependencies = [ "almost", "cosmic-config", @@ -2144,7 +2144,7 @@ dependencies = [ [[package]] name = "dnd" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13-2#6b9faab87bea9cebec6ae036906fd67fed254f5f" dependencies = [ "bitflags 2.6.0", "mime 0.1.0", @@ -2258,7 +2258,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2363,7 +2363,7 @@ dependencies = [ "bytemuck", "cfg-if", "document-features", - "image 0.25.5", + "image", "num-traits", "thiserror 1.0.69", ] @@ -3137,7 +3137,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" +source = "git+https://github.com/pop-os/libcosmic#4a97b3ddd2f972cb8fdc6b7c0482596aa31a8fb8" dependencies = [ "dnd", "iced_accessibility", @@ -3146,7 +3146,7 @@ dependencies = [ "iced_renderer", "iced_widget", "iced_winit", - "image 0.24.9", + "image", "mime 0.1.0", "thiserror 1.0.69", "window_clipboard", @@ -3155,7 +3155,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" +source = "git+https://github.com/pop-os/libcosmic#4a97b3ddd2f972cb8fdc6b7c0482596aa31a8fb8" dependencies = [ "accesskit", "accesskit_winit", @@ -3164,7 +3164,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" +source = "git+https://github.com/pop-os/libcosmic#4a97b3ddd2f972cb8fdc6b7c0482596aa31a8fb8" dependencies = [ "bitflags 2.6.0", "bytes", @@ -3189,7 +3189,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" +source = "git+https://github.com/pop-os/libcosmic#4a97b3ddd2f972cb8fdc6b7c0482596aa31a8fb8" dependencies = [ "futures", "iced_core", @@ -3215,7 +3215,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" +source = "git+https://github.com/pop-os/libcosmic#4a97b3ddd2f972cb8fdc6b7c0482596aa31a8fb8" dependencies = [ "bitflags 2.6.0", "bytemuck", @@ -3223,7 +3223,7 @@ dependencies = [ "half", "iced_core", "iced_futures", - "image 0.24.9", + "image", "kamadak-exif", "log", "lyon_path", @@ -3237,7 +3237,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" +source = "git+https://github.com/pop-os/libcosmic#4a97b3ddd2f972cb8fdc6b7c0482596aa31a8fb8" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -3249,7 +3249,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" +source = "git+https://github.com/pop-os/libcosmic#4a97b3ddd2f972cb8fdc6b7c0482596aa31a8fb8" dependencies = [ "bytes", "cosmic-client-toolkit", @@ -3265,7 +3265,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" +source = "git+https://github.com/pop-os/libcosmic#4a97b3ddd2f972cb8fdc6b7c0482596aa31a8fb8" dependencies = [ "bytemuck", "cosmic-text", @@ -3281,7 +3281,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" +source = "git+https://github.com/pop-os/libcosmic#4a97b3ddd2f972cb8fdc6b7c0482596aa31a8fb8" dependencies = [ "as-raw-xcb-connection", "bitflags 2.6.0", @@ -3312,7 +3312,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" +source = "git+https://github.com/pop-os/libcosmic#4a97b3ddd2f972cb8fdc6b7c0482596aa31a8fb8" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -3331,7 +3331,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" +source = "git+https://github.com/pop-os/libcosmic#4a97b3ddd2f972cb8fdc6b7c0482596aa31a8fb8" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -3342,10 +3342,12 @@ dependencies = [ "log", "raw-window-handle", "rustc-hash 2.1.0", + "rustix 0.38.42", "thiserror 1.0.69", "tracing", "wasm-bindgen-futures", "wayland-backend", + "wayland-client", "wayland-protocols", "web-sys", "winapi", @@ -3777,24 +3779,6 @@ dependencies = [ "icu_properties", ] -[[package]] -name = "image" -version = "0.24.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "exr", - "gif", - "jpeg-decoder", - "num-traits", - "png", - "qoi", - "tiff", -] - [[package]] name = "image" version = "0.25.5" @@ -4056,9 +4040,6 @@ name = "jpeg-decoder" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" -dependencies = [ - "rayon", -] [[package]] name = "js-sys" @@ -4324,7 +4305,7 @@ checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" +source = "git+https://github.com/pop-os/libcosmic#4a97b3ddd2f972cb8fdc6b7c0482596aa31a8fb8" dependencies = [ "apply", "ashpd 0.9.2", @@ -4346,6 +4327,7 @@ dependencies = [ "iced_wgpu", "iced_widget", "iced_winit", + "image", "lazy_static", "palette", "rfd", @@ -4721,7 +4703,7 @@ dependencies = [ [[package]] name = "mime" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13-2#6b9faab87bea9cebec6ae036906fd67fed254f5f" dependencies = [ "smithay-clipboard", ] @@ -6240,7 +6222,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.4.14", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6908,7 +6890,7 @@ dependencies = [ "fastrand 2.3.0", "once_cell", "rustix 0.38.42", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -7902,7 +7884,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -7914,7 +7896,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "window_clipboard" version = "0.4.1" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13-2#6b9faab87bea9cebec6ae036906fd67fed254f5f" dependencies = [ "clipboard-win", "clipboard_macos", diff --git a/Cargo.toml b/Cargo.toml index 085481b8..5a8b74e1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,6 +42,7 @@ inherits = "release" debug = true [profile.release] +opt-level = "s" lto = "thin" # [patch.'https://github.com/smithay/client-toolkit/'] diff --git a/cosmic-settings/Cargo.toml b/cosmic-settings/Cargo.toml index 172dadb2..a02f14e4 100644 --- a/cosmic-settings/Cargo.toml +++ b/cosmic-settings/Cargo.toml @@ -37,7 +37,7 @@ futures = "0.3.30" hostname-validator = "1.1.1" hostname1-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } i18n-embed-fl = "0.9.1" -image = "0.25" +image = { version = "0.25", default-features = false, features = ["jpeg", "png", "rayon", "webp", "hdr"] } indexmap = "2.5.0" itertools = "0.13.0" itoa = "1.0.11" diff --git a/cosmic-settings/src/pages/desktop/panel/applets_inner.rs b/cosmic-settings/src/pages/desktop/panel/applets_inner.rs index 165f85df..085d6f44 100644 --- a/cosmic-settings/src/pages/desktop/panel/applets_inner.rs +++ b/cosmic-settings/src/pages/desktop/panel/applets_inner.rs @@ -7,6 +7,7 @@ use cosmic::iced::id::Internal; use cosmic::iced::Vector; use cosmic::iced_core; +use cosmic::iced_core::clipboard::IconSurface; use cosmic::widget::{button, column, container, icon, list_column, row, text, text_input, Column}; use cosmic::{ @@ -1024,16 +1025,16 @@ where iced_core::clipboard::start_dnd::< cosmic::Theme, cosmic::Renderer, - (), >( clipboard, false, Some(iced_core::clipboard::DndSource::Widget( self.id.clone(), )), - Some(( + Some(IconSurface::new( dnd_icon(applet.clone(), &layout).into(), iced_core::widget::tree::State::new(state.clone()), + iced_core::Vector::new(0.0, 0.0), )), Box::new(AppletString(p.clone())), DndAction::Move,