diff --git a/Cargo.lock b/Cargo.lock index 2decf0f1..1a265c94 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -778,9 +778,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.59" +version = "1.2.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7a4d3ec6524d28a329fc53654bbadc9bdd7b0431f5d65f1a56ffb28a1ee5283" +checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20" dependencies = [ "find-msvc-tools", "jobserver", @@ -1459,7 +1459,7 @@ dependencies = [ [[package]] name = "cosmic-notifications-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-notifications#de57c9ef0e2bd5f5608eb425a736bbe4c815cb76" +source = "git+https://github.com/pop-os/cosmic-notifications#6046bb29d570161196ab98d60806f6d6489df7a6" dependencies = [ "cosmic-config", "serde", @@ -1468,7 +1468,7 @@ dependencies = [ [[package]] name = "cosmic-notifications-util" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-notifications#de57c9ef0e2bd5f5608eb425a736bbe4c815cb76" +source = "git+https://github.com/pop-os/cosmic-notifications#6046bb29d570161196ab98d60806f6d6489df7a6" dependencies = [ "fast_image_resize", "libcosmic", @@ -1509,7 +1509,7 @@ dependencies = [ [[package]] name = "cosmic-pipewire" version = "1.0.7" -source = "git+https://github.com/pop-os/cosmic-settings#04da80bb904f500ea07ec6ee4ea45d3b50adb9bb" +source = "git+https://github.com/pop-os/cosmic-settings#3639bafcfa3b27fd6a8a9bca7e77589b903975e8" dependencies = [ "intmap", "libspa", @@ -1537,7 +1537,7 @@ dependencies = [ [[package]] name = "cosmic-settings-a11y-manager-subscription" version = "1.0.7" -source = "git+https://github.com/pop-os/cosmic-settings#04da80bb904f500ea07ec6ee4ea45d3b50adb9bb" +source = "git+https://github.com/pop-os/cosmic-settings#3639bafcfa3b27fd6a8a9bca7e77589b903975e8" dependencies = [ "cosmic-protocols", "iced_futures", @@ -1551,7 +1551,7 @@ dependencies = [ [[package]] name = "cosmic-settings-accessibility-subscription" version = "1.0.7" -source = "git+https://github.com/pop-os/cosmic-settings#04da80bb904f500ea07ec6ee4ea45d3b50adb9bb" +source = "git+https://github.com/pop-os/cosmic-settings#3639bafcfa3b27fd6a8a9bca7e77589b903975e8" dependencies = [ "cosmic-dbus-a11y", "futures", @@ -1564,7 +1564,7 @@ dependencies = [ [[package]] name = "cosmic-settings-airplane-mode-subscription" version = "1.0.7" -source = "git+https://github.com/pop-os/cosmic-settings#04da80bb904f500ea07ec6ee4ea45d3b50adb9bb" +source = "git+https://github.com/pop-os/cosmic-settings#3639bafcfa3b27fd6a8a9bca7e77589b903975e8" dependencies = [ "futures", "iced_futures", @@ -1597,7 +1597,7 @@ dependencies = [ [[package]] name = "cosmic-settings-daemon-subscription" version = "1.0.7" -source = "git+https://github.com/pop-os/cosmic-settings#04da80bb904f500ea07ec6ee4ea45d3b50adb9bb" +source = "git+https://github.com/pop-os/cosmic-settings#3639bafcfa3b27fd6a8a9bca7e77589b903975e8" dependencies = [ "futures", "iced_futures", @@ -1610,7 +1610,7 @@ dependencies = [ [[package]] name = "cosmic-settings-network-manager-subscription" version = "1.0.7" -source = "git+https://github.com/pop-os/cosmic-settings#04da80bb904f500ea07ec6ee4ea45d3b50adb9bb" +source = "git+https://github.com/pop-os/cosmic-settings#3639bafcfa3b27fd6a8a9bca7e77589b903975e8" dependencies = [ "bitflags 2.11.0", "cosmic-dbus-networkmanager", @@ -1629,7 +1629,7 @@ dependencies = [ [[package]] name = "cosmic-settings-sound-subscription" version = "1.0.7" -source = "git+https://github.com/pop-os/cosmic-settings#04da80bb904f500ea07ec6ee4ea45d3b50adb9bb" +source = "git+https://github.com/pop-os/cosmic-settings#3639bafcfa3b27fd6a8a9bca7e77589b903975e8" dependencies = [ "cosmic-pipewire", "futures", @@ -1644,7 +1644,7 @@ dependencies = [ [[package]] name = "cosmic-settings-upower-subscription" version = "1.0.7" -source = "git+https://github.com/pop-os/cosmic-settings#04da80bb904f500ea07ec6ee4ea45d3b50adb9bb" +source = "git+https://github.com/pop-os/cosmic-settings#3639bafcfa3b27fd6a8a9bca7e77589b903975e8" dependencies = [ "futures", "iced_futures", @@ -1658,7 +1658,7 @@ dependencies = [ [[package]] name = "cosmic-text" version = "0.18.2" -source = "git+https://github.com/pop-os/cosmic-text.git#9a2ab09f06905e91f41d64ac6eee887726e7fd76" +source = "git+https://github.com/pop-os/cosmic-text.git#4d74f795cc771fdcc7ea0f9cacba63fcf036fad6" dependencies = [ "bitflags 2.11.0", "fontdb", @@ -4169,14 +4169,14 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "libredox" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ddbf48fd451246b1f8c2610bd3b4ac0cc6e149d89832867093ab69a17194f08" +checksum = "e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c" dependencies = [ "bitflags 2.11.0", "libc", "plain", - "redox_syscall 0.7.3", + "redox_syscall 0.7.4", ] [[package]] @@ -5612,9 +5612,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce70a74e890531977d37e532c34d45e9055d2409ed08ddba14529471ed0be16" +checksum = "f450ad9c3b1da563fb6948a8e0fb0fb9269711c9c73d9ea1de5058c79c8d643a" dependencies = [ "bitflags 2.11.0", ] @@ -8090,7 +8090,7 @@ dependencies = [ "libredox", "orbclient", "raw-window-handle", - "redox_syscall 0.7.3", + "redox_syscall 0.7.4", "smol_str", "tracing", "winit-core", diff --git a/cosmic-app-list/src/app.rs b/cosmic-app-list/src/app.rs index c6a2f41b..ad2f1a52 100755 --- a/cosmic-app-list/src/app.rs +++ b/cosmic-app-list/src/app.rs @@ -27,6 +27,7 @@ use cosmic::{ }, cosmic_config::{Config, CosmicConfigEntry}, desktop::IconSourceExt, + iced::runtime::{core::event, dnd::peek_dnd}, iced::{ self, Alignment, Background, Border, Length, Limits, Padding, Subscription, advanced::text::{Ellipsize, EllipsizeHeightLimit}, @@ -39,7 +40,6 @@ use cosmic::{ }, window, }, - iced_runtime::{core::event, dnd::peek_dnd}, surface, theme::{self, Button, Container}, widget::{ @@ -2478,14 +2478,14 @@ impl cosmic::Application for CosmicAppList { Subscription::batch([ wayland_subscription().map(Message::Wayland), listen_with(|e, _, id| match e { - cosmic::iced_runtime::core::Event::PlatformSpecific( - event::PlatformSpecific::Wayland(event::wayland::Event::Seat(e, seat)), - ) => match e { + cosmic::iced::core::Event::PlatformSpecific(event::PlatformSpecific::Wayland( + event::wayland::Event::Seat(e, seat), + )) => match e { event::wayland::SeatEvent::Enter => Some(Message::NewSeat(seat)), event::wayland::SeatEvent::Leave => Some(Message::RemovedSeat), }, - cosmic::iced_core::Event::Mouse( - cosmic::iced_core::mouse::Event::ButtonPressed(_), + cosmic::iced::core::Event::Mouse( + cosmic::iced::core::mouse::Event::ButtonPressed(_), ) => Some(Message::Pressed(id)), _ => None, }), diff --git a/cosmic-app-list/src/wayland_subscription.rs b/cosmic-app-list/src/wayland_subscription.rs index 5122373d..766e3aec 100644 --- a/cosmic-app-list/src/wayland_subscription.rs +++ b/cosmic-app-list/src/wayland_subscription.rs @@ -12,8 +12,8 @@ use cctk::{ }, }; use cosmic::{ + iced::core::Bytes, iced::{self, Subscription, stream}, - iced_core::Bytes, }; use image::EncodableLayout; diff --git a/cosmic-applet-audio/src/mouse_area.rs b/cosmic-applet-audio/src/mouse_area.rs index 431f2608..6ae8547a 100644 --- a/cosmic-applet-audio/src/mouse_area.rs +++ b/cosmic-applet-audio/src/mouse_area.rs @@ -1,9 +1,9 @@ //! A container for capturing mouse events. use cosmic::iced::Vector; -use cosmic::iced_renderer::core::Point; +use cosmic::iced::core::Point; -use cosmic::iced_core::{ +use cosmic::iced::core::{ Clipboard, Element, Layout, Length, Rectangle, Shell, Size, Widget, event::{self, Event}, layout, mouse, overlay, renderer, touch, @@ -273,7 +273,7 @@ where state: &Tree, layout: Layout<'_>, renderer: &Renderer, - dnd_rectangles: &mut cosmic::iced_core::clipboard::DndDestinationRectangles, + dnd_rectangles: &mut cosmic::iced::core::clipboard::DndDestinationRectangles, ) { if let Some(state) = state.children.first() { self.content diff --git a/cosmic-applet-audio/src/mpris_subscription.rs b/cosmic-applet-audio/src/mpris_subscription.rs index b2493acf..c11769cc 100644 --- a/cosmic-applet-audio/src/mpris_subscription.rs +++ b/cosmic-applet-audio/src/mpris_subscription.rs @@ -4,8 +4,8 @@ use std::{borrow::Cow, fmt::Debug, hash::Hash, path::PathBuf}; use cosmic::{ + iced::futures::{self, SinkExt, StreamExt, future::OptionFuture}, iced::{self, Subscription, stream}, - iced_futures::futures::{self, SinkExt, StreamExt, future::OptionFuture}, }; use mpris2_zbus::{ enumerator, diff --git a/cosmic-applet-battery/src/app.rs b/cosmic-applet-battery/src/app.rs index 53e912b8..67e513c3 100644 --- a/cosmic-applet-battery/src/app.rs +++ b/cosmic-applet-battery/src/app.rs @@ -20,13 +20,13 @@ use cosmic::{ }, cctk::sctk::reexports::calloop, cosmic_theme::Spacing, + iced::core::{Alignment, Background, Border, Color, Shadow}, iced::{ Length, Subscription, platform_specific::shell::wayland::commands::popup::{destroy_popup, get_popup}, widget::{Column, column, container, row}, window, }, - iced_core::{Alignment, Background, Border, Color, Shadow}, surface, theme::{self, Button}, widget::{button, divider, icon, scrollable, slider, space, text, toggler}, diff --git a/cosmic-applet-battery/src/backend/mod.rs b/cosmic-applet-battery/src/backend/mod.rs index 8b9661ef..641798e4 100644 --- a/cosmic-applet-battery/src/backend/mod.rs +++ b/cosmic-applet-battery/src/backend/mod.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: GPL-3.0-only use cosmic::{ + iced::stream, iced::{self, Subscription, futures::SinkExt}, - iced_futures::stream, }; use std::{fmt::Debug, hash::Hash}; use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender}; diff --git a/cosmic-applet-battery/src/dgpu.rs b/cosmic-applet-battery/src/dgpu.rs index 1ae2a143..62325e1f 100644 --- a/cosmic-applet-battery/src/dgpu.rs +++ b/cosmic-applet-battery/src/dgpu.rs @@ -12,8 +12,8 @@ use std::{ }; use cosmic::{ + iced::stream, iced::{self, Subscription}, - iced_futures::stream, }; use drm::{ control::{ diff --git a/cosmic-applet-bluetooth/src/app.rs b/cosmic-applet-bluetooth/src/app.rs index 25603991..2ca95ec5 100644 --- a/cosmic-applet-bluetooth/src/app.rs +++ b/cosmic-applet-bluetooth/src/app.rs @@ -14,12 +14,12 @@ use cosmic::{ Element, Task, applet::{menu_button, padded_control}, cosmic_theme::Spacing, + iced::core::window, iced::{ self, Alignment, Length, Subscription, platform_specific::shell::wayland::commands::popup::{destroy_popup, get_popup}, widget::{Column, column, container, row}, }, - iced_runtime::core::window, theme, widget::{button, divider, icon, scrollable, text}, }; diff --git a/cosmic-applet-bluetooth/src/bluetooth.rs b/cosmic-applet-bluetooth/src/bluetooth.rs index eb810760..b3648acd 100644 --- a/cosmic-applet-bluetooth/src/bluetooth.rs +++ b/cosmic-applet-bluetooth/src/bluetooth.rs @@ -19,11 +19,11 @@ use bluer::{ }; use cosmic::{ + iced::stream, iced::{ self, Subscription, futures::{SinkExt, StreamExt}, }, - iced_futures::stream, }; use futures::{FutureExt, stream::FuturesUnordered}; diff --git a/cosmic-applet-input-sources/src/lib.rs b/cosmic-applet-input-sources/src/lib.rs index b16748ce..93e84283 100644 --- a/cosmic-applet-input-sources/src/lib.rs +++ b/cosmic-applet-input-sources/src/lib.rs @@ -10,14 +10,14 @@ use cosmic::{ applet::{self}, cosmic_config::{self, ConfigSet, CosmicConfigEntry}, cosmic_theme::Spacing, + iced::Subscription, iced::{ Rectangle, Task, platform_specific::shell::commands::popup::{destroy_popup, get_popup}, widget::{column, row}, window::Id, }, - iced_futures::Subscription, - iced_runtime::{Appearance, core::window}, + iced::{core::window, runtime::Appearance}, prelude::*, surface, theme, widget::{ diff --git a/cosmic-applet-minimize/src/lib.rs b/cosmic-applet-minimize/src/lib.rs index 4408d147..e40a7551 100644 --- a/cosmic-applet-minimize/src/lib.rs +++ b/cosmic-applet-minimize/src/lib.rs @@ -28,7 +28,7 @@ use cosmic::{ widget::{autosize::autosize, mouse_area}, }; -use cosmic::iced_widget::{Column, Row}; +use cosmic::iced::widget::{Column, Row}; use cosmic::{Element, widget::tooltip}; use std::sync::LazyLock; @@ -362,14 +362,14 @@ impl cosmic::Application for Minimize { PanelAnchor::Top | PanelAnchor::Bottom ) { Row::with_children(icon_buttons) - .align_y(cosmic::iced_core::Alignment::Center) + .align_y(cosmic::iced::core::Alignment::Center) .height(Length::Shrink) .width(Length::Shrink) .spacing(spacing as f32) .into() } else { Column::with_children(icon_buttons) - .align_x(cosmic::iced_core::Alignment::Center) + .align_x(cosmic::iced::core::Alignment::Center) .height(Length::Shrink) .width(Length::Shrink) .spacing(spacing as f32) @@ -457,13 +457,13 @@ impl cosmic::Application for Minimize { ) { Element::from( Row::with_children(icon_buttons) - .align_y(cosmic::iced_core::Alignment::Center) + .align_y(cosmic::iced::core::Alignment::Center) .height(Length::Shrink) .width(Length::Shrink), ) } else { Column::with_children(icon_buttons) - .align_x(cosmic::iced_core::Alignment::Center) + .align_x(cosmic::iced::core::Alignment::Center) .height(Length::Shrink) .width(Length::Shrink) .into() diff --git a/cosmic-applet-minimize/src/wayland_handler.rs b/cosmic-applet-minimize/src/wayland_handler.rs index 648a0770..bf2eae30 100644 --- a/cosmic-applet-minimize/src/wayland_handler.rs +++ b/cosmic-applet-minimize/src/wayland_handler.rs @@ -44,7 +44,7 @@ use cosmic::{ }, wayland_protocols::ext::foreign_toplevel_list::v1::client::ext_foreign_toplevel_handle_v1::ExtForeignToplevelHandleV1, }, - iced_futures::futures, + iced::futures, }; use cosmic_protocols::{ toplevel_info::v1::client::zcosmic_toplevel_handle_v1, diff --git a/cosmic-applet-minimize/src/wayland_subscription.rs b/cosmic-applet-minimize/src/wayland_subscription.rs index 728ec7dc..c9d625b6 100644 --- a/cosmic-applet-minimize/src/wayland_subscription.rs +++ b/cosmic-applet-minimize/src/wayland_subscription.rs @@ -11,9 +11,9 @@ use cosmic::{ self, wayland_protocols::ext::foreign_toplevel_list::v1::client::ext_foreign_toplevel_handle_v1::ExtForeignToplevelHandleV1, }, + iced::core::Bytes, iced::{self, Subscription}, - iced_core::Bytes, - iced_futures::{futures, stream}, + iced::{futures, stream}, }; use futures::SinkExt; use image::EncodableLayout; diff --git a/cosmic-applet-minimize/src/window_image.rs b/cosmic-applet-minimize/src/window_image.rs index c2a24eab..3ff4075c 100644 --- a/cosmic-applet-minimize/src/window_image.rs +++ b/cosmic-applet-minimize/src/window_image.rs @@ -5,7 +5,7 @@ use cosmic::{ Element, desktop::{IconSourceExt, fde}, iced::Limits, - iced_core::{Border, Layout, Length, Size, Vector, layout, overlay, widget::Tree}, + iced::core::{Border, Layout, Length, Size, Vector, layout, overlay, widget::Tree}, theme::{Button, Container}, widget::{Image, Widget, button, container, image::Handle}, }; @@ -42,7 +42,7 @@ where Image::new(Handle::from_rgba(img.width, img.height, img.img)) .width(Length::Fixed(adjusted_width)) .height(Length::Fixed(adjusted_height)) - .content_fit(cosmic::iced_core::ContentFit::Contain), + .content_fit(cosmic::iced::core::ContentFit::Contain), ) } else { Element::from( @@ -82,11 +82,11 @@ where } impl Widget for WindowImage<'_, Msg> { - fn children(&self) -> Vec { + fn children(&self) -> Vec { vec![Tree::new(&self.image_button), Tree::new(&self.icon)] } - fn diff(&mut self, tree: &mut cosmic::iced_core::widget::Tree) { + fn diff(&mut self, tree: &mut cosmic::iced::core::widget::Tree) { tree.diff_children(&mut [&mut self.image_button, &mut self.icon]); } @@ -95,9 +95,10 @@ impl Widget for WindowImage<'_, Msg> state: &'b mut Tree, layout: Layout<'b>, renderer: &cosmic::Renderer, - viewport: &cosmic::iced_core::Rectangle, + viewport: &cosmic::iced::core::Rectangle, translation: Vector, - ) -> Option> { + ) -> Option> + { let children = [&mut self.image_button, &mut self.icon] .into_iter() .zip(&mut state.children) @@ -118,10 +119,10 @@ impl Widget for WindowImage<'_, Msg> fn layout( &mut self, - tree: &mut cosmic::iced_core::widget::Tree, + tree: &mut cosmic::iced::core::widget::Tree, renderer: &cosmic::Renderer, - limits: &cosmic::iced_core::layout::Limits, - ) -> cosmic::iced_core::layout::Node { + limits: &cosmic::iced::core::layout::Limits, + ) -> cosmic::iced::core::layout::Node { let children = &mut tree.children; let button = &mut children[0]; let button_node = self @@ -155,13 +156,13 @@ impl Widget for WindowImage<'_, Msg> fn draw( &self, - tree: &cosmic::iced_core::widget::Tree, + tree: &cosmic::iced::core::widget::Tree, renderer: &mut cosmic::Renderer, theme: &cosmic::Theme, - style: &cosmic::iced_core::renderer::Style, - layout: cosmic::iced_core::Layout<'_>, - cursor: cosmic::iced_core::mouse::Cursor, - viewport: &cosmic::iced_core::Rectangle, + style: &cosmic::iced::core::renderer::Style, + layout: cosmic::iced::core::Layout<'_>, + cursor: cosmic::iced::core::mouse::Cursor, + viewport: &cosmic::iced::core::Rectangle, ) { let children = &[&self.image_button, &self.icon]; // draw children in order @@ -177,18 +178,18 @@ impl Widget for WindowImage<'_, Msg> self.size() } - fn tag(&self) -> cosmic::iced_core::widget::tree::Tag { - cosmic::iced_core::widget::tree::Tag::stateless() + fn tag(&self) -> cosmic::iced::core::widget::tree::Tag { + cosmic::iced::core::widget::tree::Tag::stateless() } - fn state(&self) -> cosmic::iced_core::widget::tree::State { - cosmic::iced_core::widget::tree::State::None + fn state(&self) -> cosmic::iced::core::widget::tree::State { + cosmic::iced::core::widget::tree::State::None } fn operate( &mut self, - tree: &mut cosmic::iced_core::widget::Tree, - layout: cosmic::iced_core::Layout<'_>, + tree: &mut cosmic::iced::core::widget::Tree, + layout: cosmic::iced::core::Layout<'_>, renderer: &cosmic::Renderer, operation: &mut dyn cosmic::widget::Operation<()>, ) { @@ -209,14 +210,14 @@ impl Widget for WindowImage<'_, Msg> fn update( &mut self, - state: &mut cosmic::iced_core::widget::Tree, - event: &cosmic::iced_core::Event, - layout: cosmic::iced_core::Layout<'_>, - cursor: cosmic::iced_core::mouse::Cursor, + state: &mut cosmic::iced::core::widget::Tree, + event: &cosmic::iced::core::Event, + layout: cosmic::iced::core::Layout<'_>, + cursor: cosmic::iced::core::mouse::Cursor, renderer: &cosmic::Renderer, - clipboard: &mut dyn cosmic::iced_core::Clipboard, - shell: &mut cosmic::iced_core::Shell<'_, Msg>, - viewport: &cosmic::iced_core::Rectangle, + clipboard: &mut dyn cosmic::iced::core::Clipboard, + shell: &mut cosmic::iced::core::Shell<'_, Msg>, + viewport: &cosmic::iced::core::Rectangle, ) { let children = [&mut self.image_button, &mut self.icon]; @@ -241,12 +242,12 @@ impl Widget for WindowImage<'_, Msg> fn mouse_interaction( &self, - state: &cosmic::iced_core::widget::Tree, - layout: cosmic::iced_core::Layout<'_>, - cursor: cosmic::iced_core::mouse::Cursor, - viewport: &cosmic::iced_core::Rectangle, + state: &cosmic::iced::core::widget::Tree, + layout: cosmic::iced::core::Layout<'_>, + cursor: cosmic::iced::core::mouse::Cursor, + viewport: &cosmic::iced::core::Rectangle, renderer: &cosmic::Renderer, - ) -> cosmic::iced_core::mouse::Interaction { + ) -> cosmic::iced::core::mouse::Interaction { let children = [&self.image_button, &self.icon]; let layout = layout.children().collect::>(); for (i, (layout, child)) in layout @@ -263,7 +264,7 @@ impl Widget for WindowImage<'_, Msg> return interaction; } } - cosmic::iced_core::mouse::Interaction::Idle + cosmic::iced::core::mouse::Interaction::Idle } fn id(&self) -> Option { diff --git a/cosmic-applet-notifications/Cargo.toml b/cosmic-applet-notifications/Cargo.toml index 0ef51421..094cfa14 100644 --- a/cosmic-applet-notifications/Cargo.toml +++ b/cosmic-applet-notifications/Cargo.toml @@ -5,11 +5,11 @@ edition = "2024" license = "GPL-3.0-only" [dependencies] +cosmic-notifications-util = { git = "https://github.com/pop-os/cosmic-notifications" } +cosmic-notifications-config = { git = "https://github.com/pop-os/cosmic-notifications" } anyhow.workspace = true libcosmic.workspace = true tokio.workspace = true -cosmic-notifications-util = { git = "https://github.com/pop-os/cosmic-notifications" } -cosmic-notifications-config = { git = "https://github.com/pop-os/cosmic-notifications" } # cosmic-notifications-util = { path = "../../cosmic-notifications-daemon/cosmic-notifications-util" } # cosmic-notifications-config = { path = "../../cosmic-notifications-daemon/cosmic-notifications-config" } futures-util = { workspace = true, features = ["sink"] } diff --git a/cosmic-applet-notifications/src/lib.rs b/cosmic-applet-notifications/src/lib.rs index bd827aef..f759fd88 100644 --- a/cosmic-applet-notifications/src/lib.rs +++ b/cosmic-applet-notifications/src/lib.rs @@ -23,7 +23,7 @@ use cosmic::{ widget::{Column, button, cards, container, divider, icon, scrollable, space, text, toggler}, }; -use cosmic::iced_futures::futures::executor::block_on; +use cosmic::iced::futures::executor::block_on; use cosmic_notifications_config::NotificationsConfig; use cosmic_notifications_util::{ActionId, Image, Notification}; diff --git a/cosmic-applet-notifications/src/subscriptions/dbus.rs b/cosmic-applet-notifications/src/subscriptions/dbus.rs index 076d2321..4ae6b596 100644 --- a/cosmic-applet-notifications/src/subscriptions/dbus.rs +++ b/cosmic-applet-notifications/src/subscriptions/dbus.rs @@ -4,7 +4,7 @@ use crate::subscriptions::freedesktop_proxy::NotificationsProxy; use cosmic::{ iced::futures::{self, SinkExt}, - iced_futures::{Subscription, stream}, + iced::{Subscription, stream}, }; use futures_util::StreamExt; use tokio::sync::mpsc::{Receiver, Sender, channel}; diff --git a/cosmic-applet-notifications/src/subscriptions/notifications.rs b/cosmic-applet-notifications/src/subscriptions/notifications.rs index ab0241c5..828ee695 100644 --- a/cosmic-applet-notifications/src/subscriptions/notifications.rs +++ b/cosmic-applet-notifications/src/subscriptions/notifications.rs @@ -2,11 +2,11 @@ // SPDX-License-Identifier: GPL-3.0-only use cosmic::{ + iced::Subscription, iced::{ futures::{self, FutureExt}, stream, }, - iced_futures::Subscription, }; use cosmic_notifications_util::Notification; use futures_util::{SinkExt, StreamExt}; diff --git a/cosmic-applet-status-area/src/components/app.rs b/cosmic-applet-status-area/src/components/app.rs index 754163a1..1071d7ac 100644 --- a/cosmic-applet-status-area/src/components/app.rs +++ b/cosmic-applet-status-area/src/components/app.rs @@ -594,7 +594,7 @@ fn menu_icon_button<'a>( cosmic::widget::icon(icon) .class(if symbolic { cosmic::theme::Svg::Custom(std::rc::Rc::new(|theme| { - cosmic::iced_widget::svg::Style { + cosmic::iced::widget::svg::Style { color: Some(theme.cosmic().background.on.into()), } })) diff --git a/cosmic-applet-tiling/src/window.rs b/cosmic-applet-tiling/src/window.rs index 0360ff48..327d5d75 100644 --- a/cosmic-applet-tiling/src/window.rs +++ b/cosmic-applet-tiling/src/window.rs @@ -11,12 +11,12 @@ use cosmic::{ applet::{menu_button, padded_control}, cosmic_config::{Config, ConfigSet, CosmicConfigEntry}, cosmic_theme::Spacing, + iced::widget::{column, row}, iced::{ Length, Subscription, platform_specific::shell::wayland::commands::popup::{destroy_popup, get_popup}, window::Id, }, - iced_widget::{column, row}, surface, theme, widget::{ container, divider, diff --git a/cosmic-applet-time/src/window.rs b/cosmic-applet-time/src/window.rs index 0fe87878..a44d81ee 100644 --- a/cosmic-applet-time/src/window.rs +++ b/cosmic-applet-time/src/window.rs @@ -6,6 +6,8 @@ use cosmic::{ applet::{cosmic_panel_config::PanelAnchor, menu_button, padded_control}, cctk::sctk::reexports::calloop, cosmic_theme::Spacing, + iced::stream, + iced::widget::Column, iced::{ Alignment, Length, Rectangle, Subscription, futures::{SinkExt, StreamExt, channel::mpsc}, @@ -13,8 +15,6 @@ use cosmic::{ widget::{column, row, rule}, window, }, - iced_futures::stream, - iced_widget::Column, surface, theme, widget::{ Button, Grid, Id, autosize, button, container, divider, grid, icon, rectangle_tracker::*, diff --git a/cosmic-applet-workspaces/src/components/app.rs b/cosmic-applet-workspaces/src/components/app.rs index 26de9ad6..dc4ccdc4 100644 --- a/cosmic-applet-workspaces/src/components/app.rs +++ b/cosmic-applet-workspaces/src/components/app.rs @@ -13,6 +13,7 @@ use cctk::{ use cosmic::{ Element, Task, Theme, app, applet::cosmic_panel_config::PanelAnchor, + iced::core::{Background, Border}, iced::{ Alignment, Event::Mouse, @@ -20,7 +21,6 @@ use cosmic::{ mouse::{self, ScrollDelta}, widget::{button, column, row}, }, - iced_core::{Background, Border}, scroll::DiscreteScrollState, surface, widget::{Id, autosize, container, space}, diff --git a/cosmic-panel-button/src/lib.rs b/cosmic-panel-button/src/lib.rs index 0b2d70b1..718744b0 100644 --- a/cosmic-panel-button/src/lib.rs +++ b/cosmic-panel-button/src/lib.rs @@ -10,8 +10,8 @@ use cosmic::{ Size, cosmic_panel_config::{PanelAnchor, PanelSize}, }, + iced::widget::row, iced::{self, Length}, - iced_widget::row, surface, widget::{Id, autosize}, }; @@ -65,7 +65,7 @@ impl Button { cosmic::widget::icon(icon) .class(if symbolic { cosmic::theme::Svg::Custom(std::rc::Rc::new(|theme| { - cosmic::iced_widget::svg::Style { + cosmic::iced::widget::svg::Style { color: Some(theme.cosmic().background.on.into()), } }))