diff --git a/Cargo.lock b/Cargo.lock index 8fa9be7..5786fd8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -657,12 +657,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "const_panic" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b" - [[package]] name = "core-foundation" version = "0.9.3" @@ -731,7 +725,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#a8a2e4ad26fad231db232d3ac2823011e5d31d04" +source = "git+https://github.com/pop-os/libcosmic#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "atomicwrites", "calloop", @@ -746,7 +740,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#a8a2e4ad26fad231db232d3ac2823011e5d31d04" +source = "git+https://github.com/pop-os/libcosmic#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "quote", "syn 1.0.109", @@ -874,7 +868,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#a8a2e4ad26fad231db232d3ac2823011e5d31d04" +source = "git+https://github.com/pop-os/libcosmic#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "anyhow", "cosmic-config", @@ -888,9 +882,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" +checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c" dependencies = [ "libc", ] @@ -1258,38 +1252,6 @@ version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" -[[package]] -name = "encase" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a516181e9a36e8982cb37933c5e7dba638c42938cacde46ee4e5b4156f881b9" -dependencies = [ - "const_panic", - "encase_derive", - "glam", - "thiserror", -] - -[[package]] -name = "encase_derive" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5b802412eea315f29f2bb2da3a5963cd6121f56eaa06aebcdc0c54eea578f22" -dependencies = [ - "encase_derive_impl", -] - -[[package]] -name = "encase_derive_impl" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f2f4de457d974f548d2c2a16f709ebd81013579e543bd1a9b19ced88132c2cf" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "enum-repr" version = "0.2.6" @@ -1427,6 +1389,12 @@ dependencies = [ "once_cell", ] +[[package]] +name = "fast-srgb8" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" + [[package]] name = "fastrand" version = "1.9.0" @@ -1871,15 +1839,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" [[package]] name = "glam" -version = "0.21.3" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518faa5064866338b013ff9b2350dc318e14cc4fcd6cb8206d7e7c9886c98815" +checksum = "ad83ab008a4fa3b31dfa713dd41b5a9bdea1e94e4cf1e2fc274ffbd49b0271d3" [[package]] name = "glow" @@ -1896,7 +1864,7 @@ dependencies = [ [[package]] name = "glyphon" version = "0.2.0" -source = "git+https://github.com/hecrj/glyphon.git?rev=f145067d292082abdd1f2b2481812d4a52c394ec#f145067d292082abdd1f2b2481812d4a52c394ec" +source = "git+https://github.com/hecrj/glyphon.git?rev=26f92369da3704988e3e27f0b35e705c6b2de203#26f92369da3704988e3e27f0b35e705c6b2de203" dependencies = [ "cosmic-text", "etagere", @@ -2123,7 +2091,7 @@ dependencies = [ [[package]] name = "iced" version = "0.9.0" -source = "git+https://github.com/pop-os/libcosmic#a8a2e4ad26fad231db232d3ac2823011e5d31d04" +source = "git+https://github.com/pop-os/libcosmic#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "iced_accessibility", "iced_core", @@ -2139,7 +2107,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#a8a2e4ad26fad231db232d3ac2823011e5d31d04" +source = "git+https://github.com/pop-os/libcosmic#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "accesskit", "accesskit_unix", @@ -2148,7 +2116,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.9.0" -source = "git+https://github.com/pop-os/libcosmic#a8a2e4ad26fad231db232d3ac2823011e5d31d04" +source = "git+https://github.com/pop-os/libcosmic#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "bitflags 1.3.2", "iced_accessibility", @@ -2163,7 +2131,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.6.0" -source = "git+https://github.com/pop-os/libcosmic#a8a2e4ad26fad231db232d3ac2823011e5d31d04" +source = "git+https://github.com/pop-os/libcosmic#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "futures", "iced_core", @@ -2176,7 +2144,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.8.0" -source = "git+https://github.com/pop-os/libcosmic#a8a2e4ad26fad231db232d3ac2823011e5d31d04" +source = "git+https://github.com/pop-os/libcosmic#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2193,7 +2161,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#a8a2e4ad26fad231db232d3ac2823011e5d31d04" +source = "git+https://github.com/pop-os/libcosmic#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2205,7 +2173,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#a8a2e4ad26fad231db232d3ac2823011e5d31d04" +source = "git+https://github.com/pop-os/libcosmic#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "iced_accessibility", "iced_core", @@ -2217,7 +2185,7 @@ dependencies = [ [[package]] name = "iced_sctk" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#a8a2e4ad26fad231db232d3ac2823011e5d31d04" +source = "git+https://github.com/pop-os/libcosmic#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "enum-repr", "float-cmp", @@ -2227,18 +2195,19 @@ dependencies = [ "iced_runtime", "iced_style", "itertools", - "log", "raw-window-handle 0.5.2", "smithay-client-toolkit 0.17.0", "smithay-clipboard", "thiserror", + "tracing", "wayland-backend", + "wayland-protocols 0.30.0", ] [[package]] name = "iced_style" version = "0.8.0" -source = "git+https://github.com/pop-os/libcosmic#a8a2e4ad26fad231db232d3ac2823011e5d31d04" +source = "git+https://github.com/pop-os/libcosmic#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "iced_core", "once_cell", @@ -2248,7 +2217,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#a8a2e4ad26fad231db232d3ac2823011e5d31d04" +source = "git+https://github.com/pop-os/libcosmic#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "bytemuck", "cosmic-text", @@ -2266,11 +2235,10 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.10.0" -source = "git+https://github.com/pop-os/libcosmic#a8a2e4ad26fad231db232d3ac2823011e5d31d04" +source = "git+https://github.com/pop-os/libcosmic#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "bitflags 1.3.2", "bytemuck", - "encase", "futures", "glam", "glyphon", @@ -2288,7 +2256,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#a8a2e4ad26fad231db232d3ac2823011e5d31d04" +source = "git+https://github.com/pop-os/libcosmic#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "iced_renderer", "iced_runtime", @@ -2303,12 +2271,13 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.9.1" -source = "git+https://github.com/pop-os/libcosmic#a8a2e4ad26fad231db232d3ac2823011e5d31d04" +source = "git+https://github.com/pop-os/libcosmic#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "iced_graphics", "iced_runtime", "iced_style", "log", + "raw-window-handle 0.5.2", "thiserror", "web-sys", "winapi", @@ -2617,7 +2586,7 @@ checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#a8a2e4ad26fad231db232d3ac2823011e5d31d04" +source = "git+https://github.com/pop-os/libcosmic#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "apply", "cosmic-config", @@ -2632,6 +2601,7 @@ dependencies = [ "iced_runtime", "iced_sctk", "iced_style", + "iced_tiny_skia", "iced_widget", "lazy_static", "palette", @@ -3268,12 +3238,12 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "palette" -version = "0.6.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f9cd68f7112581033f157e56c77ac4a5538ec5836a2e39284e65bd7d7275e49" +checksum = "e1641aee47803391405d0a1250e837d2336fdddd18b27f3ddb8c1d80ce8d7f43" dependencies = [ "approx", - "num-traits", + "fast-srgb8", "palette_derive", "phf", "serde", @@ -3281,14 +3251,13 @@ dependencies = [ [[package]] name = "palette_derive" -version = "0.6.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05eedf46a8e7c27f74af0c9cfcdb004ceca158cb1b918c6f68f8d7a549b3e427" +checksum = "3c02bfa6b3ba8af5434fa0531bf5701f750d983d4260acd6867faca51cdc4484" dependencies = [ - "find-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.18", ] [[package]] @@ -3590,16 +3559,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b9283c6b06096b47afc7109834fdedab891175bb5241ee5d4f7d2546549f263" -[[package]] -name = "raw-window-handle" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28f55143d0548dad60bb4fbdc835a3d7ac6acc3324506450c5fdd6e42903a76" -dependencies = [ - "libc", - "raw-window-handle 0.4.3", -] - [[package]] name = "raw-window-handle" version = "0.4.3" @@ -3985,9 +3944,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", @@ -5270,15 +5229,15 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "window_clipboard" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "015dd4474dc6aa96fe19aae3a24587a088bd90331dba5a5cc60fb3a180234c4d" +checksum = "63287c9c4396ccf5346d035a9b0fcaead9e18377637f5eaa78b7ac65c873ff7d" dependencies = [ "clipboard-win", "clipboard_macos", "clipboard_wayland", "clipboard_x11", - "raw-window-handle 0.3.4", + "raw-window-handle 0.5.2", "thiserror", ] diff --git a/app/src/pages/desktop/panel/applets.rs b/app/src/pages/desktop/panel/applets.rs index 7ce505d..46b955d 100644 --- a/app/src/pages/desktop/panel/applets.rs +++ b/app/src/pages/desktop/panel/applets.rs @@ -733,7 +733,7 @@ impl<'a, Message: 'static + Clone> AppletReorderList<'a, Message> { style.border_radius = 8.0.into(); style.border_color = theme.cosmic().bg_divider().into(); style.border_width = 2.0; - style.background = Color::TRANSPARENT.into(); + style.background = Some(Color::TRANSPARENT.into()); style }))) .into() @@ -912,7 +912,7 @@ where tree: &mut Tree, event: event::Event, layout: layout::Layout<'_>, - cursor_position: Point, + cursor_position: mouse::Cursor, renderer: &cosmic::Renderer, clipboard: &mut dyn Clipboard, shell: &mut Shell<'_, Message>, @@ -940,11 +940,11 @@ where match &event { event::Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) | event::Event::Touch(touch::Event::FingerPressed { .. }) - if layout.bounds().contains(cursor_position) => + if cursor_position.is_over(layout.bounds()) => { ret = event::Status::Captured; - DraggingState::Pressed(cursor_position) + DraggingState::Pressed(cursor_position.position().unwrap_or_default()) } _ => DraggingState::None, } @@ -972,8 +972,9 @@ where match &event { event::Event::Mouse(mouse::Event::CursorMoved { .. }) | event::Event::Touch(touch::Event::FingerMoved { .. }) => { - let d_y = cursor_position.y - start.y; - let d_x = cursor_position.x - start.x; + let pos = cursor_position.position().unwrap_or_default(); + let d_y = pos.y - start.y; + let d_x = pos.x - start.x; let distance_squared = d_y * d_y + d_x * d_x; if distance_squared > DRAG_START_DISTANCE_SQUARED { @@ -1366,7 +1367,7 @@ where theme: &cosmic::Theme, style: &renderer::Style, layout: layout::Layout<'_>, - cursor_position: Point, + cursor_position: mouse::Cursor, viewport: &Rectangle, ) { self.inner.as_widget().draw( @@ -1397,7 +1398,7 @@ where &self, state: &Tree, layout: layout::Layout<'_>, - cursor_position: Point, + cursor_position: mouse::Cursor, viewport: &Rectangle, renderer: &cosmic::Renderer, ) -> mouse::Interaction { @@ -1412,7 +1413,7 @@ where let state = state.state.downcast_ref::(); if matches!(state.dragging_state, DraggingState::Dragging(_)) { mouse::Interaction::Grabbing - } else if layout.bounds().contains(cursor_position) { + } else if cursor_position.is_over(layout.bounds()) { mouse::Interaction::Grab } else { mouse::Interaction::default() diff --git a/app/src/theme.rs b/app/src/theme.rs index 1b93ffc..bc75e61 100644 --- a/app/src/theme.rs +++ b/app/src/theme.rs @@ -1,7 +1,7 @@ // Copyright 2023 System76 // SPDX-License-Identifier: GPL-3.0-only -use cosmic::{iced_widget::core::renderer::BorderRadius, theme}; +use cosmic::{iced_widget::core::BorderRadius, theme}; #[must_use] pub fn display_container() -> cosmic::theme::Container {