diff --git a/Cargo.lock b/Cargo.lock index a0e241e..dd3d4e2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1342,7 +1342,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "1.0.0" -source = "git+https://github.com/pop-os/libcosmic.git#724351727a191516ca1b2f2f90a00b7d211c7e1f" +source = "git+https://github.com/pop-os/libcosmic.git#a44cff8011d81209e18de86f24da248c88b5a28d" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1363,7 +1363,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "1.0.0" -source = "git+https://github.com/pop-os/libcosmic.git#724351727a191516ca1b2f2f90a00b7d211c7e1f" +source = "git+https://github.com/pop-os/libcosmic.git#a44cff8011d81209e18de86f24da248c88b5a28d" dependencies = [ "quote", "syn", @@ -1372,7 +1372,7 @@ dependencies = [ [[package]] name = "cosmic-files" version = "1.0.9" -source = "git+https://github.com/pop-os/cosmic-files.git#d38d55525b5610e555e11a9c8ebc3bc8507d5480" +source = "git+https://github.com/pop-os/cosmic-files.git#b17f8889a8a350a9a07ab3e00155d9b35f136152" dependencies = [ "anyhow", "compio", @@ -1529,7 +1529,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "1.0.0" -source = "git+https://github.com/pop-os/libcosmic.git#724351727a191516ca1b2f2f90a00b7d211c7e1f" +source = "git+https://github.com/pop-os/libcosmic.git#a44cff8011d81209e18de86f24da248c88b5a28d" dependencies = [ "almost", "configparser", @@ -2963,7 +2963,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#724351727a191516ca1b2f2f90a00b7d211c7e1f" +source = "git+https://github.com/pop-os/libcosmic.git#a44cff8011d81209e18de86f24da248c88b5a28d" dependencies = [ "dnd", "iced_accessibility", @@ -2984,7 +2984,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#724351727a191516ca1b2f2f90a00b7d211c7e1f" +source = "git+https://github.com/pop-os/libcosmic.git#a44cff8011d81209e18de86f24da248c88b5a28d" dependencies = [ "accesskit", "accesskit_winit", @@ -2993,7 +2993,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#724351727a191516ca1b2f2f90a00b7d211c7e1f" +source = "git+https://github.com/pop-os/libcosmic.git#a44cff8011d81209e18de86f24da248c88b5a28d" dependencies = [ "bitflags 2.11.0", "bytes", @@ -3017,7 +3017,7 @@ dependencies = [ [[package]] name = "iced_debug" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#724351727a191516ca1b2f2f90a00b7d211c7e1f" +source = "git+https://github.com/pop-os/libcosmic.git#a44cff8011d81209e18de86f24da248c88b5a28d" dependencies = [ "iced_core", "iced_futures", @@ -3027,7 +3027,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#724351727a191516ca1b2f2f90a00b7d211c7e1f" +source = "git+https://github.com/pop-os/libcosmic.git#a44cff8011d81209e18de86f24da248c88b5a28d" dependencies = [ "futures", "iced_core", @@ -3041,7 +3041,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#724351727a191516ca1b2f2f90a00b7d211c7e1f" +source = "git+https://github.com/pop-os/libcosmic.git#a44cff8011d81209e18de86f24da248c88b5a28d" dependencies = [ "bitflags 2.11.0", "bytemuck", @@ -3062,7 +3062,7 @@ dependencies = [ [[package]] name = "iced_program" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#724351727a191516ca1b2f2f90a00b7d211c7e1f" +source = "git+https://github.com/pop-os/libcosmic.git#a44cff8011d81209e18de86f24da248c88b5a28d" dependencies = [ "iced_graphics", "iced_runtime", @@ -3071,7 +3071,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#724351727a191516ca1b2f2f90a00b7d211c7e1f" +source = "git+https://github.com/pop-os/libcosmic.git#a44cff8011d81209e18de86f24da248c88b5a28d" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -3083,7 +3083,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#724351727a191516ca1b2f2f90a00b7d211c7e1f" +source = "git+https://github.com/pop-os/libcosmic.git#a44cff8011d81209e18de86f24da248c88b5a28d" dependencies = [ "bytes", "cosmic-client-toolkit", @@ -3098,7 +3098,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#724351727a191516ca1b2f2f90a00b7d211c7e1f" +source = "git+https://github.com/pop-os/libcosmic.git#a44cff8011d81209e18de86f24da248c88b5a28d" dependencies = [ "bytemuck", "cosmic-text", @@ -3115,7 +3115,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#724351727a191516ca1b2f2f90a00b7d211c7e1f" +source = "git+https://github.com/pop-os/libcosmic.git#a44cff8011d81209e18de86f24da248c88b5a28d" dependencies = [ "as-raw-xcb-connection", "bitflags 2.11.0", @@ -3146,7 +3146,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.2" -source = "git+https://github.com/pop-os/libcosmic.git#724351727a191516ca1b2f2f90a00b7d211c7e1f" +source = "git+https://github.com/pop-os/libcosmic.git#a44cff8011d81209e18de86f24da248c88b5a28d" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -3164,7 +3164,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#724351727a191516ca1b2f2f90a00b7d211c7e1f" +source = "git+https://github.com/pop-os/libcosmic.git#a44cff8011d81209e18de86f24da248c88b5a28d" dependencies = [ "cosmic-client-toolkit", "cursor-icon", @@ -4256,7 +4256,7 @@ checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af" [[package]] name = "libcosmic" version = "1.0.0" -source = "git+https://github.com/pop-os/libcosmic.git#724351727a191516ca1b2f2f90a00b7d211c7e1f" +source = "git+https://github.com/pop-os/libcosmic.git#a44cff8011d81209e18de86f24da248c88b5a28d" dependencies = [ "apply", "ashpd 0.12.3", @@ -6975,9 +6975,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.51.0" +version = "1.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd1c4c0fc4a7ab90fc15ef6daaa3ec3b893f004f915f2392557ed23237820cd" +checksum = "f66bf9585cda4b724d3e78ab34b73fb2bbaba9011b9bfdf69dc836382ea13b8c" dependencies = [ "bytes", "libc", @@ -7032,9 +7032,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.25.10+spec-1.1.0" +version = "0.25.11+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82418ca169e235e6c399a84e395ab6debeb3bc90edc959bf0f48647c6a32d1b" +checksum = "0b59c4d22ed448339746c59b905d24568fcbb3ab65a500494f7b8c3e97739f2b" dependencies = [ "indexmap 2.13.1", "toml_datetime", diff --git a/src/main.rs b/src/main.rs index 4a6b584..73dd21b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,7 +3,7 @@ use alacritty_terminal::{event::Event as TermEvent, term, term::color::Colors as TermColors, tty}; use cosmic::iced::clipboard::dnd::DndAction; -use cosmic::iced_core::keyboard::key::Named; +use cosmic::iced::core::keyboard::key::Named; use cosmic::widget::menu::action::MenuAction; use cosmic::widget::menu::key_bind::KeyBind; use cosmic::widget::pane_grid::Pane; @@ -2904,7 +2904,7 @@ impl Application for App { tasks.push(cosmic::task::message(Message::Surface( cosmic::surface::action::app_popup(move |_app: &mut Self| { use cosmic::cctk::wayland_protocols::xdg::shell::client::xdg_positioner::{Anchor, Gravity}; - use cosmic::iced_runtime::platform_specific::wayland::popup::{SctkPopupSettings, SctkPositioner}; + use cosmic::iced::runtime::platform_specific::wayland::popup::{SctkPopupSettings, SctkPositioner}; SctkPopupSettings { parent: main_window, @@ -3381,7 +3381,7 @@ impl Application for App { ) .class(style::Container::Custom(Box::new(|theme| { let cosmic = theme.cosmic(); - cosmic::iced_widget::container::Style { + cosmic::iced::widget::container::Style { icon_color: Some(Color::from(cosmic.background.on)), text_color: Some(Color::from(cosmic.background.on)), background: Some(iced::Background::Color( diff --git a/src/menu.rs b/src/menu.rs index cc65c28..a10ca75 100644 --- a/src/menu.rs +++ b/src/menu.rs @@ -7,8 +7,8 @@ use cosmic::widget::{Column, space}; use cosmic::{ Element, app::Core, + iced::core::Border, iced::{Background, Length, advanced::widget::text::Style as TextStyle}, - iced_core::Border, theme, widget::{ self, divider, diff --git a/src/shortcuts.rs b/src/shortcuts.rs index 427ed19..e918a97 100644 --- a/src/shortcuts.rs +++ b/src/shortcuts.rs @@ -2,8 +2,8 @@ use cosmic::widget::menu::key_bind::{KeyBind, Modifier}; use cosmic::{ + iced::core::keyboard::key::Named, iced::keyboard::{Key, Modifiers}, - iced_core::keyboard::key::Named, }; use serde::{Deserialize, Serialize}; use std::collections::{BTreeMap, HashMap}; diff --git a/src/terminal_box.rs b/src/terminal_box.rs index f948d73..8f7460e 100644 --- a/src/terminal_box.rs +++ b/src/terminal_box.rs @@ -10,15 +10,7 @@ use alacritty_terminal::{ use cosmic::{ Renderer, cosmic_theme::palette::{WithAlpha, blend::Compose}, - iced::{ - Color, Element, Length, Padding, Point, Rectangle, Size, Vector, - advanced::graphics::text::Raw, - event::{Event, Status}, - keyboard::{Event as KeyEvent, Key, Modifiers}, - mouse::{self, Button, Event as MouseEvent, ScrollDelta}, - window::RedrawRequest, - }, - iced_core::{ + iced::core::{ Border, Shell, clipboard::Clipboard, keyboard::key::Named, @@ -31,9 +23,17 @@ use cosmic::{ tree, }, }, + iced::{ + Color, Element, Length, Padding, Point, Rectangle, Size, Vector, + advanced::graphics::text::Raw, + event::{Event, Status}, + keyboard::{Event as KeyEvent, Key, Modifiers}, + mouse::{self, Button, Event as MouseEvent, ScrollDelta}, + window::RedrawRequest, + }, theme::Theme, }; -use cosmic::{iced_core::SmolStr, widget::menu::key_bind::KeyBind}; +use cosmic::{iced::core::SmolStr, widget::menu::key_bind::KeyBind}; use cosmic_text::LayoutGlyph; use indexmap::IndexSet; use std::{