diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index af5b059..3e3a042 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -17,13 +17,13 @@ jobs:
- name: Install Rust nightly
uses: dtolnay/rust-toolchain@master
with:
- toolchain: nightly-2026-04-27
+ toolchain: nightly-2025-07-31
- name: System dependencies
run: sudo apt-get update; sudo apt-get install -y libxkbcommon-dev libwayland-dev
- name: Build documentation
run: |
RUSTDOCFLAGS="--cfg docsrs" \
- cargo +nightly-2026-04-27 doc --no-deps \
+ cargo +nightly-2025-07-31 doc --no-deps \
-p cosmic-client-toolkit \
-p cosmic-protocols \
-p libcosmic \
diff --git a/.zed/settings.json b/.zed/settings.json
deleted file mode 100644
index 2cc7b98..0000000
--- a/.zed/settings.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "format_on_save": "on",
- "lsp": {
- "rust-analyzer": {
- "initialization_options": {
- "check": {
- "command": "clippy",
- },
- "rustfmt": {
- "extraArgs": ["+nightly"],
- },
- },
- },
- },
-}
diff --git a/Cargo.toml b/Cargo.toml
index 738e71f..d73da2d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,23 +1,20 @@
[package]
-# Yoda fork: hard-renamed. Every consumer (leyoda/cosmic-files fork + each
-# leyoda/cosmic-* app) depends directly on `libcosmic-yoda` by path, bypassing
-# pop-os/libcosmic entirely. No [patch] shenanigans needed — transitive deps
-# that used to ask for `libcosmic` are replaced by deps on our forks that ask
-# for `libcosmic-yoda`.
-name = "libcosmic-yoda"
-version = "0.1.0-yoda.2"
+name = "libcosmic"
+version = "1.0.0"
edition = "2024"
-rust-version = "1.93"
+rust-version = "1.90"
[lib]
name = "cosmic"
[features]
default = [
+ "winit",
"tokio",
"a11y",
"dbus-config",
- "wayland",
+ "x11",
+ "iced-wayland",
"multi-window",
]
advanced-shaping = ["iced/advanced-shaping"]
@@ -38,6 +35,7 @@ animated-image = [
autosize = []
applet = [
"autosize",
+ "winit",
"wayland",
"tokio",
"cosmic-panel-config",
@@ -83,34 +81,32 @@ tokio = [
"cosmic-config/tokio",
]
# Tokio async runtime
-# Wayland window support (yoda fork is Wayland-only; always active in default).
-# We still need iced/winit because pop-os/iced hosts the runtime dispatcher
-# (`iced_winit as shell`) there — the name is a misnomer, it's the same crate
-# that provides both the winit path AND the sctk/cctk wayland path.
-wayland = [
+# Wayland window support
+iced-wayland = [
"ashpd?/wayland",
"autosize",
- "iced/winit",
"iced/wayland",
"iced_winit/wayland",
+ "surface-message",
+]
+wayland = [
+ "iced-wayland",
"iced_runtime/cctk",
"iced_winit/cctk",
"iced_wgpu/cctk",
"iced/cctk",
- "dep:iced_winit",
"dep:cctk",
- "surface-message",
]
surface-message = []
# multi-window support
multi-window = []
# Render with wgpu
wgpu = ["iced/wgpu", "iced_wgpu"]
-# Compat stubs — kept empty so upstream deps (cosmic-files, cosmic-text, …)
-# that still ask for `winit` / `x11` features resolve cleanly against the
-# yoda fork. Activating them has no effect: no code is gated on these.
-winit = []
-x11 = []
+# X11 window support via winit
+winit = ["iced/winit", "iced_winit"]
+winit_debug = ["winit", "debug"]
+winit_tokio = ["winit", "tokio"]
+winit_wgpu = ["winit", "wgpu"]
# Enables XDG portal integrations
xdg-portal = ["ashpd"]
qr_code = ["iced/qr_code"]
@@ -123,17 +119,18 @@ async-std = [
"zbus?/async-io",
"iced/async-std",
]
+x11 = ["iced/x11", "iced_winit/x11"]
[dependencies]
apply = "0.3.0"
ashpd = { version = "0.12.3", default-features = false, optional = true }
async-fs = { version = "2.2", optional = true }
-async-std = { workspace = true, optional = true }
+async-std = { version = "1.13", optional = true }
auto_enums = "0.8.8"
-cctk = { path = "../cosmic-protocols/client-toolkit", package = "cosmic-client-toolkit", optional = true }
+cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "160b086", optional = true }
jiff = "0.2"
cosmic-config = { path = "cosmic-config" }
-cosmic-settings-config = { path = "../cosmic-settings-daemon/config", optional = true }
+cosmic-settings-config = { git = "https://github.com/pop-os/cosmic-settings-daemon", optional = true }
# Internationalization
i18n-embed = { version = "0.16.0", features = [
"fluent-system",
@@ -153,35 +150,34 @@ image-extras = { version = "0.1.0", default-features = false, features = [
"xpm",
"xbm",
], optional = true }
-libc = { version = "0.2.186", optional = true }
+libc = { version = "0.2.183", optional = true }
log = "0.4"
mime = { version = "0.3.17", optional = true }
-palette.workspace = true
+palette = "0.7.6"
rfd = { version = "0.16.0", default-features = false, features = [
"xdg-portal",
], optional = true }
rustix = { version = "1.1", features = ["pipe", "process"], optional = true }
-serde = { workspace = true, features = ["derive"] }
+serde = { version = "1.0.228", features = ["derive"] }
slotmap = "1.1.1"
smol = { version = "2.0.2", optional = true }
-thiserror.workspace = true
+thiserror = "2.0.18"
taffy = { version = "0.9.2", features = ["grid"] }
-tokio = { workspace = true, optional = true }
-tracing.workspace = true
-unicode-segmentation = "1.13"
+tokio = { version = "1.50.0", optional = true }
+tracing = "0.1.44"
+unicode-segmentation = "1.12"
url = "2.5.8"
-zbus = { workspace = true, optional = true }
+zbus = { version = "5.14.0", default-features = false, optional = true }
float-cmp = "0.10.0"
-ron = { workspace = true, optional = true }
# Enable DBus feature on Linux targets
[target.'cfg(target_os = "linux")'.dependencies]
cosmic-config = { path = "cosmic-config", features = ["dbus"] }
-cosmic-settings-daemon = { path = "../dbus-settings-bindings/cosmic-settings-daemon" }
+cosmic-settings-daemon = { git = "https://github.com/pop-os/dbus-settings-bindings" }
zbus = { version = "5.14.0", default-features = false }
[target.'cfg(all(unix, not(target_os = "macos")))'.dependencies]
-freedesktop-icons = { package = "cosmic-freedesktop-icons", path = "../cosmic-freedesktop-icons" }
+freedesktop-icons = { package = "cosmic-freedesktop-icons", git = "https://github.com/pop-os/freedesktop-icons" }
freedesktop-desktop-entry = { version = "0.8.1", optional = true }
shlex = { version = "1.3.0", optional = true }
@@ -227,77 +223,35 @@ optional = true
[dependencies.iced_tiny_skia]
path = "./iced/tiny_skia"
-# Yoda: drop the x11 default → softbuffer no longer pulls tiny-xlib/x11-dl/etc.
-default-features = false
-features = ["wayland"]
[dependencies.iced_winit]
path = "./iced/winit"
optional = true
-# Yoda: drop the x11 default → winit won't pull winit-x11/tiny-xlib/x11-dl.
-# Keep wayland + wayland-dlopen (default behaviour minus x11).
-default-features = false
-features = ["wayland", "wayland-dlopen"]
[dependencies.iced_wgpu]
path = "./iced/wgpu"
optional = true
[dependencies.cosmic-panel-config]
-path = "../cosmic-panel/cosmic-panel-config"
+git = "https://github.com/pop-os/cosmic-panel"
+# path = "../cosmic-panel/cosmic-panel-config"
optional = true
-[patch.'https://github.com/pop-os/freedesktop-icons']
-cosmic-freedesktop-icons = { path = "../cosmic-freedesktop-icons" }
-
-[patch.'https://github.com/pop-os/softbuffer']
-softbuffer = { path = "../softbuffer" }
-
-[patch.'https://github.com/pop-os/smithay-clipboard']
-smithay-clipboard = { path = "../smithay-clipboard" }
-
-[patch.'https://github.com/pop-os/winit.git']
-dpi = { path = "../winit/dpi" }
-winit = { path = "../winit/winit" }
-winit-android = { path = "../winit/winit-android" }
-winit-appkit = { path = "../winit/winit-appkit" }
-winit-common = { path = "../winit/winit-common" }
-winit-core = { path = "../winit/winit-core" }
-winit-orbital = { path = "../winit/winit-orbital" }
-winit-uikit = { path = "../winit/winit-uikit" }
-winit-wayland = { path = "../winit/winit-wayland" }
-winit-web = { path = "../winit/winit-web" }
-winit-win32 = { path = "../winit/winit-win32" }
-winit-x11 = { path = "../winit/winit-x11" }
+[dependencies.ron]
+version = "0.12"
+optional = true
[workspace]
members = [
"cosmic-config",
"cosmic-config-derive",
"cosmic-theme",
+ "examples/*",
]
-# examples/* excluded — many depend on the removed winit/x11 features.
-# They will be revisited and adapted in a later phase.
-exclude = ["iced", "examples"]
+exclude = ["iced"]
[workspace.dependencies]
-async-std = "1.13"
-dirs = "6.0"
-palette = "0.7"
-ron = "0.12"
-serde = "1.0"
-thiserror = "2.0"
-tracing = "0.1"
-tokio = "1.52"
-zbus = {version = "5.15", default-features = false}
-
-# Speed up snapshot diffing in cosmic-theme tests. Cargo silently ignores
-# [profile.*] blocks in non-root manifests, so this lives at the
-# workspace root.
-[profile.dev.package.insta]
-opt-level = 3
-[profile.dev.package.similar]
-opt-level = 3
+dirs = "6.0.0"
[dev-dependencies]
tempfile = "3.27.0"
diff --git a/README.md b/README.md
index 698316d..23da97b 100644
--- a/README.md
+++ b/README.md
@@ -20,24 +20,6 @@ While libcosmic is written entirely in Rust, some of its dependencies may requir
sudo apt install cargo cmake just libexpat1-dev libfontconfig-dev libfreetype-dev libxkbcommon-dev pkgconf
```
-## Made-for-COSMIC Flatpak IDs
-
-To identify a project as a COSMIC Application, add `com.system76.CosmicApplication` to the provides section of the project's metainfo.
-
-```xml
-
- com.system76.CosmicApplication
-
-```
-
-For COSMIC Applets, use `com.system76.CosmicApplet`.
-
-```xml
-
- com.system76.CosmicApplet
-
-```
-
## Examples
Some examples are included in the [examples](./examples) directory to to kickstart your
diff --git a/cosmic-config/Cargo.toml b/cosmic-config/Cargo.toml
index a81d13f..0a7653e 100644
--- a/cosmic-config/Cargo.toml
+++ b/cosmic-config/Cargo.toml
@@ -10,21 +10,21 @@ macro = ["cosmic-config-derive"]
subscription = ["iced_futures"]
[dependencies]
-cosmic-settings-daemon = { path = "../../dbus-settings-bindings/cosmic-settings-daemon", optional = true }
+cosmic-settings-daemon = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
zbus = { version = "5.14.0", default-features = false, optional = true }
atomicwrites = { git = "https://github.com/jackpot51/rust-atomicwrites" }
calloop = { version = "0.14.4", optional = true }
notify = "8.2.0"
-ron.workspace = true
-serde.workspace = true
+ron = "0.12.0"
+serde = "1.0.228"
cosmic-config-derive = { path = "../cosmic-config-derive/", optional = true }
iced = { path = "../iced/", default-features = false, optional = true }
iced_futures = { path = "../iced/futures/", default-features = false, optional = true }
futures-util = { version = "0.3", optional = true }
dirs.workspace = true
-tokio = { workspace = true, optional = true, features = ["time"] }
-async-std = { workspace = true, optional = true }
-tracing.workspace = true
+tokio = { version = "1.50", optional = true, features = ["time"] }
+async-std = { version = "1.13", optional = true }
+tracing = "0.1"
[target.'cfg(unix)'.dependencies]
xdg = "3.0"
diff --git a/cosmic-config/src/dbus.rs b/cosmic-config/src/dbus.rs
index 9b6e869..da7bcb6 100644
--- a/cosmic-config/src/dbus.rs
+++ b/cosmic-config/src/dbus.rs
@@ -1,12 +1,13 @@
-use std::any::TypeId;
-use std::ops::Deref;
+use std::{any::TypeId, ops::Deref};
use crate::{CosmicConfigEntry, Update};
use cosmic_settings_daemon::{Changed, ConfigProxy, CosmicSettingsDaemonProxy};
use futures_util::SinkExt;
-use iced_futures::futures::future::pending;
-use iced_futures::futures::{self, StreamExt};
-use iced_futures::{Subscription, stream};
+use iced_futures::{
+ Subscription,
+ futures::{self, StreamExt, future::pending},
+ stream,
+};
pub async fn settings_daemon_proxy() -> zbus::Result> {
let conn = zbus::Connection::session().await?;
diff --git a/cosmic-config/src/lib.rs b/cosmic-config/src/lib.rs
index 2af498f..c8eda06 100644
--- a/cosmic-config/src/lib.rs
+++ b/cosmic-config/src/lib.rs
@@ -1,13 +1,16 @@
//! Integrations for cosmic-config — the cosmic configuration system.
-use notify::event::{EventKind, ModifyKind, RenameMode};
-use notify::{RecommendedWatcher, Watcher};
-use serde::Serialize;
-use serde::de::DeserializeOwned;
-use std::io::Write;
-use std::path::{Path, PathBuf};
-use std::sync::Mutex;
-use std::{env, fmt, fs};
+use notify::{
+ RecommendedWatcher, Watcher,
+ event::{EventKind, ModifyKind, RenameMode},
+};
+use serde::{Serialize, de::DeserializeOwned};
+use std::{
+ env, fmt, fs,
+ io::Write,
+ path::{Path, PathBuf},
+ sync::Mutex,
+};
/// Get the config directory, with Flatpak sandbox support.
/// In Flatpak, HOST_XDG_CONFIG_HOME points to the real user config directory,
@@ -51,22 +54,6 @@ fn get_state_dir() -> Option {
dirs::state_dir()
}
-/// Get the data directory, with Flatpak sandbox support.
-fn get_data_dir() -> Option {
- // Check if we're running in Flatpak
- if env::var_os("FLATPAK_ID").is_some() {
- // Try HOST_XDG_DATA_HOME first
- if let Some(host_data) = env::var_os("HOST_XDG_DATA_HOME") {
- return Some(PathBuf::from(host_data));
- }
- // Fallback: try to construct from HOME
- if let Some(home) = env::var_os("HOME") {
- return Some(PathBuf::from(home).join(".local").join("share"));
- }
- }
- dirs::data_dir()
-}
-
#[cfg(feature = "subscription")]
mod subscription;
#[cfg(feature = "subscription")]
@@ -279,24 +266,6 @@ impl Config {
})
}
- /// Get data for the given application name and config version.
- pub fn new_data(name: &str, version: u64) -> Result {
- // Look for [name]/v[version]
- let path = sanitize_name(name)?.join(format!("v{}", version));
-
- // Get libcosmic user data directory
- let mut user_path = get_data_dir().ok_or(Error::NoConfigDirectory)?;
- user_path.push("cosmic");
- user_path.push(path);
- // Create new data directory if not found.
- fs::create_dir_all(&user_path)?;
-
- Ok(Self {
- system_path: None,
- user_path: Some(user_path),
- })
- }
-
// Start a transaction (to set multiple configs at the same time)
#[inline]
pub fn transaction(&self) -> ConfigTransaction<'_> {
diff --git a/cosmic-config/src/subscription.rs b/cosmic-config/src/subscription.rs
index f038787..d16b9b6 100644
--- a/cosmic-config/src/subscription.rs
+++ b/cosmic-config/src/subscription.rs
@@ -1,9 +1,7 @@
-use iced_futures::futures::channel::mpsc;
use iced_futures::futures::{SinkExt, Stream};
-use iced_futures::stream;
+use iced_futures::{futures::channel::mpsc, stream};
use notify::RecommendedWatcher;
-use std::borrow::Cow;
-use std::hash::Hash;
+use std::{borrow::Cow, hash::Hash};
use crate::{Config, CosmicConfigEntry};
@@ -79,8 +77,7 @@ async fn start_listening,
output: &mut mpsc::Sender>,
) -> ConfigState {
- use iced_futures::futures::StreamExt;
- use iced_futures::futures::future::pending;
+ use iced_futures::futures::{StreamExt, future::pending};
match state {
ConfigState::Init(config_id, version, is_state) => {
diff --git a/cosmic-theme/Cargo.toml b/cosmic-theme/Cargo.toml
index b5bffa1..7e408d8 100644
--- a/cosmic-theme/Cargo.toml
+++ b/cosmic-theme/Cargo.toml
@@ -15,13 +15,13 @@ export = ["serde_json"]
no-default = []
[dependencies]
-palette = { workspace = true, features = ["serializing"] }
+palette = { version = "0.7.6", features = ["serializing"] }
almost = "0.2"
-serde = { workspace = true, features = ["derive"] }
+serde = { version = "1.0.228", features = ["derive"] }
serde_json = { version = "1.0.149", optional = true, features = [
"preserve_order",
] }
-ron.workspace = true
+ron = "0.12.0"
csscolorparser = { version = "0.8.3", features = ["serde"] }
cosmic-config = { path = "../cosmic-config/", default-features = false, features = [
"subscription",
@@ -29,8 +29,11 @@ cosmic-config = { path = "../cosmic-config/", default-features = false, features
] }
configparser = "3.1.0"
dirs.workspace = true
-thiserror.workspace = true
+thiserror = "2.0.18"
[dev-dependencies]
insta = "1.47.2"
+[profile.dev.package]
+insta.opt-level = 3
+similar.opt-level = 3
diff --git a/cosmic-theme/src/model/corner.rs b/cosmic-theme/src/model/corner.rs
index f2fa95e..ecd18c0 100644
--- a/cosmic-theme/src/model/corner.rs
+++ b/cosmic-theme/src/model/corner.rs
@@ -29,51 +29,3 @@ impl Default for CornerRadii {
}
}
}
-
-/// Roundness options for the Cosmic theme
-#[derive(Copy, Clone, Debug, Default, Eq, PartialEq, Serialize, Deserialize)]
-pub enum Roundness {
- /// Round style
- #[default]
- Round,
- /// Slightly round style
- SlightlyRound,
- /// Square style
- Square,
-}
-
-impl From for CornerRadii {
- fn from(value: Roundness) -> Self {
- match value {
- Roundness::Round => CornerRadii::default(),
- Roundness::SlightlyRound => CornerRadii {
- radius_0: [0.0; 4],
- radius_xs: [2.0; 4],
- radius_s: [8.0; 4],
- radius_m: [8.0; 4],
- radius_l: [8.0; 4],
- radius_xl: [8.0; 4],
- },
- Roundness::Square => CornerRadii {
- radius_0: [0.0; 4],
- radius_xs: [2.0; 4],
- radius_s: [2.0; 4],
- radius_m: [2.0; 4],
- radius_l: [2.0; 4],
- radius_xl: [2.0; 4],
- },
- }
- }
-}
-
-impl From for Roundness {
- fn from(value: CornerRadii) -> Self {
- if (value.radius_m[0] - 16.0).abs() < 0.01 {
- Self::Round
- } else if (value.radius_m[0] - 8.0).abs() < 0.01 {
- Self::SlightlyRound
- } else {
- Self::Square
- }
- }
-}
diff --git a/cosmic-theme/src/model/density.rs b/cosmic-theme/src/model/density.rs
new file mode 100644
index 0000000..7655361
--- /dev/null
+++ b/cosmic-theme/src/model/density.rs
@@ -0,0 +1,69 @@
+use crate::Spacing;
+use serde::{Deserialize, Serialize};
+
+/// Density options for the Cosmic theme
+#[derive(Copy, Clone, Debug, Default, Eq, PartialEq, Serialize, Deserialize)]
+pub enum Density {
+ /// Lower padding/spacing of elements
+ Compact,
+ /// Higher padding/spacing of elements
+ Spacious,
+ /// Standard padding/spacing of elements
+ #[default]
+ Standard,
+}
+
+impl From for Spacing {
+ fn from(value: Density) -> Self {
+ match value {
+ Density::Compact => Spacing {
+ space_none: 0,
+ space_xxxs: 4,
+ space_xxs: 4,
+ space_xs: 8,
+ space_s: 8,
+ space_m: 16,
+ space_l: 24,
+ space_xl: 32,
+ space_xxl: 48,
+ space_xxxl: 64,
+ },
+ Density::Spacious => Spacing {
+ space_none: 4,
+ space_xxxs: 8,
+ space_xxs: 12,
+ space_xs: 16,
+ space_s: 24,
+ space_m: 32,
+ space_l: 48,
+ space_xl: 64,
+ space_xxl: 128,
+ space_xxxl: 160,
+ },
+ Density::Standard => Spacing {
+ space_none: 0,
+ space_xxxs: 4,
+ space_xxs: 8,
+ space_xs: 12,
+ space_s: 16,
+ space_m: 24,
+ space_l: 32,
+ space_xl: 48,
+ space_xxl: 64,
+ space_xxxl: 128,
+ },
+ }
+ }
+}
+
+impl From for Density {
+ fn from(value: Spacing) -> Self {
+ if value.space_m.saturating_sub(16) == 0 {
+ Self::Compact
+ } else if value.space_m.saturating_sub(24) == 0 {
+ Self::Standard
+ } else {
+ Self::Spacious
+ }
+ }
+}
diff --git a/cosmic-theme/src/model/mod.rs b/cosmic-theme/src/model/mod.rs
index 19370de..f48d1a8 100644
--- a/cosmic-theme/src/model/mod.rs
+++ b/cosmic-theme/src/model/mod.rs
@@ -1,5 +1,6 @@
pub use corner::*;
pub use cosmic_palette::*;
+pub use density::*;
pub use derivation::*;
pub use mode::*;
pub use spacing::*;
@@ -7,6 +8,7 @@ pub use theme::*;
mod corner;
mod cosmic_palette;
+mod density;
mod derivation;
mod mode;
mod spacing;
diff --git a/cosmic-theme/src/model/spacing.rs b/cosmic-theme/src/model/spacing.rs
index f02cf51..93b1bf4 100644
--- a/cosmic-theme/src/model/spacing.rs
+++ b/cosmic-theme/src/model/spacing.rs
@@ -41,59 +41,3 @@ impl Default for Spacing {
}
}
}
-
-/// Density options for the Cosmic theme
-#[derive(Copy, Clone, Debug, Default, Eq, PartialEq, Serialize, Deserialize)]
-pub enum Density {
- /// Lower padding/spacing of elements
- Compact,
- /// Standard padding/spacing of elements
- #[default]
- Standard,
- /// Higher padding/spacing of elements
- Spacious,
-}
-
-impl From for Spacing {
- fn from(value: Density) -> Self {
- match value {
- Density::Compact => Spacing {
- space_none: 0,
- space_xxxs: 4,
- space_xxs: 4,
- space_xs: 8,
- space_s: 8,
- space_m: 16,
- space_l: 24,
- space_xl: 32,
- space_xxl: 48,
- space_xxxl: 64,
- },
- Density::Standard => Spacing::default(),
- Density::Spacious => Spacing {
- space_none: 4,
- space_xxxs: 8,
- space_xxs: 12,
- space_xs: 16,
- space_s: 24,
- space_m: 32,
- space_l: 48,
- space_xl: 64,
- space_xxl: 128,
- space_xxxl: 160,
- },
- }
- }
-}
-
-impl From for Density {
- fn from(value: Spacing) -> Self {
- if value.space_m.saturating_sub(16) == 0 {
- Self::Compact
- } else if value.space_m.saturating_sub(24) == 0 {
- Self::Standard
- } else {
- Self::Spacious
- }
- }
-}
diff --git a/cosmic-theme/src/model/theme.rs b/cosmic-theme/src/model/theme.rs
index 0c06005..5db0f32 100644
--- a/cosmic-theme/src/model/theme.rs
+++ b/cosmic-theme/src/model/theme.rs
@@ -1,13 +1,13 @@
-use crate::composite::over;
-use crate::steps::{color_index, get_small_widget_color, get_surface_color, get_text, steps};
use crate::{
Component, Container, CornerRadii, CosmicPalette, CosmicPaletteInner, DARK_PALETTE,
LIGHT_PALETTE, NAME, Spacing, ThemeMode,
+ composite::over,
+ steps::{color_index, get_small_widget_color, get_surface_color, get_text, steps},
};
use cosmic_config::{Config, CosmicConfigEntry};
-use palette::color_difference::Wcag21RelativeContrast;
-use palette::rgb::Rgb;
-use palette::{IntoColor, Oklcha, Srgb, Srgba, WithAlpha};
+use palette::{
+ IntoColor, Oklcha, Srgb, Srgba, WithAlpha, color_difference::Wcag21RelativeContrast, rgb::Rgb,
+};
use serde::{Deserialize, Serialize};
use std::num::NonZeroUsize;
@@ -75,8 +75,6 @@ pub struct Theme {
pub icon_button: Component,
/// link button element colors
pub link_button: Component,
- /// list button element colors
- pub list_button: Component,
/// text button element colors
pub text_button: Component,
/// button component styling
@@ -955,12 +953,6 @@ impl ThemeBuilder {
}
#[allow(clippy::too_many_lines)]
- // The component_hovered/pressed_overlay vars are seeded once near the
- // top of this fn and then reassigned inside each container block
- // (primary, secondary, …) before being read again. The initial seed
- // is therefore overwritten before any read, which is what the
- // unused_assignments lint flags below.
- #[allow(unused_assignments)]
/// build the theme
pub fn build(self) -> Theme {
let Self {
@@ -1293,15 +1285,6 @@ impl ThemeBuilder {
component.on_disabled = over(component.on.with_alpha(0.5), component.base);
component
},
- list_button: Component::component(
- Srgba::new(0.0, 0.0, 0.0, 0.0),
- accent,
- on_bg_component,
- Srgba::new(0.0, 0.0, 0.0, 0.0),
- button_pressed_overlay,
- is_high_contrast,
- control_steps_array[8],
- ),
success: Component::colored_component(
success,
control_steps_array[0],
diff --git a/cosmic-theme/src/output/gtk4_output.rs b/cosmic-theme/src/output/gtk4_output.rs
index bbb4f24..40eba5b 100644
--- a/cosmic-theme/src/output/gtk4_output.rs
+++ b/cosmic-theme/src/output/gtk4_output.rs
@@ -1,12 +1,10 @@
use crate::{Component, Theme, composite::over, steps::steps};
-use configparser::ini::Ini;
use palette::{Darken, IntoColor, Lighten, Srgba, WithAlpha, rgb::Rgba};
use std::{
fs::{self, File},
io::{self, Write},
num::NonZeroUsize,
path::Path,
- process::Command,
};
use super::{OutputError, to_rgba};
@@ -219,50 +217,6 @@ impl Theme {
Ok(())
}
- /// Apply the preferred GTK client-side decoration button layout.
- ///
- /// This writes the GTK 3/4 `settings.ini` value used by GTK header bars and
- /// also best-effort updates GNOME's `button-layout` GSettings key for apps
- /// that still consult it.
- ///
- /// # Errors
- ///
- /// Returns an `OutputError` if the GTK settings files cannot be written.
- #[cold]
- pub fn apply_gtk_decoration_layout(buttons_at_start: bool) -> Result<(), OutputError> {
- let Some(config_dir) = dirs::config_dir() else {
- return Err(OutputError::MissingConfigDir);
- };
-
- let layout = if buttons_at_start {
- "close,minimize,maximize:"
- } else {
- ":minimize,maximize,close"
- };
-
- for gtk_version in ["gtk-3.0", "gtk-4.0"] {
- let gtk_dir = config_dir.join(gtk_version);
- fs::create_dir_all(>k_dir).map_err(OutputError::Io)?;
- Self::write_gtk_settings_key(
- >k_dir.join("settings.ini"),
- "gtk-decoration-layout",
- layout,
- )?;
- }
-
- // best-effort: gsettings is absent on non-GNOME systems
- let _ = Command::new("gsettings")
- .args([
- "set",
- "org.gnome.desktop.wm.preferences",
- "button-layout",
- layout,
- ])
- .status();
-
- Ok(())
- }
-
/// Reset the applied gtk css
///
/// # Errors
@@ -302,20 +256,6 @@ impl Theme {
Ok(())
}
- #[cold]
- fn write_gtk_settings_key(path: &Path, key: &str, value: &str) -> Result<(), OutputError> {
- let mut ini = Ini::new_cs();
-
- if path.exists() {
- let file_content = fs::read_to_string(path).map_err(OutputError::Io)?;
- ini.read(file_content).map_err(OutputError::Ini)?;
- }
-
- ini.setstr("Settings", key, Some(value));
- ini.pretty_write(path, &super::qt_settings_ini_style())
- .map_err(OutputError::Io)
- }
-
fn is_cosmic_css(path: &Path, cosmic_css: &Path) -> io::Result> {
if !path.exists() {
return Ok(None);
diff --git a/cosmic-theme/src/output/mod.rs b/cosmic-theme/src/output/mod.rs
index 04dce39..19f7bc5 100644
--- a/cosmic-theme/src/output/mod.rs
+++ b/cosmic-theme/src/output/mod.rs
@@ -1,6 +1,5 @@
use configparser::ini::WriteOptions;
-use palette::Srgba;
-use palette::rgb::Rgba;
+use palette::{Srgba, rgb::Rgba};
use thiserror::Error;
use crate::Theme;
diff --git a/cosmic-theme/src/output/qt56ct_output.rs b/cosmic-theme/src/output/qt56ct_output.rs
index 16df211..43a4547 100644
--- a/cosmic-theme/src/output/qt56ct_output.rs
+++ b/cosmic-theme/src/output/qt56ct_output.rs
@@ -1,12 +1,12 @@
use crate::Theme;
use configparser::ini::Ini;
-use palette::blend::Compose;
-use palette::rgb::Rgba;
-use palette::{Mix, Srgba, WithAlpha};
-use std::fs::{self, File};
-use std::io::Write;
-use std::path::PathBuf;
-use std::vec;
+use palette::{Mix, Srgba, WithAlpha, blend::Compose, rgb::Rgba};
+use std::{
+ fs::{self, File},
+ io::Write,
+ path::PathBuf,
+ vec,
+};
use super::{OutputError, qt_settings_ini_style};
diff --git a/cosmic-theme/src/output/qt_output.rs b/cosmic-theme/src/output/qt_output.rs
index 84614e7..d42d553 100644
--- a/cosmic-theme/src/output/qt_output.rs
+++ b/cosmic-theme/src/output/qt_output.rs
@@ -1,11 +1,12 @@
use crate::Theme;
use configparser::ini::Ini;
use cosmic_config::CosmicConfigEntry;
-use palette::blend::Compose;
-use palette::{Mix, Srgba};
-use std::fs::{self, File};
-use std::io::{self, Write};
-use std::path::{Path, PathBuf};
+use palette::{Mix, Srgba, blend::Compose};
+use std::{
+ fs::{self, File},
+ io::{self, Write},
+ path::{Path, PathBuf},
+};
use super::{OutputError, qt_settings_ini_style};
diff --git a/cosmic-theme/src/output/vs_code.rs b/cosmic-theme/src/output/vs_code.rs
index f49c888..43c36bb 100644
--- a/cosmic-theme/src/output/vs_code.rs
+++ b/cosmic-theme/src/output/vs_code.rs
@@ -266,14 +266,6 @@ impl From for VsTheme {
}
impl Theme {
- /// Write this theme to VS Code's `settings.json` as a
- /// `workbench.colorCustomizations` entry, and enable
- /// `window.autoDetectColorScheme` so VS Code follows the system theme.
- ///
- /// # Errors
- ///
- /// Returns an `OutputError` if the user config dir is missing, the
- /// settings file cannot be read/written, or its JSON is invalid.
#[cold]
pub fn apply_vs_code(self) -> Result<(), OutputError> {
let vs_theme = VsTheme::from(self);
@@ -299,13 +291,6 @@ impl Theme {
Ok(())
}
- /// Remove the `workbench.colorCustomizations` entry previously written
- /// by [`Theme::apply_vs_code`] from VS Code's `settings.json`.
- ///
- /// # Errors
- ///
- /// Returns an `OutputError` if the user config dir is missing, the
- /// settings file cannot be read/written, or its JSON is invalid.
#[cold]
pub fn reset_vs_code() -> Result<(), OutputError> {
let mut config_dir = dirs::config_dir().ok_or(OutputError::MissingConfigDir)?;
diff --git a/cosmic-theme/src/steps.rs b/cosmic-theme/src/steps.rs
index d156722..6ebf101 100644
--- a/cosmic-theme/src/steps.rs
+++ b/cosmic-theme/src/steps.rs
@@ -1,8 +1,7 @@
use std::num::NonZeroUsize;
use almost::equal;
-use palette::convert::FromColorUnclamped;
-use palette::{ClampAssign, FromColor, Lch, Oklcha, Srgb, Srgba};
+use palette::{ClampAssign, FromColor, Lch, Oklcha, Srgb, Srgba, convert::FromColorUnclamped};
/// Get an array of 100 colors with a specific hue and chroma
/// over the full range of lightness.
diff --git a/examples/about/Cargo.toml b/examples/about/Cargo.toml
index b27b513..f980811 100644
--- a/examples/about/Cargo.toml
+++ b/examples/about/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
[dependencies]
open = "5.3.3"
-[dependencies.libcosmic-yoda]
+[dependencies.libcosmic]
path = "../../"
features = [
"debug",
diff --git a/examples/about/src/main.rs b/examples/about/src/main.rs
index d1ea475..c25a9b9 100644
--- a/examples/about/src/main.rs
+++ b/examples/about/src/main.rs
@@ -8,8 +8,7 @@ use cosmic::app::{Core, Settings, Task};
use cosmic::executor;
use cosmic::iced::{alignment, Length, Size};
use cosmic::prelude::*;
-use cosmic::widget::about::About;
-use cosmic::widget::{self, nav_bar};
+use cosmic::widget::{self, about::About, nav_bar};
/// Runs application with these settings
#[rustfmt::skip]
diff --git a/examples/applet/Cargo.toml b/examples/applet/Cargo.toml
index 265fbe7..13eff68 100644
--- a/examples/applet/Cargo.toml
+++ b/examples/applet/Cargo.toml
@@ -12,7 +12,7 @@ tracing = "0.1"
env_logger = "0.10.2"
log = "0.4.29"
-[dependencies.libcosmic-yoda]
+[dependencies.libcosmic]
path = "../../"
default-features = false
features = ["applet-token"]
diff --git a/examples/applet/src/window.rs b/examples/applet/src/window.rs
index 57546ab..22903ea 100644
--- a/examples/applet/src/window.rs
+++ b/examples/applet/src/window.rs
@@ -4,8 +4,7 @@ use cosmic::iced::core::window;
use cosmic::iced::window::Id;
use cosmic::iced::{Length, Rectangle};
use cosmic::surface::action::{app_popup, destroy_popup};
-use cosmic::widget::dropdown::popup_dropdown;
-use cosmic::widget::{list_column, settings, toggler};
+use cosmic::widget::{dropdown::popup_dropdown, list_column, settings, toggler};
use cosmic::Element;
const ID: &str = "com.system76.CosmicAppletExample";
diff --git a/examples/application/Cargo.toml b/examples/application/Cargo.toml
index d4c7517..7a6083e 100644
--- a/examples/application/Cargo.toml
+++ b/examples/application/Cargo.toml
@@ -5,12 +5,12 @@ edition = "2021"
[features]
default = ["wayland"]
-wayland = ["libcosmic-yoda/wayland"]
+wayland = ["libcosmic/wayland"]
[dependencies]
env_logger = "0.11"
-[dependencies.libcosmic-yoda]
+[dependencies.libcosmic]
path = "../../"
features = [
"debug",
diff --git a/examples/application/src/main.rs b/examples/application/src/main.rs
index 05841f5..f6e571e 100644
--- a/examples/application/src/main.rs
+++ b/examples/application/src/main.rs
@@ -5,10 +5,9 @@
use cosmic::app::Settings;
use cosmic::iced::{Alignment, Length, Size};
-use cosmic::prelude::*;
use cosmic::widget::menu::{self, KeyBind};
use cosmic::widget::nav_bar;
-use cosmic::{executor, iced, widget, Core};
+use cosmic::{executor, iced, prelude::*, widget, Core};
use std::collections::HashMap;
use std::sync::LazyLock;
@@ -240,9 +239,7 @@ impl cosmic::Application for App {
widget::progress_bar::linear::Linear::new()
.girth(10.0)
.progress(self.progress)
- .width(Length::Fill)
- .markers([0.25, 0.5, 0.75])
- .segment_spacing(2),
+ .width(Length::Fill),
)
.push(
widget::progress_bar::circular::Circular::new()
diff --git a/examples/calendar/Cargo.toml b/examples/calendar/Cargo.toml
index 203f7c1..b728682 100644
--- a/examples/calendar/Cargo.toml
+++ b/examples/calendar/Cargo.toml
@@ -8,6 +8,6 @@ edition = "2024"
[dependencies]
jiff = "0.2"
-[dependencies.libcosmic-yoda]
+[dependencies.libcosmic]
path = "../../"
features = ["debug", "winit", "tokio", "xdg-portal", "wgpu"]
diff --git a/examples/config/src/main.rs b/examples/config/src/main.rs
index dfcc5b9..f6fb5c0 100644
--- a/examples/config/src/main.rs
+++ b/examples/config/src/main.rs
@@ -88,7 +88,4 @@ pub fn main() {
println!("Testing state");
test_config(Config::new_state("com.system76.Example", 1).unwrap());
-
- println!("Testing data");
- test_config(Config::new_data("com.system76.Example", 1).unwrap());
}
diff --git a/examples/context-menu/Cargo.toml b/examples/context-menu/Cargo.toml
index 4c1eed6..39c550f 100644
--- a/examples/context-menu/Cargo.toml
+++ b/examples/context-menu/Cargo.toml
@@ -8,7 +8,7 @@ tracing = "0.1.44"
tracing-subscriber = "0.3.22"
tracing-log = "0.2.0"
-[dependencies.libcosmic-yoda]
+[dependencies.libcosmic]
path = "../../"
features = [
"debug",
diff --git a/examples/cosmic/Cargo.toml b/examples/cosmic/Cargo.toml
index eebf6c3..8c2a312 100644
--- a/examples/cosmic/Cargo.toml
+++ b/examples/cosmic/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
[dependencies]
apply = "0.3.0"
fraction = "0.15.3"
-libcosmic-yoda = { path = "../..", features = [
+libcosmic = { path = "../..", features = [
"debug",
"winit",
"tokio",
diff --git a/examples/cosmic/src/window.rs b/examples/cosmic/src/window.rs
index 4168718..9fce876 100644
--- a/examples/cosmic/src/window.rs
+++ b/examples/cosmic/src/window.rs
@@ -23,11 +23,15 @@ use cosmic::{
Element,
};
use cosmic_time::{Instant, Timeline};
-use std::cell::RefCell;
-use std::rc::Rc;
-use std::sync::atomic::{AtomicU32, Ordering};
-use std::sync::Arc;
-use std::vec;
+use std::{
+ cell::RefCell,
+ rc::Rc,
+ sync::{
+ atomic::{AtomicU32, Ordering},
+ Arc,
+ },
+ vec,
+};
// XXX The use of button is removed because it assigns the same ID to multiple buttons, causing a crash when a11y is enabled...
// static BTN: Lazy = Lazy::new(|| id::Id::new("BTN"));
diff --git a/examples/cosmic/src/window/bluetooth.rs b/examples/cosmic/src/window/bluetooth.rs
index 2878b46..1b5892f 100644
--- a/examples/cosmic/src/window/bluetooth.rs
+++ b/examples/cosmic/src/window/bluetooth.rs
@@ -1,7 +1,9 @@
use super::{Page, Window};
-use cosmic::iced::widget::{column, text};
-use cosmic::widget::{list_column, settings, toggler};
-use cosmic::Element;
+use cosmic::{
+ iced::widget::{column, text},
+ widget::{list_column, settings, toggler},
+ Element,
+};
#[derive(Clone, Copy, Debug)]
pub enum Message {
diff --git a/examples/cosmic/src/window/demo.rs b/examples/cosmic/src/window/demo.rs
index 20a730b..0d31fa9 100644
--- a/examples/cosmic/src/window/demo.rs
+++ b/examples/cosmic/src/window/demo.rs
@@ -1,17 +1,19 @@
-use std::cell::RefCell;
-use std::rc::Rc;
+use std::{cell::RefCell, rc::Rc};
use apply::Apply;
-use cosmic::iced::widget::{checkbox, column, progress_bar, radio, slider, text};
-use cosmic::iced::{Alignment, Length};
-use cosmic::iced_core::id;
-use cosmic::theme::ThemeType;
-use cosmic::widget::color_picker::ColorPickerUpdate;
-use cosmic::widget::{
- button, dropdown, icon, layer_container as container, segmented_button, segmented_control,
- settings, spin_button, tab_bar, toggler, ColorPickerModel,
+use cosmic::{
+ cosmic_theme,
+ iced::widget::{checkbox, column, progress_bar, radio, slider, text},
+ iced::{Alignment, Length},
+ iced_core::id,
+ theme::ThemeType,
+ widget::{
+ button, color_picker::ColorPickerUpdate, dropdown, icon, layer_container as container,
+ segmented_button, segmented_control, settings, spin_button, tab_bar, toggler,
+ ColorPickerModel,
+ },
+ Element,
};
-use cosmic::{cosmic_theme, Element};
use cosmic_time::{anim, chain, Timeline};
use fraction::{Decimal, ToPrimitive};
use once_cell::sync::Lazy;
diff --git a/examples/cosmic/src/window/desktop.rs b/examples/cosmic/src/window/desktop.rs
index a087de9..46a4e5b 100644
--- a/examples/cosmic/src/window/desktop.rs
+++ b/examples/cosmic/src/window/desktop.rs
@@ -1,7 +1,10 @@
-use cosmic::iced::widget::{column, container, horizontal_space, image, row, svg, text};
-use cosmic::iced::Length;
-use cosmic::widget::{list_column, settings, toggler};
-use cosmic::{theme, Element};
+use cosmic::{
+ iced::widget::{column, container, horizontal_space, image, row, svg, text},
+ iced::Length,
+ theme,
+ widget::{list_column, settings, toggler},
+ Element,
+};
use super::{Page, SubPage, Window};
diff --git a/examples/cosmic/src/window/system_and_accounts.rs b/examples/cosmic/src/window/system_and_accounts.rs
index 5f49885..ed1bd00 100644
--- a/examples/cosmic/src/window/system_and_accounts.rs
+++ b/examples/cosmic/src/window/system_and_accounts.rs
@@ -1,7 +1,9 @@
-use cosmic::iced::widget::{horizontal_space, row, text};
-use cosmic::iced::Length;
-use cosmic::widget::{icon, list_column, settings};
-use cosmic::Element;
+use cosmic::{
+ iced::widget::{horizontal_space, row, text},
+ iced::Length,
+ widget::{icon, list_column, settings},
+ Element,
+};
use super::{Message, Page, SubPage, Window};
diff --git a/examples/image-button/Cargo.toml b/examples/image-button/Cargo.toml
index 8bc521f..c219a53 100644
--- a/examples/image-button/Cargo.toml
+++ b/examples/image-button/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2021"
tracing = "0.1.44"
tracing-subscriber = "0.3.22"
-[dependencies.libcosmic-yoda]
+[dependencies.libcosmic]
path = "../../"
features = ["debug", "winit", "wgpu", "tokio"]
diff --git a/examples/menu/Cargo.toml b/examples/menu/Cargo.toml
index 047055e..430b26e 100644
--- a/examples/menu/Cargo.toml
+++ b/examples/menu/Cargo.toml
@@ -8,6 +8,6 @@ tracing = "0.1.44"
tracing-subscriber = "0.3.22"
tracing-log = "0.2.0"
-[dependencies.libcosmic-yoda]
+[dependencies.libcosmic]
path = "../../"
features = ["debug", "winit", "tokio", "xdg-portal", "wgpu"]
diff --git a/examples/menu/src/main.rs b/examples/menu/src/main.rs
index 900d032..da0c323 100644
--- a/examples/menu/src/main.rs
+++ b/examples/menu/src/main.rs
@@ -9,9 +9,11 @@ use std::{env, process};
use cosmic::app::{Core, Settings, Task};
use cosmic::iced::alignment::{Horizontal, Vertical};
use cosmic::iced::keyboard::Key;
-use cosmic::iced::{window, Length, Size};
+use cosmic::iced::window;
+use cosmic::iced::{Length, Size};
use cosmic::widget::menu::action::MenuAction;
-use cosmic::widget::menu::key_bind::{KeyBind, Modifier};
+use cosmic::widget::menu::key_bind::KeyBind;
+use cosmic::widget::menu::key_bind::Modifier;
use cosmic::widget::menu::{self, ItemHeight, ItemWidth};
use cosmic::widget::RcElementWrapper;
use cosmic::{executor, Element};
diff --git a/examples/multi-window/Cargo.toml b/examples/multi-window/Cargo.toml
index c38595f..0b5440f 100644
--- a/examples/multi-window/Cargo.toml
+++ b/examples/multi-window/Cargo.toml
@@ -6,4 +6,4 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
-libcosmic-yoda = { path = "../..", features = ["debug", "winit", "tokio", "single-instance", "wgpu", "wayland"] }
+libcosmic = { path = "../..", features = ["debug", "winit", "tokio", "single-instance", "wgpu", "wayland"] }
diff --git a/examples/multi-window/src/window.rs b/examples/multi-window/src/window.rs
index a6d40d3..754a0d8 100644
--- a/examples/multi-window/src/window.rs
+++ b/examples/multi-window/src/window.rs
@@ -1,11 +1,13 @@
use std::collections::HashMap;
-use cosmic::app::Core;
-use cosmic::iced::core::{id, Alignment, Length, Point};
-use cosmic::iced::widget::{column, container, scrollable, text};
-use cosmic::iced::{self, event, window, Subscription};
-use cosmic::prelude::*;
-use cosmic::widget::{button, header_bar};
+use cosmic::{
+ app::Core,
+ iced::core::{id, Alignment, Length, Point},
+ iced::widget::{column, container, scrollable, text},
+ iced::{self, event, window, Subscription},
+ prelude::*,
+ widget::{button, header_bar},
+};
#[derive(Debug, Clone, PartialEq)]
pub enum Message {
diff --git a/examples/nav-context/Cargo.toml b/examples/nav-context/Cargo.toml
index ea2bc2b..d829df0 100644
--- a/examples/nav-context/Cargo.toml
+++ b/examples/nav-context/Cargo.toml
@@ -8,6 +8,6 @@ tracing = "0.1.44"
tracing-subscriber = "0.3.22"
tracing-log = "0.2.0"
-[dependencies.libcosmic-yoda]
+[dependencies.libcosmic]
path = "../../"
features = ["debug", "winit", "tokio", "xdg-portal", "wgpu"]
diff --git a/examples/open-dialog/Cargo.toml b/examples/open-dialog/Cargo.toml
index b09b98c..9404927 100644
--- a/examples/open-dialog/Cargo.toml
+++ b/examples/open-dialog/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2021"
[features]
default = ["xdg-portal"]
-rfd = ["libcosmic-yoda/rfd"]
-xdg-portal = ["libcosmic-yoda/xdg-portal"]
+rfd = ["libcosmic/rfd"]
+xdg-portal = ["libcosmic/xdg-portal"]
[dependencies]
apply = "0.3.0"
@@ -15,6 +15,6 @@ tracing = "0.1.44"
tracing-subscriber = "0.3.22"
url = "2.5.8"
-[dependencies.libcosmic-yoda]
+[dependencies.libcosmic]
features = ["debug", "winit", "wgpu", "wayland", "tokio"]
path = "../../"
diff --git a/examples/spin-button/Cargo.toml b/examples/spin-button/Cargo.toml
index 082c0fd..a522050 100644
--- a/examples/spin-button/Cargo.toml
+++ b/examples/spin-button/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
[dependencies]
fraction = "0.15.3"
-[dependencies.libcosmic-yoda]
+[dependencies.libcosmic]
features = ["debug", "wgpu", "winit", "desktop", "tokio"]
path = "../.."
default-features = false
diff --git a/examples/spin-button/src/main.rs b/examples/spin-button/src/main.rs
index 0228291..47db4dc 100644
--- a/examples/spin-button/src/main.rs
+++ b/examples/spin-button/src/main.rs
@@ -1,8 +1,15 @@
-use cosmic::app::{Core, Task};
-use cosmic::iced::alignment::{Horizontal, Vertical};
-use cosmic::iced::{self, Alignment, Length, Size};
+use cosmic::iced::Length;
use cosmic::widget::{column, container, spin_button};
-use cosmic::{Application, Apply, Element};
+use cosmic::Apply;
+use cosmic::{
+ app::{Core, Task},
+ iced::{
+ self,
+ alignment::{Horizontal, Vertical},
+ Alignment, Size,
+ },
+ Application, Element,
+};
use fraction::Decimal;
pub struct SpinButtonExamplApp {
diff --git a/examples/subscriptions/Cargo.toml b/examples/subscriptions/Cargo.toml
index ae31a39..8eb69ff 100644
--- a/examples/subscriptions/Cargo.toml
+++ b/examples/subscriptions/Cargo.toml
@@ -5,6 +5,6 @@ edition = "2024"
[dependencies]
-[dependencies.libcosmic-yoda]
+[dependencies.libcosmic]
path = "../../"
features = ["debug", "winit", "wgpu", "tokio", "xdg-portal"]
diff --git a/examples/subscriptions/src/main.rs b/examples/subscriptions/src/main.rs
index 325af16..17e630a 100644
--- a/examples/subscriptions/src/main.rs
+++ b/examples/subscriptions/src/main.rs
@@ -5,8 +5,7 @@
use cosmic::app::{Core, Settings, Task};
use cosmic::iced::Subscription;
-use cosmic::prelude::*;
-use cosmic::{executor, widget};
+use cosmic::{executor, prelude::*, widget};
/// Runs application with these settings
fn main() -> Result<(), Box> {
diff --git a/examples/table-view/Cargo.toml b/examples/table-view/Cargo.toml
index 8f71e5b..8ed4592 100644
--- a/examples/table-view/Cargo.toml
+++ b/examples/table-view/Cargo.toml
@@ -9,6 +9,6 @@ tracing-subscriber = "0.3.22"
tracing-log = "0.2.0"
chrono = "*"
-[dependencies.libcosmic-yoda]
+[dependencies.libcosmic]
features = ["debug", "wgpu", "winit", "desktop", "tokio"]
path = "../.."
diff --git a/examples/table-view/src/main.rs b/examples/table-view/src/main.rs
index e518b3c..d247842 100644
--- a/examples/table-view/src/main.rs
+++ b/examples/table-view/src/main.rs
@@ -9,7 +9,8 @@ use chrono::Datelike;
use cosmic::app::{Core, Settings, Task};
use cosmic::iced::Size;
use cosmic::prelude::*;
-use cosmic::widget::{self, nav_bar, table};
+use cosmic::widget::table;
+use cosmic::widget::{self, nav_bar};
use cosmic::{executor, iced};
#[derive(Debug, Default, PartialEq, Eq, Clone, Copy, Hash)]
diff --git a/examples/text-input/Cargo.toml b/examples/text-input/Cargo.toml
index 69bd2a1..fe6105c 100644
--- a/examples/text-input/Cargo.toml
+++ b/examples/text-input/Cargo.toml
@@ -8,6 +8,6 @@ tracing = "0.1.44"
tracing-subscriber = "0.3.22"
tracing-log = "0.2.0"
-[dependencies.libcosmic-yoda]
+[dependencies.libcosmic]
path = "../../"
features = ["debug", "winit", "wgpu", "tokio", "xdg-portal"]
diff --git a/i18n/lo/libcosmic.ftl b/i18n/af/libcosmic.ftl
similarity index 100%
rename from i18n/lo/libcosmic.ftl
rename to i18n/af/libcosmic.ftl
diff --git a/i18n/ar/libcosmic_yoda.ftl b/i18n/ar/libcosmic.ftl
similarity index 100%
rename from i18n/ar/libcosmic_yoda.ftl
rename to i18n/ar/libcosmic.ftl
diff --git a/i18n/be/libcosmic_yoda.ftl b/i18n/be/libcosmic.ftl
similarity index 100%
rename from i18n/be/libcosmic_yoda.ftl
rename to i18n/be/libcosmic.ftl
diff --git a/i18n/bg/libcosmic_yoda.ftl b/i18n/bg/libcosmic.ftl
similarity index 100%
rename from i18n/bg/libcosmic_yoda.ftl
rename to i18n/bg/libcosmic.ftl
diff --git a/i18n/af/libcosmic_yoda.ftl b/i18n/bn/libcosmic.ftl
similarity index 100%
rename from i18n/af/libcosmic_yoda.ftl
rename to i18n/bn/libcosmic.ftl
diff --git a/i18n/bn/libcosmic_yoda.ftl b/i18n/ca/libcosmic.ftl
similarity index 100%
rename from i18n/bn/libcosmic_yoda.ftl
rename to i18n/ca/libcosmic.ftl
diff --git a/i18n/cs/libcosmic_yoda.ftl b/i18n/cs/libcosmic.ftl
similarity index 100%
rename from i18n/cs/libcosmic_yoda.ftl
rename to i18n/cs/libcosmic.ftl
diff --git a/i18n/ca/libcosmic_yoda.ftl b/i18n/da/libcosmic.ftl
similarity index 100%
rename from i18n/ca/libcosmic_yoda.ftl
rename to i18n/da/libcosmic.ftl
diff --git a/i18n/de/libcosmic_yoda.ftl b/i18n/de/libcosmic.ftl
similarity index 100%
rename from i18n/de/libcosmic_yoda.ftl
rename to i18n/de/libcosmic.ftl
diff --git a/i18n/da/libcosmic_yoda.ftl b/i18n/el/libcosmic.ftl
similarity index 100%
rename from i18n/da/libcosmic_yoda.ftl
rename to i18n/el/libcosmic.ftl
diff --git a/i18n/el/libcosmic_yoda.ftl b/i18n/el/libcosmic_yoda.ftl
deleted file mode 100644
index f4fe0b3..0000000
--- a/i18n/el/libcosmic_yoda.ftl
+++ /dev/null
@@ -1,34 +0,0 @@
-close = Κλείσιμο
-february = Φεβρουάριος { $year }
-documenters = Τεκμηριωτές
-november = Νοέμβριος { $year }
-may = Μάιος { $year }
-april = Απρίλιος { $year }
-translators = Μεταφραστές
-artists = Καλλιτέχνες
-license = Άδεια χρήσης
-december = Δεκέμβριος { $year }
-links = Σύνδεσμοι
-march = Μάρτιος { $year }
-june = Ιούνιος { $year }
-august = Αύγουστος { $year }
-developers = Προγραμματιστές
-july = Ιούλιος { $year }
-september = Σεπτέμβριος { $year }
-designers = Σχεδιαστές
-october = Οκτώβριος { $year }
-january = Ιανουάριος { $year }
-monday = Δευτέρα
-mon = Δευ
-tuesday = Τρίτη
-tue = Τρί
-wednesday = Τετάρτη
-wed = Τετ
-thursday = Πέμπτη
-thu = Πέμ
-friday = Παρασκευή
-fri = Παρ
-saturday = Σάββατο
-sat = Σάβ
-sunday = Κυριακή
-sun = Κυρ
diff --git a/i18n/en-GB/libcosmic_yoda.ftl b/i18n/en-GB/libcosmic.ftl
similarity index 100%
rename from i18n/en-GB/libcosmic_yoda.ftl
rename to i18n/en-GB/libcosmic.ftl
diff --git a/i18n/en/libcosmic_yoda.ftl b/i18n/en/libcosmic.ftl
similarity index 100%
rename from i18n/en/libcosmic_yoda.ftl
rename to i18n/en/libcosmic.ftl
diff --git a/i18n/eo/libcosmic_yoda.ftl b/i18n/eo/libcosmic.ftl
similarity index 100%
rename from i18n/eo/libcosmic_yoda.ftl
rename to i18n/eo/libcosmic.ftl
diff --git a/i18n/es-419/libcosmic_yoda.ftl b/i18n/es-419/libcosmic.ftl
similarity index 100%
rename from i18n/es-419/libcosmic_yoda.ftl
rename to i18n/es-419/libcosmic.ftl
diff --git a/i18n/es-MX/libcosmic_yoda.ftl b/i18n/es-MX/libcosmic.ftl
similarity index 100%
rename from i18n/es-MX/libcosmic_yoda.ftl
rename to i18n/es-MX/libcosmic.ftl
diff --git a/i18n/es/libcosmic_yoda.ftl b/i18n/es/libcosmic.ftl
similarity index 100%
rename from i18n/es/libcosmic_yoda.ftl
rename to i18n/es/libcosmic.ftl
diff --git a/i18n/et/libcosmic_yoda.ftl b/i18n/et/libcosmic.ftl
similarity index 100%
rename from i18n/et/libcosmic_yoda.ftl
rename to i18n/et/libcosmic.ftl
diff --git a/i18n/eu/libcosmic_yoda.ftl b/i18n/eu/libcosmic.ftl
similarity index 100%
rename from i18n/eu/libcosmic_yoda.ftl
rename to i18n/eu/libcosmic.ftl
diff --git a/i18n/fa/libcosmic_yoda.ftl b/i18n/fa/libcosmic.ftl
similarity index 100%
rename from i18n/fa/libcosmic_yoda.ftl
rename to i18n/fa/libcosmic.ftl
diff --git a/i18n/fi/libcosmic_yoda.ftl b/i18n/fi/libcosmic.ftl
similarity index 100%
rename from i18n/fi/libcosmic_yoda.ftl
rename to i18n/fi/libcosmic.ftl
diff --git a/i18n/fr/libcosmic_yoda.ftl b/i18n/fr/libcosmic.ftl
similarity index 100%
rename from i18n/fr/libcosmic_yoda.ftl
rename to i18n/fr/libcosmic.ftl
diff --git a/i18n/fy/libcosmic_yoda.ftl b/i18n/fy/libcosmic.ftl
similarity index 100%
rename from i18n/fy/libcosmic_yoda.ftl
rename to i18n/fy/libcosmic.ftl
diff --git a/i18n/ga/libcosmic_yoda.ftl b/i18n/ga/libcosmic.ftl
similarity index 100%
rename from i18n/ga/libcosmic_yoda.ftl
rename to i18n/ga/libcosmic.ftl
diff --git a/i18n/gd/libcosmic_yoda.ftl b/i18n/gd/libcosmic.ftl
similarity index 100%
rename from i18n/gd/libcosmic_yoda.ftl
rename to i18n/gd/libcosmic.ftl
diff --git a/i18n/gu/libcosmic_yoda.ftl b/i18n/gu/libcosmic.ftl
similarity index 100%
rename from i18n/gu/libcosmic_yoda.ftl
rename to i18n/gu/libcosmic.ftl
diff --git a/i18n/he/libcosmic_yoda.ftl b/i18n/he/libcosmic.ftl
similarity index 100%
rename from i18n/he/libcosmic_yoda.ftl
rename to i18n/he/libcosmic.ftl
diff --git a/i18n/hi/libcosmic_yoda.ftl b/i18n/hi/libcosmic.ftl
similarity index 100%
rename from i18n/hi/libcosmic_yoda.ftl
rename to i18n/hi/libcosmic.ftl
diff --git a/i18n/hr/libcosmic_yoda.ftl b/i18n/hr/libcosmic.ftl
similarity index 100%
rename from i18n/hr/libcosmic_yoda.ftl
rename to i18n/hr/libcosmic.ftl
diff --git a/i18n/hu/libcosmic_yoda.ftl b/i18n/hu/libcosmic.ftl
similarity index 100%
rename from i18n/hu/libcosmic_yoda.ftl
rename to i18n/hu/libcosmic.ftl
diff --git a/i18n/id/libcosmic_yoda.ftl b/i18n/id/libcosmic.ftl
similarity index 100%
rename from i18n/id/libcosmic_yoda.ftl
rename to i18n/id/libcosmic.ftl
diff --git a/i18n/ie/libcosmic_yoda.ftl b/i18n/ie/libcosmic.ftl
similarity index 100%
rename from i18n/ie/libcosmic_yoda.ftl
rename to i18n/ie/libcosmic.ftl
diff --git a/i18n/is/libcosmic_yoda.ftl b/i18n/is/libcosmic.ftl
similarity index 100%
rename from i18n/is/libcosmic_yoda.ftl
rename to i18n/is/libcosmic.ftl
diff --git a/i18n/it/libcosmic_yoda.ftl b/i18n/it/libcosmic.ftl
similarity index 100%
rename from i18n/it/libcosmic_yoda.ftl
rename to i18n/it/libcosmic.ftl
diff --git a/i18n/ja/libcosmic_yoda.ftl b/i18n/ja/libcosmic.ftl
similarity index 100%
rename from i18n/ja/libcosmic_yoda.ftl
rename to i18n/ja/libcosmic.ftl
diff --git a/i18n/jv/libcosmic_yoda.ftl b/i18n/jv/libcosmic.ftl
similarity index 100%
rename from i18n/jv/libcosmic_yoda.ftl
rename to i18n/jv/libcosmic.ftl
diff --git a/i18n/ka/libcosmic_yoda.ftl b/i18n/ka/libcosmic.ftl
similarity index 100%
rename from i18n/ka/libcosmic_yoda.ftl
rename to i18n/ka/libcosmic.ftl
diff --git a/i18n/kab/libcosmic_yoda.ftl b/i18n/kab/libcosmic.ftl
similarity index 100%
rename from i18n/kab/libcosmic_yoda.ftl
rename to i18n/kab/libcosmic.ftl
diff --git a/i18n/kk/libcosmic_yoda.ftl b/i18n/kk/libcosmic.ftl
similarity index 100%
rename from i18n/kk/libcosmic_yoda.ftl
rename to i18n/kk/libcosmic.ftl
diff --git a/i18n/kmr/libcosmic_yoda.ftl b/i18n/kmr/libcosmic.ftl
similarity index 100%
rename from i18n/kmr/libcosmic_yoda.ftl
rename to i18n/kmr/libcosmic.ftl
diff --git a/i18n/kn/libcosmic_yoda.ftl b/i18n/kn/libcosmic.ftl
similarity index 100%
rename from i18n/kn/libcosmic_yoda.ftl
rename to i18n/kn/libcosmic.ftl
diff --git a/i18n/ko/libcosmic_yoda.ftl b/i18n/ko/libcosmic.ftl
similarity index 100%
rename from i18n/ko/libcosmic_yoda.ftl
rename to i18n/ko/libcosmic.ftl
diff --git a/i18n/li/libcosmic_yoda.ftl b/i18n/li/libcosmic.ftl
similarity index 100%
rename from i18n/li/libcosmic_yoda.ftl
rename to i18n/li/libcosmic.ftl
diff --git a/i18n/lt/libcosmic_yoda.ftl b/i18n/lt/libcosmic.ftl
similarity index 100%
rename from i18n/lt/libcosmic_yoda.ftl
rename to i18n/lt/libcosmic.ftl
diff --git a/i18n/ml/libcosmic_yoda.ftl b/i18n/ml/libcosmic.ftl
similarity index 100%
rename from i18n/ml/libcosmic_yoda.ftl
rename to i18n/ml/libcosmic.ftl
diff --git a/i18n/ms/libcosmic_yoda.ftl b/i18n/ms/libcosmic.ftl
similarity index 100%
rename from i18n/ms/libcosmic_yoda.ftl
rename to i18n/ms/libcosmic.ftl
diff --git a/i18n/nb-NO/libcosmic_yoda.ftl b/i18n/nb-NO/libcosmic.ftl
similarity index 100%
rename from i18n/nb-NO/libcosmic_yoda.ftl
rename to i18n/nb-NO/libcosmic.ftl
diff --git a/i18n/nl/libcosmic_yoda.ftl b/i18n/nl/libcosmic.ftl
similarity index 100%
rename from i18n/nl/libcosmic_yoda.ftl
rename to i18n/nl/libcosmic.ftl
diff --git a/i18n/nn/libcosmic_yoda.ftl b/i18n/nn/libcosmic.ftl
similarity index 100%
rename from i18n/nn/libcosmic_yoda.ftl
rename to i18n/nn/libcosmic.ftl
diff --git a/i18n/oc/libcosmic_yoda.ftl b/i18n/oc/libcosmic.ftl
similarity index 100%
rename from i18n/oc/libcosmic_yoda.ftl
rename to i18n/oc/libcosmic.ftl
diff --git a/i18n/pa/libcosmic_yoda.ftl b/i18n/pa/libcosmic.ftl
similarity index 100%
rename from i18n/pa/libcosmic_yoda.ftl
rename to i18n/pa/libcosmic.ftl
diff --git a/i18n/pl/libcosmic_yoda.ftl b/i18n/pl/libcosmic.ftl
similarity index 100%
rename from i18n/pl/libcosmic_yoda.ftl
rename to i18n/pl/libcosmic.ftl
diff --git a/i18n/pt-BR/libcosmic_yoda.ftl b/i18n/pt-BR/libcosmic.ftl
similarity index 100%
rename from i18n/pt-BR/libcosmic_yoda.ftl
rename to i18n/pt-BR/libcosmic.ftl
diff --git a/i18n/pt/libcosmic_yoda.ftl b/i18n/pt/libcosmic.ftl
similarity index 100%
rename from i18n/pt/libcosmic_yoda.ftl
rename to i18n/pt/libcosmic.ftl
diff --git a/i18n/ro/libcosmic_yoda.ftl b/i18n/ro/libcosmic.ftl
similarity index 100%
rename from i18n/ro/libcosmic_yoda.ftl
rename to i18n/ro/libcosmic.ftl
diff --git a/i18n/ru/libcosmic_yoda.ftl b/i18n/ru/libcosmic.ftl
similarity index 100%
rename from i18n/ru/libcosmic_yoda.ftl
rename to i18n/ru/libcosmic.ftl
diff --git a/i18n/sk/libcosmic_yoda.ftl b/i18n/sk/libcosmic.ftl
similarity index 100%
rename from i18n/sk/libcosmic_yoda.ftl
rename to i18n/sk/libcosmic.ftl
diff --git a/i18n/sl/libcosmic_yoda.ftl b/i18n/sl/libcosmic.ftl
similarity index 100%
rename from i18n/sl/libcosmic_yoda.ftl
rename to i18n/sl/libcosmic.ftl
diff --git a/i18n/sr-Cyrl/libcosmic_yoda.ftl b/i18n/sr-Cyrl/libcosmic.ftl
similarity index 100%
rename from i18n/sr-Cyrl/libcosmic_yoda.ftl
rename to i18n/sr-Cyrl/libcosmic.ftl
diff --git a/i18n/sr-Latn/libcosmic_yoda.ftl b/i18n/sr-Latn/libcosmic.ftl
similarity index 100%
rename from i18n/sr-Latn/libcosmic_yoda.ftl
rename to i18n/sr-Latn/libcosmic.ftl
diff --git a/i18n/ta/libcosmic_yoda.ftl b/i18n/sr/libcosmic.ftl
similarity index 100%
rename from i18n/ta/libcosmic_yoda.ftl
rename to i18n/sr/libcosmic.ftl
diff --git a/i18n/sr/libcosmic_yoda.ftl b/i18n/sr/libcosmic_yoda.ftl
deleted file mode 100644
index e8b8830..0000000
--- a/i18n/sr/libcosmic_yoda.ftl
+++ /dev/null
@@ -1,34 +0,0 @@
-close = Затвори
-february = Фебруар { $year }
-documenters = Документатори
-november = Новембар { $year }
-may = Мај { $year }
-april = Април { $year }
-translators = Преводиоци
-artists = Уметници
-license = Дозвола
-december = Децембар { $year }
-links = Везе
-march = Март { $year }
-june = Јун { $year }
-august = Август { $year }
-developers = Програмери
-july = Јул { $year }
-september = Септембар { $year }
-designers = Дизајнери
-october = Октобар { $year }
-january = Јануар { $year }
-monday = Понедељак
-mon = Пон
-tuesday = Уторак
-tue = Уто
-wednesday = Среда
-wed = Сре
-thursday = Четвртак
-thu = Чет
-friday = Петак
-fri = Пет
-saturday = Субота
-sat = Суб
-sunday = Недеља
-sun = Нед
diff --git a/i18n/sv/libcosmic_yoda.ftl b/i18n/sv/libcosmic.ftl
similarity index 100%
rename from i18n/sv/libcosmic_yoda.ftl
rename to i18n/sv/libcosmic.ftl
diff --git a/i18n/th/libcosmic_yoda.ftl b/i18n/ta/libcosmic.ftl
similarity index 100%
rename from i18n/th/libcosmic_yoda.ftl
rename to i18n/ta/libcosmic.ftl
diff --git a/i18n/ti/libcosmic_yoda.ftl b/i18n/th/libcosmic.ftl
similarity index 100%
rename from i18n/ti/libcosmic_yoda.ftl
rename to i18n/th/libcosmic.ftl
diff --git a/i18n/uz/libcosmic_yoda.ftl b/i18n/ti/libcosmic.ftl
similarity index 100%
rename from i18n/uz/libcosmic_yoda.ftl
rename to i18n/ti/libcosmic.ftl
diff --git a/i18n/tr/libcosmic_yoda.ftl b/i18n/tr/libcosmic.ftl
similarity index 100%
rename from i18n/tr/libcosmic_yoda.ftl
rename to i18n/tr/libcosmic.ftl
diff --git a/i18n/uk/libcosmic_yoda.ftl b/i18n/uk/libcosmic.ftl
similarity index 100%
rename from i18n/uk/libcosmic_yoda.ftl
rename to i18n/uk/libcosmic.ftl
diff --git a/i18n/vi/libcosmic_yoda.ftl b/i18n/uz/libcosmic.ftl
similarity index 100%
rename from i18n/vi/libcosmic_yoda.ftl
rename to i18n/uz/libcosmic.ftl
diff --git a/i18n/yue-Hant/libcosmic_yoda.ftl b/i18n/vi/libcosmic.ftl
similarity index 100%
rename from i18n/yue-Hant/libcosmic_yoda.ftl
rename to i18n/vi/libcosmic.ftl
diff --git a/i18n/yue-Hant/libcosmic.ftl b/i18n/yue-Hant/libcosmic.ftl
new file mode 100644
index 0000000..e69de29
diff --git a/i18n/zh-Hans/libcosmic_yoda.ftl b/i18n/zh-Hans/libcosmic.ftl
similarity index 100%
rename from i18n/zh-Hans/libcosmic_yoda.ftl
rename to i18n/zh-Hans/libcosmic.ftl
diff --git a/i18n/zh-Hant/libcosmic_yoda.ftl b/i18n/zh-Hant/libcosmic.ftl
similarity index 100%
rename from i18n/zh-Hant/libcosmic_yoda.ftl
rename to i18n/zh-Hant/libcosmic.ftl
diff --git a/iced b/iced
index de12471..78caabb 160000
--- a/iced
+++ b/iced
@@ -1 +1 @@
-Subproject commit de1247123a631087d2f78831c99f5f1b66d5a582
+Subproject commit 78caabba7ef91cd1030da6f70b41d266704ffece
diff --git a/rustfmt.toml b/rustfmt.toml
deleted file mode 100644
index c1578aa..0000000
--- a/rustfmt.toml
+++ /dev/null
@@ -1 +0,0 @@
-imports_granularity = "Module"
diff --git a/src/action.rs b/src/action.rs
index 19e228b..b716289 100644
--- a/src/action.rs
+++ b/src/action.rs
@@ -1,6 +1,7 @@
// Copyright 2023 System76
// SPDX-License-Identifier: MPL-2.0
+#[cfg(feature = "winit")]
use crate::app;
#[cfg(feature = "single-instance")]
use crate::dbus_activation;
@@ -8,6 +9,7 @@ use crate::dbus_activation;
pub const fn app(message: M) -> Action {
Action::App(message)
}
+#[cfg(feature = "winit")]
pub const fn cosmic(message: app::Action) -> Action {
Action::Cosmic(message)
}
@@ -21,6 +23,7 @@ pub const fn none() -> Action {
pub enum Action {
/// Messages from the application, for the application.
App(M),
+ #[cfg(feature = "winit")]
/// Internal messages to be handled by libcosmic.
Cosmic(app::Action),
#[cfg(feature = "single-instance")]
diff --git a/src/app/action.rs b/src/app/action.rs
index 166df16..fb982ac 100644
--- a/src/app/action.rs
+++ b/src/app/action.rs
@@ -1,10 +1,10 @@
// Copyright 2023 System76
// SPDX-License-Identifier: MPL-2.0
-use crate::config::CosmicTk;
+use crate::surface;
use crate::theme::Theme;
use crate::widget::nav_bar;
-use crate::{keyboard_nav, surface};
+use crate::{config::CosmicTk, keyboard_nav};
#[cfg(all(feature = "wayland", target_os = "linux"))]
use cctk::sctk::reexports::csd_frame::{WindowManagerCapabilities, WindowState};
use cosmic_theme::ThemeMode;
diff --git a/src/app/cosmic.rs b/src/app/cosmic.rs
index 86af099..030ed04 100644
--- a/src/app/cosmic.rs
+++ b/src/app/cosmic.rs
@@ -100,10 +100,9 @@ impl Cosmic
where
T::Message: Send + 'static,
{
- pub fn init((core, flags): (Core, T::Flags)) -> (Self, iced::Task>) {
- #[cfg(all(feature = "dbus-config", target_os = "linux"))]
- let mut core = core;
-
+ pub fn init(
+ (mut core, flags): (Core, T::Flags),
+ ) -> (Self, iced::Task>) {
#[cfg(all(feature = "dbus-config", target_os = "linux"))]
{
use iced_futures::futures::executor::block_on;
@@ -365,6 +364,7 @@ where
crate::surface::Action::Task(f) => {
f().map(|sm| crate::Action::Cosmic(Action::Surface(sm)))
}
+ _ => iced::Task::none(),
}
#[cfg(not(feature = "surface-message"))]
@@ -408,7 +408,7 @@ where
f64::from(self.app.core().scale_factor())
}
- pub fn style(&self, _theme: &Theme) -> theme::Style {
+ pub fn style(&self, theme: &Theme) -> theme::Style {
if let Some(style) = self.app.style() {
style
} else if self.app.core().window.is_maximized {
@@ -480,11 +480,12 @@ where
.into_iter()
.filter(cosmic_config::Error::is_err)
{
- if let cosmic_config::Error::GetKey(_, err) = &why
- && err.kind() == std::io::ErrorKind::NotFound {
+ if let cosmic_config::Error::GetKey(_, err) = &why {
+ if err.kind() == std::io::ErrorKind::NotFound {
// No system default config installed; don't error
continue;
}
+ }
tracing::error!(?why, "cosmic toolkit config update error");
}
@@ -620,15 +621,15 @@ impl Cosmic {
#[allow(clippy::too_many_lines)]
fn cosmic_update(&mut self, message: Action) -> iced::Task> {
match message {
- Action::WindowMaximized(_id, _maximized) => {
+ Action::WindowMaximized(id, maximized) => {
#[cfg(not(all(feature = "wayland", target_os = "linux")))]
if self
.app
.core()
.main_window_id()
- .is_some_and(|main_id| main_id == _id)
+ .is_some_and(|main_id| main_id == id)
{
- self.app.core_mut().window.sharp_corners = _maximized;
+ self.app.core_mut().window.sharp_corners = maximized;
}
}
diff --git a/src/app/mod.rs b/src/app/mod.rs
index b2d82dc..f78beac 100644
--- a/src/app/mod.rs
+++ b/src/app/mod.rs
@@ -22,11 +22,11 @@ use crate::prelude::*;
use crate::theme::THEME;
use crate::widget::{container, id_container, menu, nav_bar, popover, space};
use apply::Apply;
-use iced::{Length, Subscription, theme, window};
+use iced::{Length, Subscription};
+use iced::{theme, window};
pub use settings::Settings;
use std::borrow::Cow;
-use std::cell::RefCell;
-use std::rc::Rc;
+use std::{cell::RefCell, rc::Rc};
#[cold]
pub(crate) fn iced_settings(
@@ -136,7 +136,7 @@ pub fn run(settings: Settings, flags: App::Flags) -> iced::Res
crate::malloc::limit_mmap_threshold(threshold);
}
- let _default_font = settings.default_font;
+ let default_font = settings.default_font;
let (settings, (mut core, flags), window_settings) = iced_settings::(settings, flags);
#[cfg(not(feature = "multi-window"))]
{
@@ -284,7 +284,7 @@ where
// app = app.window(window_settings);
core.main_window = Some(iced_core::window::Id::RESERVED);
}
- let app = iced::daemon(
+ let mut app = iced::daemon(
BootData(Rc::new(RefCell::new(Some(BootDataInner:: {
flags,
core,
@@ -773,6 +773,7 @@ impl ApplicationExt for App {
.focused(focused)
.maximized(maximized)
.sharp_corners(sharp_corners)
+ .transparent(content_container)
.title(&core.window.header_title)
.on_drag(crate::Action::Cosmic(Action::Drag))
.on_right_click(crate::Action::Cosmic(Action::ShowWindowMenu))
diff --git a/src/applet/column.rs b/src/applet/column.rs
index 1ec9c73..9657b56 100644
--- a/src/applet/column.rs
+++ b/src/applet/column.rs
@@ -2,10 +2,14 @@
use crate::iced;
use iced::core::alignment::{self, Alignment};
use iced::core::event::{self, Event};
+use iced::core::layout;
+use iced::core::mouse;
+use iced::core::overlay;
+use iced::core::renderer;
use iced::core::widget::{Operation, Tree};
use iced::core::{
Clipboard, Element, Layout, Length, Padding, Pixels, Rectangle, Shell, Size, Vector, Widget,
- layout, mouse, overlay, renderer, widget,
+ widget,
};
/// A container that distributes its contents vertically.
diff --git a/src/applet/mod.rs b/src/applet/mod.rs
index e16b030..48721e1 100644
--- a/src/applet/mod.rs
+++ b/src/applet/mod.rs
@@ -1,31 +1,37 @@
#[cfg(feature = "applet-token")]
pub mod token;
-use crate::app::{BootData, BootDataInner, cosmic, iced_settings};
-use crate::cctk::sctk;
-use crate::theme::{self, Button, THEME, system_dark, system_light};
-use crate::widget::autosize::{self, Autosize, autosize};
-use crate::widget::column::Column;
-use crate::widget::row::Row;
-use crate::widget::space::{horizontal, vertical};
-use crate::widget::{self, layer_container};
-use crate::{Application, Element, Renderer};
+use crate::app::{BootData, BootDataInner, cosmic};
+use crate::{
+ Application, Element, Renderer,
+ app::iced_settings,
+ cctk::sctk,
+ theme::{self, Button, THEME, system_dark, system_light},
+ widget::{
+ self,
+ autosize::{self, Autosize, autosize},
+ column::Column,
+ layer_container,
+ row::Row,
+ space::horizontal,
+ space::vertical,
+ },
+};
pub use cosmic_panel_config;
use cosmic_panel_config::{CosmicPanelBackground, PanelAnchor, PanelSize};
-use iced::alignment::{Alignment, Horizontal, Vertical};
-use iced::widget::Container;
-use iced::{self, Color, Length, Limits, Rectangle, window};
+use iced::{
+ self, Color, Length, Limits, Rectangle,
+ alignment::{Alignment, Horizontal, Vertical},
+ widget::Container,
+ window,
+};
use iced_core::{Padding, Shadow};
use iced_runtime::platform_specific::wayland::popup::{SctkPopupSettings, SctkPositioner};
use iced_widget::Text;
use sctk::reexports::protocols::xdg::shell::client::xdg_positioner::{Anchor, Gravity};
-use std::borrow::Cow;
use std::cell::RefCell;
-use std::num::NonZeroU32;
-use std::rc::Rc;
-use std::sync::LazyLock;
-use std::time::Duration;
+use std::{borrow::Cow, num::NonZeroU32, rc::Rc, sync::LazyLock, time::Duration};
use tracing::info;
pub mod column;
diff --git a/src/applet/row.rs b/src/applet/row.rs
index 888c68e..a6745d1 100644
--- a/src/applet/row.rs
+++ b/src/applet/row.rs
@@ -1,13 +1,16 @@
//! Distribute content horizontally.
use crate::iced;
use iced::core::alignment::{self, Alignment};
-use iced::core::event::Event;
+use iced::core::event::{self, Event};
use iced::core::layout::{self, Layout};
+use iced::core::mouse;
+use iced::core::overlay;
+use iced::core::renderer;
use iced::core::widget::{Operation, Tree};
use iced::core::{
- Clipboard, Element, Length, Padding, Pixels, Rectangle, Shell, Size, Vector, Widget, mouse,
- overlay, renderer, widget,
+ Clipboard, Element, Length, Padding, Pixels, Rectangle, Shell, Size, Vector, Widget, widget,
};
+use iced::touch;
/// A container that distributes its contents horizontally.
///
diff --git a/src/applet/token/subscription.rs b/src/applet/token/subscription.rs
index 64be0ce..07c528e 100644
--- a/src/applet/token/subscription.rs
+++ b/src/applet/token/subscription.rs
@@ -1,12 +1,13 @@
use crate::iced;
use cctk::sctk::reexports::calloop;
-use futures::channel::mpsc::{UnboundedReceiver, unbounded};
-use futures::{SinkExt, StreamExt};
+use futures::{
+ SinkExt, StreamExt,
+ channel::mpsc::{UnboundedReceiver, unbounded},
+};
use iced::Subscription;
-use iced_futures::{futures, stream};
-use std::fmt::Debug;
-use std::hash::Hash;
-use std::thread::JoinHandle;
+use iced_futures::futures;
+use iced_futures::stream;
+use std::{fmt::Debug, hash::Hash, thread::JoinHandle};
use super::wayland_handler::wayland_handler;
diff --git a/src/applet/token/wayland_handler.rs b/src/applet/token/wayland_handler.rs
index 3bbaf57..3db84fc 100644
--- a/src/applet/token/wayland_handler.rs
+++ b/src/applet/token/wayland_handler.rs
@@ -1,20 +1,27 @@
-use std::os::fd::{FromRawFd, RawFd};
-use std::os::unix::net::UnixStream;
+use std::os::{
+ fd::{FromRawFd, RawFd},
+ unix::net::UnixStream,
+};
use super::subscription::{TokenRequest, TokenUpdate};
-use cctk::sctk::activation::{RequestData, RequestDataExt};
-use cctk::sctk::reexports::calloop;
-use cctk::sctk::reexports::calloop_wayland_source::WaylandSource;
-use cctk::sctk::seat::{SeatHandler, SeatState};
-use cctk::sctk::{self};
-use cctk::wayland_client::protocol::wl_seat::WlSeat;
-use cctk::wayland_client::protocol::wl_surface::WlSurface;
-use cctk::wayland_client::{self};
+use cctk::{
+ sctk::{
+ self,
+ activation::{RequestData, RequestDataExt},
+ reexports::{calloop, calloop_wayland_source::WaylandSource},
+ seat::{SeatHandler, SeatState},
+ },
+ wayland_client::{
+ self,
+ protocol::{wl_seat::WlSeat, wl_surface::WlSurface},
+ },
+};
use iced_futures::futures::channel::mpsc::UnboundedSender;
-use sctk::activation::{ActivationHandler, ActivationState};
-use sctk::registry::{ProvidesRegistryState, RegistryState};
-use wayland_client::globals::registry_queue_init;
-use wayland_client::{Connection, QueueHandle};
+use sctk::{
+ activation::{ActivationHandler, ActivationState},
+ registry::{ProvidesRegistryState, RegistryState},
+};
+use wayland_client::{Connection, QueueHandle, globals::registry_queue_init};
struct AppData {
exit: bool,
@@ -164,18 +171,7 @@ pub(crate) fn wayland_handler(
if app_data.exit {
break;
}
-
- if let Err(why) = event_loop.dispatch(None, &mut app_data) {
- if let calloop::Error::IoError(ref why) = why
- && why.kind() == std::io::ErrorKind::BrokenPipe
- {
- tracing::info!("Connection to panel has ended. The applet will now exit with it.");
- break;
- }
-
- tracing::error!(?why, "dispatch error on Wayland connection to panel");
- break;
- }
+ event_loop.dispatch(None, &mut app_data).unwrap();
}
}
diff --git a/src/command.rs b/src/command.rs
index c5c1c62..1d6f635 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -27,10 +27,12 @@ pub fn set_title(id: window::Id, title: String) -> iced::Task(factor: f32) -> iced::Task> {
iced::Task::done(crate::app::Action::ScaleFactor(factor)).map(crate::Action::Cosmic)
}
+#[cfg(feature = "winit")]
pub fn set_theme(theme: crate::Theme) -> iced::Task> {
iced::Task::done(crate::app::Action::AppThemeChange(theme)).map(crate::Action::Cosmic)
}
diff --git a/src/config/mod.rs b/src/config/mod.rs
index 08a4c0c..9807961 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -4,7 +4,6 @@
//! Configurations available to libcosmic applications.
use crate::cosmic_theme::Density;
-use crate::widget::WindowControlsPosition;
use cosmic_config::cosmic_config_derive::CosmicConfigEntry;
use cosmic_config::{Config, CosmicConfigEntry};
use serde::{Deserialize, Serialize};
@@ -23,11 +22,12 @@ pub static COSMIC_TK: LazyLock> = LazyLock::new(|| {
.map(|c| {
CosmicTk::get_entry(&c).unwrap_or_else(|(errors, mode)| {
for why in errors.into_iter().filter(cosmic_config::Error::is_err) {
- if let cosmic_config::Error::GetKey(_, err) = &why
- && err.kind() == std::io::ErrorKind::NotFound {
+ if let cosmic_config::Error::GetKey(_, err) = &why {
+ if err.kind() == std::io::ErrorKind::NotFound {
// No system default config installed; don't error
continue;
}
+ }
tracing::error!(?why, "CosmicTk config entry error");
}
mode
@@ -67,12 +67,6 @@ pub fn header_size() -> Density {
COSMIC_TK.read().unwrap().header_size
}
-/// Position of the window control buttons (close / minimize / maximize).
-#[allow(clippy::missing_panics_doc)]
-pub fn window_controls_position() -> WindowControlsPosition {
- COSMIC_TK.read().unwrap().window_controls_position
-}
-
/// Interface density.
#[allow(clippy::missing_panics_doc)]
pub fn interface_density() -> Density {
@@ -115,10 +109,6 @@ pub struct CosmicTk {
/// Mono font family
pub monospace_font: FontConfig,
-
- /// Side on which window control buttons (close / minimize / maximize)
- /// are placed. `End` = right (Linux / GNOME), `Start` = left (macOS).
- pub window_controls_position: WindowControlsPosition,
}
impl Default for CosmicTk {
@@ -142,7 +132,6 @@ impl Default for CosmicTk {
stretch: iced::font::Stretch::Normal,
style: iced::font::Style::Normal,
},
- window_controls_position: WindowControlsPosition::default(),
}
}
}
diff --git a/src/core.rs b/src/core.rs
index f80954f..970a535 100644
--- a/src/core.rs
+++ b/src/core.rs
@@ -78,6 +78,8 @@ pub struct Core {
pub(super) portal_accent: Option,
+ pub(super) portal_is_high_contrast: Option,
+
pub(super) title: HashMap,
pub window: Window,
@@ -153,6 +155,7 @@ impl Default for Core {
settings_daemon: None,
portal_is_dark: None,
portal_accent: None,
+ portal_is_high_contrast: None,
main_window: None,
exit_on_main_window_closed: true,
menu_bars: HashMap::new(),
@@ -429,6 +432,7 @@ impl Core {
id
}
+ #[cfg(feature = "winit")]
pub fn drag(&self, id: Option) -> crate::app::Task {
let Some(id) = id.or(self.main_window) else {
return iced::Task::none();
@@ -436,6 +440,7 @@ impl Core {
crate::command::drag(id)
}
+ #[cfg(feature = "winit")]
pub fn maximize(
&self,
id: Option,
@@ -447,6 +452,7 @@ impl Core {
crate::command::maximize(id, maximized)
}
+ #[cfg(feature = "winit")]
pub fn minimize(&self, id: Option) -> crate::app::Task {
let Some(id) = id.or(self.main_window) else {
return iced::Task::none();
@@ -454,6 +460,7 @@ impl Core {
crate::command::minimize(id)
}
+ #[cfg(feature = "winit")]
pub fn set_title(
&self,
id: Option,
@@ -465,6 +472,7 @@ impl Core {
crate::command::set_title(id, title)
}
+ #[cfg(feature = "winit")]
pub fn set_windowed(&self, id: Option) -> crate::app::Task {
let Some(id) = id.or(self.main_window) else {
return iced::Task::none();
@@ -472,6 +480,7 @@ impl Core {
crate::command::set_windowed(id)
}
+ #[cfg(feature = "winit")]
pub fn toggle_maximize(
&self,
id: Option,
diff --git a/src/dbus_activation.rs b/src/dbus_activation.rs
index 880db63..99e2f9f 100644
--- a/src/dbus_activation.rs
+++ b/src/dbus_activation.rs
@@ -1,15 +1,17 @@
// Copyright 2024 System76
// SPDX-License-Identifier: MPL-2.0
-use crate::ApplicationExt;
-use iced::Subscription;
-use iced_futures::futures::SinkExt;
-use iced_futures::futures::channel::mpsc::{Receiver, Sender};
-use std::any::TypeId;
-use std::collections::HashMap;
-use url::Url;
-use zbus::zvariant::Value;
-use zbus::{interface, proxy};
+use {
+ crate::ApplicationExt,
+ iced::Subscription,
+ iced_futures::futures::{
+ SinkExt,
+ channel::mpsc::{Receiver, Sender},
+ },
+ std::{any::TypeId, collections::HashMap},
+ url::Url,
+ zbus::{interface, proxy, zvariant::Value},
+};
#[cold]
pub fn subscription() -> Subscription> {
@@ -43,7 +45,7 @@ pub fn subscription() -> Subscription(
exec: S,
env_vars: I,
- _app_id: Option<&str>,
+ app_id: Option<&str>,
terminal: bool,
) where
S: AsRef,
@@ -816,17 +816,13 @@ pub async fn spawn_desktop_exec(
// https://systemd.io/DESKTOP_ENVIRONMENTS
//
// Similar to what Gnome sets, for now.
- if let Some(_pid) = crate::process::spawn(cmd).await {
+ if let Some(pid) = crate::process::spawn(cmd).await {
#[cfg(feature = "desktop-systemd-scope")]
if let Ok(session) = zbus::Connection::session().await {
if let Ok(systemd_manager) = SystemdMangerProxy::new(&session).await {
let _ = systemd_manager
.start_transient_unit(
- &format!(
- "app-cosmic-{}-{}.scope",
- _app_id.unwrap_or(&executable),
- _pid
- ),
+ &format!("app-cosmic-{}-{}.scope", app_id.unwrap_or(&executable), pid),
"fail",
&[
(
@@ -837,7 +833,7 @@ pub async fn spawn_desktop_exec(
),
(
"PIDs".to_string(),
- zbus::zvariant::Value::from(vec![_pid])
+ zbus::zvariant::Value::from(vec![pid])
.try_to_owned()
.unwrap(),
),
@@ -876,8 +872,7 @@ trait SystemdManger {
#[cfg(all(test, not(windows)))]
mod tests {
use super::*;
- use std::path::{Path, PathBuf};
- use std::{env, fs};
+ use std::{env, fs, path::Path, path::PathBuf};
use tempfile::tempdir;
struct EnvVarGuard {
diff --git a/src/ext.rs b/src/ext.rs
index 65ca014..8eb749e 100644
--- a/src/ext.rs
+++ b/src/ext.rs
@@ -2,6 +2,7 @@
// SPDX-License-Identifier: MPL-2.0
use iced::Color;
+use iced_core::Widget;
pub trait ElementExt {
#[must_use]
diff --git a/src/lib.rs b/src/lib.rs
index 9c31506..0262379 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -3,10 +3,11 @@
#![allow(clippy::module_name_repetitions)]
#![cfg_attr(target_os = "redox", feature(lazy_cell))]
-#![cfg_attr(docsrs, feature(doc_cfg))]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
/// Recommended default imports.
pub mod prelude {
+ #[cfg(feature = "winit")]
pub use crate::ApplicationExt;
pub use crate::ext::*;
pub use crate::{Also, Apply, Element, Renderer, Task, Theme};
@@ -20,7 +21,9 @@ pub use action::Action;
pub mod anim;
+#[cfg(feature = "winit")]
pub mod app;
+#[cfg(feature = "winit")]
#[doc(inline)]
pub use app::{Application, ApplicationExt};
@@ -63,17 +66,6 @@ pub mod font;
#[doc(inline)]
pub use iced;
-#[doc(inline)]
-pub use iced_core;
-#[doc(inline)]
-pub use iced_futures;
-#[doc(inline)]
-pub use iced_runtime;
-#[doc(inline)]
-pub use iced_widget;
-#[doc(inline)]
-#[cfg(feature = "wayland")]
-pub use iced_winit;
pub mod icon_theme;
pub mod keyboard_nav;
diff --git a/src/localize.rs b/src/localize.rs
index d63d970..95a3165 100644
--- a/src/localize.rs
+++ b/src/localize.rs
@@ -1,7 +1,9 @@
// SPDX-License-Identifier: GPL-3.0-only
-use i18n_embed::fluent::{FluentLanguageLoader, fluent_language_loader};
-use i18n_embed::{DefaultLocalizer, LanguageLoader, Localizer};
+use i18n_embed::{
+ DefaultLocalizer, LanguageLoader, Localizer,
+ fluent::{FluentLanguageLoader, fluent_language_loader},
+};
use rust_embed::RustEmbed;
use std::sync::{LazyLock, OnceLock};
diff --git a/src/malloc.rs b/src/malloc.rs
index bc5e835..b99a66f 100644
--- a/src/malloc.rs
+++ b/src/malloc.rs
@@ -1,49 +1,21 @@
// Copyright 2025 System76
// SPDX-License-Identifier: MPL-2.0
-use std::cell::Cell;
use std::os::raw::c_int;
-use std::time::{Duration, Instant};
const M_MMAP_THRESHOLD: c_int = -3;
-/// Minimum interval between two actual `malloc_trim` calls.
-///
-/// `trim` is called at the end of every `update()` and `view()`, which can
-/// reach 60-200 Hz during typical scrolling, resize, or animation. Each
-/// `malloc_trim` walks the glibc heap (10 µs to several ms depending on
-/// fragmentation), so calling it at render frequency can consume a
-/// substantial fraction of the frame budget. Throttling to 1 Hz keeps RSS
-/// bounded while removing the per-frame syscall from the hot path.
-const TRIM_MIN_INTERVAL: Duration = Duration::from_millis(1000);
-
-thread_local! {
- static LAST_TRIM: Cell> = const { Cell::new(None) };
-}
-
unsafe extern "C" {
fn malloc_trim(pad: usize);
fn mallopt(param: c_int, value: c_int) -> c_int;
}
-/// Throttled wrapper over `malloc_trim`. Safe to call at render frequency:
-/// consecutive calls within `TRIM_MIN_INTERVAL` (per-thread) skip the syscall.
#[inline]
pub fn trim(pad: usize) {
- LAST_TRIM.with(|last| {
- let now = Instant::now();
- let should_trim = match last.get() {
- None => true,
- Some(prev) => now.duration_since(prev) >= TRIM_MIN_INTERVAL,
- };
- if should_trim {
- last.set(Some(now));
- unsafe {
- malloc_trim(pad);
- }
- }
- });
+ unsafe {
+ malloc_trim(pad);
+ }
}
/// Prevents glibc from hoarding memory via memory fragmentation.
diff --git a/src/process.rs b/src/process.rs
index e2cb0f7..2b6c4e0 100644
--- a/src/process.rs
+++ b/src/process.rs
@@ -5,7 +5,7 @@
use smol::io::AsyncReadExt;
use std::io;
use std::os::fd::OwnedFd;
-use std::process::{Command, Stdio};
+use std::process::{Command, Stdio, exit};
#[cfg(feature = "tokio")]
use tokio::io::AsyncReadExt;
@@ -56,33 +56,24 @@ pub async fn spawn(mut command: Command) -> Option {
match unsafe { libc::fork() } {
// Parent process
- fork_pid @ 1..=i32::MAX => {
+ 1.. => {
// Drop copy of write end, then read PID from pipe
drop(write);
let pid = read_from_pipe(read).await;
- _ = rustix::process::waitpid(
- rustix::process::Pid::from_raw(fork_pid),
- rustix::process::WaitOptions::empty(),
- );
+ // wait to prevent zombie
+ _ = rustix::process::wait(rustix::process::WaitOptions::empty());
pid
}
// Child process
0 => {
let _res = rustix::process::setsid();
- let exit_status = if let Ok(child) = command.spawn() {
+ if let Ok(child) = command.spawn() {
// Write PID to pipe
let _ = rustix::io::write(write, &child.id().to_be_bytes());
- 0
- } else {
- 1
- };
-
- // # Safety
- // Required for child fork to exit without affecting the parent.
- unsafe {
- libc::_exit(exit_status);
}
+
+ exit(0)
}
..=-1 => {
diff --git a/src/scroll.rs b/src/scroll.rs
index 6794739..b6d4237 100644
--- a/src/scroll.rs
+++ b/src/scroll.rs
@@ -1,3 +1,4 @@
+use iced::Task;
use iced::mouse::ScrollDelta;
use std::time::{Duration, Instant};
@@ -94,7 +95,7 @@ impl Scroll {
} else {
// Return integer part of scroll, and keep remainder
self.scroll = Some((scroll.fract(), Instant::now()));
- let discrete = scroll.trunc() as isize;
+ let mut discrete = scroll.trunc() as isize;
if discrete != 0 {
self.last_discrete = Some(Instant::now());
}
diff --git a/src/surface/action.rs b/src/surface/action.rs
index 16816ff..50e2b4a 100644
--- a/src/surface/action.rs
+++ b/src/surface/action.rs
@@ -2,11 +2,11 @@
// SPDX-License-Identifier: MPL-2.0
use super::Action;
+#[cfg(feature = "winit")]
use crate::Application;
use iced::window;
-use std::any::Any;
-use std::sync::Arc;
+use std::{any::Any, sync::Arc};
/// Used to produce a destroy popup message from within a widget.
#[cfg(all(feature = "wayland", target_os = "linux"))]
@@ -27,7 +27,7 @@ pub fn destroy_window(id: iced_core::window::Id) -> Action {
Action::DestroyWindow(id)
}
-#[cfg(all(feature = "wayland", target_os = "linux"))]
+#[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
#[must_use]
pub fn app_window(
settings: impl Fn(&mut App) -> window::Settings + Send + Sync + 'static,
@@ -60,7 +60,7 @@ pub fn app_window(
}
/// Used to create a window message from within a widget.
-#[cfg(all(feature = "wayland", target_os = "linux"))]
+#[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
#[must_use]
pub fn simple_window(
settings: impl Fn() -> window::Settings + Send + Sync + 'static,
@@ -92,7 +92,7 @@ pub fn simple_window(
)
}
-#[cfg(all(feature = "wayland", target_os = "linux"))]
+#[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
#[must_use]
pub fn app_popup(
settings: impl Fn(&mut App) -> iced_runtime::platform_specific::wayland::popup::SctkPopupSettings
@@ -126,7 +126,7 @@ pub fn app_popup(
}
/// Used to create a subsurface message from within a widget.
-#[cfg(all(feature = "wayland", target_os = "linux"))]
+#[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
#[must_use]
pub fn simple_subsurface(
settings: impl Fn() -> iced_runtime::platform_specific::wayland::subsurface::SctkSubsurfaceSettings
@@ -155,7 +155,7 @@ pub fn simple_subsurface(
}
/// Used to create a popup message from within a widget.
-#[cfg(all(feature = "wayland", target_os = "linux"))]
+#[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
#[must_use]
pub fn simple_popup(
settings: impl Fn() -> iced_runtime::platform_specific::wayland::popup::SctkPopupSettings
@@ -186,7 +186,7 @@ pub fn simple_popup(
)
}
-#[cfg(all(feature = "wayland", target_os = "linux"))]
+#[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
#[must_use]
pub fn subsurface(
settings: impl Fn(
diff --git a/src/surface/mod.rs b/src/surface/mod.rs
index 307b527..0dad645 100644
--- a/src/surface/mod.rs
+++ b/src/surface/mod.rs
@@ -3,7 +3,9 @@
pub mod action;
-use iced::{Limits, Size, Task};
+use iced::Limits;
+use iced::Size;
+use iced::Task;
use std::future::Future;
use std::sync::Arc;
diff --git a/src/theme/mod.rs b/src/theme/mod.rs
index a5ae5d4..093bac0 100644
--- a/src/theme/mod.rs
+++ b/src/theme/mod.rs
@@ -7,8 +7,12 @@
pub mod portal;
pub mod style;
-use cosmic_config::{CosmicConfigEntry, config_subscription};
-use cosmic_theme::{Component, LayeredTheme, Spacing, ThemeMode};
+use cosmic_config::CosmicConfigEntry;
+use cosmic_config::config_subscription;
+use cosmic_theme::Component;
+use cosmic_theme::LayeredTheme;
+use cosmic_theme::Spacing;
+use cosmic_theme::ThemeMode;
use iced_futures::Subscription;
use iced_runtime::{Appearance, DefaultStyle};
use std::sync::{Arc, LazyLock, Mutex};
diff --git a/src/theme/style/button.rs b/src/theme/style/button.rs
index f84c9e9..bb52d9a 100644
--- a/src/theme/style/button.rs
+++ b/src/theme/style/button.rs
@@ -6,8 +6,10 @@
use cosmic_theme::Component;
use iced_core::{Background, Color};
-use crate::theme::TRANSPARENT_COMPONENT;
-use crate::widget::button::{Catalog, Style};
+use crate::{
+ theme::TRANSPARENT_COMPONENT,
+ widget::button::{Catalog, Style},
+};
#[derive(Default)]
pub enum Button {
@@ -148,7 +150,7 @@ pub fn appearance(
}
Button::ListItem(radii) => {
corner_radii = radii;
- let (background, text, icon) = color(&cosmic.list_button);
+ let (background, text, icon) = color(&cosmic.background.component);
if selected {
appearance.background =
@@ -195,7 +197,7 @@ impl Catalog for crate::Theme {
return active(focused, self);
}
- appearance(self, focused, selected, false, style, move |component| {
+ let mut s = appearance(self, focused, selected, false, style, move |component| {
let text_color = if matches!(
style,
Button::Icon | Button::IconVertical | Button::HeaderBar
@@ -207,7 +209,15 @@ impl Catalog for crate::Theme {
};
(component.base.into(), text_color, text_color)
- })
+ });
+
+ if let Button::ListItem(_) = style {
+ if !selected {
+ s.background = None;
+ }
+ }
+
+ s
}
fn disabled(&self, style: &Self::Class) -> Style {
@@ -235,7 +245,7 @@ impl Catalog for crate::Theme {
return hovered(focused, self);
}
- appearance(
+ let mut s = appearance(
self,
focused || matches!(style, Button::Image),
selected,
@@ -254,7 +264,15 @@ impl Catalog for crate::Theme {
(component.hover.into(), text_color, text_color)
},
- )
+ );
+
+ if let Button::ListItem(_) = style {
+ if !selected {
+ s.background = None;
+ }
+ }
+
+ s
}
fn pressed(&self, focused: bool, selected: bool, style: &Self::Class) -> Style {
diff --git a/src/theme/style/iced.rs b/src/theme/style/iced.rs
index 8f9fa46..aa6f4b3 100644
--- a/src/theme/style/iced.rs
+++ b/src/theme/style/iced.rs
@@ -5,17 +5,18 @@
use crate::theme::{CosmicComponent, TRANSPARENT_COMPONENT, Theme};
use cosmic_theme::composite::over;
-use iced::overlay::menu;
-use iced::theme::Base;
-use iced::widget::slider::{self, Rail};
-use iced::widget::{
- button as iced_button, checkbox as iced_checkbox, combo_box, container as iced_container,
- pane_grid, pick_list, progress_bar, radio, rule, scrollable, svg, toggler,
+use iced::{
+ overlay::menu,
+ theme::Base,
+ widget::{
+ button as iced_button, checkbox as iced_checkbox, combo_box, container as iced_container,
+ pane_grid, pick_list, progress_bar, radio, rule, scrollable,
+ slider::{self, Rail},
+ svg, toggler,
+ },
};
use iced_core::{Background, Border, Color, Shadow, Vector};
-use iced_widget::pane_grid::Highlight;
-use iced_widget::scrollable::AutoScroll;
-use iced_widget::{text_editor, text_input};
+use iced_widget::{pane_grid::Highlight, scrollable::AutoScroll, text_editor, text_input};
use palette::WithAlpha;
use std::rc::Rc;
@@ -170,15 +171,18 @@ impl Button {
* TODO: Checkbox
*/
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-#[derive(Default)]
pub enum Checkbox {
- #[default]
Primary,
Secondary,
Success,
Danger,
}
+impl Default for Checkbox {
+ fn default() -> Self {
+ Self::Primary
+ }
+}
impl iced_checkbox::Catalog for Theme {
type Class<'a> = Checkbox;
@@ -788,7 +792,7 @@ impl menu::Catalog for Theme {
fn default<'a>() -> ::Class<'a> {}
- fn style(&self, _class: &::Class<'_>) -> menu::Style {
+ fn style(&self, class: &::Class<'_>) -> menu::Style {
let cosmic = self.cosmic();
menu::Style {
@@ -812,7 +816,7 @@ impl pick_list::Catalog for Theme {
fn style(
&self,
- _class: &::Class<'_>,
+ class: &::Class<'_>,
status: pick_list::Status,
) -> pick_list::Style {
let cosmic = &self.cosmic();
@@ -853,7 +857,7 @@ impl radio::Catalog for Theme {
fn default<'a>() -> Self::Class<'a> {}
- fn style(&self, _class: &Self::Class<'_>, status: radio::Status) -> radio::Style {
+ fn style(&self, class: &Self::Class<'_>, status: radio::Status) -> radio::Style {
let cur_container = self.current_container();
let theme = self.cosmic();
@@ -906,7 +910,7 @@ impl toggler::Catalog for Theme {
fn default<'a>() -> Self::Class<'a> {}
- fn style(&self, _class: &Self::Class<'_>, status: toggler::Status) -> toggler::Style {
+ fn style(&self, class: &Self::Class<'_>, status: toggler::Status) -> toggler::Style {
let cosmic = self.cosmic();
const HANDLE_MARGIN: f32 = 2.0;
let neutral_10 = cosmic.palette.neutral_10.with_alpha(0.1);
@@ -934,8 +938,8 @@ impl toggler::Catalog for Theme {
padding_ratio: 0.0,
};
match status {
- toggler::Status::Active { is_toggled: _ } => active,
- toggler::Status::Hovered { is_toggled: _ } => {
+ toggler::Status::Active { is_toggled } => active,
+ toggler::Status::Hovered { is_toggled } => {
let is_active = matches!(status, toggler::Status::Hovered { is_toggled: true });
toggler::Style {
background: if is_active {
@@ -954,7 +958,7 @@ impl toggler::Catalog for Theme {
..active
}
}
- toggler::Status::Disabled { is_toggled: _ } => {
+ toggler::Status::Disabled { is_toggled } => {
active.background = active.background.scale_alpha(0.5);
active.foreground = active.foreground.scale_alpha(0.5);
active
@@ -971,7 +975,7 @@ impl pane_grid::Catalog for Theme {
fn default<'a>() -> ::Class<'a> {}
- fn style(&self, _class: &::Class<'_>) -> pane_grid::Style {
+ fn style(&self, class: &::Class<'_>) -> pane_grid::Style {
let theme = self.cosmic();
pane_grid::Style {
@@ -1139,8 +1143,8 @@ impl scrollable::Catalog for Theme {
fn style(&self, class: &Self::Class<'_>, status: scrollable::Status) -> scrollable::Style {
match status {
scrollable::Status::Active {
- is_horizontal_scrollbar_disabled: _,
- is_vertical_scrollbar_disabled: _,
+ is_horizontal_scrollbar_disabled,
+ is_vertical_scrollbar_disabled,
} => {
let cosmic = self.cosmic();
let neutral_5 = cosmic.palette.neutral_5.with_alpha(0.7);
@@ -1189,7 +1193,7 @@ impl scrollable::Catalog for Theme {
background: Color::TRANSPARENT.into(),
border: Border::default(),
shadow: Shadow::default(),
- icon: Color::TRANSPARENT,
+ icon: Color::TRANSPARENT.into(),
},
};
let small_widget_container = self.current_container().small_widget.with_alpha(0.7);
@@ -1257,7 +1261,7 @@ impl scrollable::Catalog for Theme {
background: Color::TRANSPARENT.into(),
border: Border::default(),
shadow: Shadow::default(),
- icon: Color::TRANSPARENT,
+ icon: Color::TRANSPARENT.into(),
},
};
@@ -1299,7 +1303,7 @@ impl svg::Catalog for Theme {
Svg::default()
}
- fn style(&self, class: &Self::Class<'_>, _status: svg::Status) -> svg::Style {
+ fn style(&self, class: &Self::Class<'_>, status: svg::Status) -> svg::Style {
#[allow(clippy::match_same_arms)]
match class {
Svg::Default => svg::Style::default(),
@@ -1338,16 +1342,9 @@ impl iced_widget::text::Catalog for Theme {
match class {
Text::Accent => iced_widget::text::Style {
color: Some(self.cosmic().accent_text_color().into()),
- ..Default::default()
- },
- Text::Default => iced_widget::text::Style {
- color: None,
- ..Default::default()
- },
- Text::Color(c) => iced_widget::text::Style {
- color: Some(*c),
- ..Default::default()
},
+ Text::Default => iced_widget::text::Style { color: None },
+ Text::Color(c) => iced_widget::text::Style { color: Some(*c) },
Text::Custom(f) => f(self),
}
}
@@ -1436,7 +1433,7 @@ impl text_input::Catalog for Theme {
},
}
}
- text_input::Status::Focused { is_hovered: _ } => {
+ text_input::Status::Focused { is_hovered } => {
let bg = self.current_container().small_widget.with_alpha(0.25);
match class {
@@ -1513,7 +1510,7 @@ impl iced_widget::text_editor::Catalog for Theme {
let selection = cosmic.accent.base.into();
let value = cosmic.palette.neutral_9.into();
let placeholder = cosmic.palette.neutral_9.with_alpha(0.7).into();
- let _icon: Color = cosmic.background.on.into();
+ let icon: Color = cosmic.background.on.into();
// TODO do we need to add icon color back?
match status {
@@ -1530,7 +1527,7 @@ impl iced_widget::text_editor::Catalog for Theme {
value,
selection,
},
- iced_widget::text_editor::Status::Focused { is_hovered: _ } => {
+ iced_widget::text_editor::Status::Focused { is_hovered } => {
iced_widget::text_editor::Style {
background: iced::Color::from(cosmic.bg_color()).into(),
border: Border {
@@ -1633,8 +1630,8 @@ impl Base for Theme {
crate::theme::ThemeType::Light => "Cosmic Light Theme",
crate::theme::ThemeType::HighContrastDark => "Cosmic High Contrast Dark Theme",
crate::theme::ThemeType::HighContrastLight => "Cosmic High Contrast Light Theme",
- crate::theme::ThemeType::Custom(_theme) => "Custom Cosmic Theme",
- crate::theme::ThemeType::System { prefer_dark: _, theme } => &theme.name,
+ crate::theme::ThemeType::Custom(theme) => "Custom Cosmic Theme",
+ crate::theme::ThemeType::System { prefer_dark, theme } => &theme.name,
}
}
}
diff --git a/src/theme/style/menu_bar.rs b/src/theme/style/menu_bar.rs
index db6e0ba..ed0e657 100644
--- a/src/theme/style/menu_bar.rs
+++ b/src/theme/style/menu_bar.rs
@@ -71,7 +71,7 @@ impl StyleSheet for Theme {
background: component.base.into(),
border_width: 1.0,
bar_border_radius: cosmic.corner_radii.radius_xl,
- menu_border_radius: cosmic.corner_radii.radius_s,
+ menu_border_radius: cosmic.corner_radii.radius_s.map(|x| x + 2.0),
border_color: component.divider.into(),
background_expand: [1; 4],
path: component.hover.into(),
diff --git a/src/theme/style/mod.rs b/src/theme/style/mod.rs
index cc48931..bc648a7 100644
--- a/src/theme/style/mod.rs
+++ b/src/theme/style/mod.rs
@@ -32,7 +32,7 @@ mod text_input;
#[doc(inline)]
pub use self::text_input::TextInput;
-#[cfg(all(feature = "wayland", target_os = "linux"))]
+#[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
pub mod tooltip;
-#[cfg(all(feature = "wayland", target_os = "linux"))]
+#[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
pub use tooltip::Tooltip;
diff --git a/src/theme/style/segmented_button.rs b/src/theme/style/segmented_button.rs
index 45fcc0b..b9863c8 100644
--- a/src/theme/style/segmented_button.rs
+++ b/src/theme/style/segmented_button.rs
@@ -3,13 +3,10 @@
//! Contains stylesheet implementation for [`crate::widget::segmented_button`].
-use crate::theme::Theme;
-use crate::widget::segmented_button::{
- Appearance, ItemAppearance, ItemStatusAppearance, StyleSheet,
-};
+use crate::widget::segmented_button::{Appearance, ItemAppearance, StyleSheet};
+use crate::{theme::Theme, widget::segmented_button::ItemStatusAppearance};
use iced::Border;
-use iced_core::Background;
-use iced_core::border::Radius;
+use iced_core::{Background, border::Radius};
use palette::WithAlpha;
#[derive(Default)]
@@ -146,8 +143,7 @@ mod horizontal {
use crate::widget::segmented_button::{ItemAppearance, ItemStatusAppearance};
use cosmic_theme::{Component, Container};
use iced::Border;
- use iced_core::Background;
- use iced_core::border::Radius;
+ use iced_core::{Background, border::Radius};
use palette::WithAlpha;
pub fn tab_bar(cosmic: &cosmic_theme::Theme, container: &Container) -> Appearance {
@@ -185,7 +181,7 @@ mod horizontal {
pub fn selection_active(
cosmic: &cosmic_theme::Theme,
- _component: &Component,
+ component: &Component,
) -> ItemStatusAppearance {
let rad_xl = cosmic.corner_radii.radius_xl;
let rad_0 = cosmic.corner_radii.radius_0;
@@ -254,8 +250,7 @@ mod vertical {
use crate::widget::segmented_button::{ItemAppearance, ItemStatusAppearance};
use cosmic_theme::{Component, Container};
use iced::Border;
- use iced_core::Background;
- use iced_core::border::Radius;
+ use iced_core::{Background, border::Radius};
use palette::WithAlpha;
pub fn tab_bar(cosmic: &cosmic_theme::Theme, container: &Container) -> Appearance {
@@ -280,7 +275,7 @@ mod vertical {
pub fn selection_active(
cosmic: &cosmic_theme::Theme,
- _component: &Component,
+ component: &Component,
) -> ItemStatusAppearance {
let rad_0 = cosmic.corner_radii.radius_0;
let rad_xl = cosmic.corner_radii.radius_xl;
diff --git a/src/widget/about.rs b/src/widget/about.rs
index 490b037..9b21e93 100644
--- a/src/widget/about.rs
+++ b/src/widget/about.rs
@@ -1,6 +1,8 @@
-use crate::iced::{Alignment, Length};
-use crate::widget::{self, list};
-use crate::{Apply, Element, fl};
+use crate::{
+ Apply, Element, fl,
+ iced::{Alignment, Length},
+ widget::{self, list},
+};
use std::rc::Rc;
#[derive(Debug, Default, Clone, derive_setters::Setters)]
diff --git a/src/widget/aspect_ratio.rs b/src/widget/aspect_ratio.rs
index 5cd8b9c..577bea9 100644
--- a/src/widget/aspect_ratio.rs
+++ b/src/widget/aspect_ratio.rs
@@ -3,10 +3,13 @@
use iced::Size;
use iced::widget::Container;
use iced_core::event::Event;
+use iced_core::layout;
+use iced_core::mouse;
+use iced_core::overlay;
+use iced_core::renderer;
use iced_core::widget::Tree;
use iced_core::{
Alignment, Clipboard, Element, Layout, Length, Padding, Rectangle, Shell, Vector, Widget,
- layout, mouse, overlay, renderer,
};
pub use iced_widget::container::{Catalog, Style};
diff --git a/src/widget/autosize.rs b/src/widget/autosize.rs
index c52367d..69fd9c8 100644
--- a/src/widget/autosize.rs
+++ b/src/widget/autosize.rs
@@ -1,11 +1,12 @@
//! Autosize Container, which will resize the window to its contents.
use iced_core::event::{self, Event};
+use iced_core::layout;
+use iced_core::mouse;
+use iced_core::overlay;
+use iced_core::renderer;
use iced_core::widget::{Id, Operation, Tree};
-use iced_core::{
- Clipboard, Element, Layout, Length, Rectangle, Shell, Vector, Widget, layout, mouse, overlay,
- renderer,
-};
+use iced_core::{Clipboard, Element, Layout, Length, Rectangle, Shell, Vector, Widget};
pub use iced_widget::container::{Catalog, Style};
pub fn autosize<'a, Message: 'static, Theme, E>(
diff --git a/src/widget/button/icon.rs b/src/widget/button/icon.rs
index 4771353..04d2bdd 100644
--- a/src/widget/button/icon.rs
+++ b/src/widget/button/icon.rs
@@ -3,13 +3,9 @@
use super::{Builder, ButtonClass};
use crate::Element;
-use crate::widget::icon::Handle;
-use crate::widget::tooltip;
+use crate::widget::{icon::Handle, tooltip};
use apply::Apply;
-use iced_core::font::Weight;
-use iced_core::text::LineHeight;
-use iced_core::widget::Id;
-use iced_core::{Alignment, Length, Padding};
+use iced_core::{Alignment, Length, Padding, font::Weight, text::LineHeight, widget::Id};
use std::borrow::Cow;
pub type Button<'a, Message> = Builder<'a, Message, Icon>;
@@ -156,7 +152,7 @@ impl<'a, Message: Clone + 'static> From> for Element<'a, Mes
);
}
- let button = if builder.variant.vertical {
+ let mut button = if builder.variant.vertical {
crate::widget::column::with_children(content)
.padding(builder.padding)
.spacing(builder.spacing)
@@ -173,11 +169,9 @@ impl<'a, Message: Clone + 'static> From> for Element<'a, Mes
};
#[cfg(feature = "a11y")]
- let button = {
- let mut button = button;
+ {
button = button.name(builder.name).description(builder.description);
- button
- };
+ }
let button = button
.padding(0)
diff --git a/src/widget/button/image.rs b/src/widget/button/image.rs
index 915cc53..ab51e66 100644
--- a/src/widget/button/image.rs
+++ b/src/widget/button/image.rs
@@ -2,12 +2,11 @@
// SPDX-License-Identifier: MPL-2.0
use super::Builder;
-use crate::Element;
-use crate::widget::image::Handle;
-use crate::widget::{self};
-use iced_core::font::Weight;
-use iced_core::widget::Id;
-use iced_core::{Length, Padding};
+use crate::{
+ Element,
+ widget::{self, image::Handle},
+};
+use iced_core::{Length, Padding, font::Weight, widget::Id};
use std::borrow::Cow;
pub type Button<'a, Message> = Builder<'a, Message, Image<'a, Handle, Message>>;
@@ -84,7 +83,7 @@ where
.width(builder.width)
.height(builder.height);
- let button = super::custom_image_button(content, builder.variant.on_remove)
+ let mut button = super::custom_image_button(content, builder.variant.on_remove)
.padding(0)
.selected(builder.variant.selected)
.id(builder.id)
@@ -92,11 +91,9 @@ where
.class(builder.class);
#[cfg(feature = "a11y")]
- let button = {
- let mut button = button;
+ {
button = button.name(builder.name).description(builder.description);
- button
- };
+ }
button.into()
}
diff --git a/src/widget/button/link.rs b/src/widget/button/link.rs
index e6f8ac7..9ce8126 100644
--- a/src/widget/button/link.rs
+++ b/src/widget/button/link.rs
@@ -3,15 +3,14 @@
//! Hyperlink button widget
-use super::{Builder, ButtonClass};
+use super::Builder;
+use super::ButtonClass;
use crate::Element;
use crate::prelude::*;
use crate::widget::icon::{self, Handle};
use crate::widget::{button, row, tooltip};
-use iced_core::font::Weight;
use iced_core::text::LineHeight;
-use iced_core::widget::Id;
-use iced_core::{Alignment, Length, Padding};
+use iced_core::{Alignment, Length, Padding, font::Weight, widget::Id};
use std::borrow::Cow;
pub type Button<'a, Message> = Builder<'a, Message, Hyperlink>;
@@ -67,7 +66,7 @@ pub fn icon() -> Handle {
impl<'a, Message: Clone + 'static> From> for Element<'a, Message> {
fn from(mut builder: Button<'a, Message>) -> Element<'a, Message> {
- let button: super::Button<'a, Message> = row::with_capacity(2)
+ let mut button: super::Button<'a, Message> = row::with_capacity(2)
.push({
// TODO: Avoid allocation
crate::widget::text(builder.label.to_string())
@@ -95,15 +94,13 @@ impl<'a, Message: Clone + 'static> From> for Element<'a, Mes
.class(builder.class);
#[cfg(feature = "a11y")]
- let button = {
- let mut button = button;
+ {
if !builder.label.is_empty() {
button = button.name(builder.label);
}
button = button.description(builder.description);
- button
- };
+ }
if builder.tooltip.is_empty() {
button.into()
diff --git a/src/widget/button/style.rs b/src/widget/button/style.rs
index f8df8c6..21afa08 100644
--- a/src/widget/button/style.rs
+++ b/src/widget/button/style.rs
@@ -2,8 +2,7 @@
// SPDX-License-Identifier: MPL-2.0
//! Change the apperance of a button.
-use iced_core::border::Radius;
-use iced_core::{Background, Color, Vector};
+use iced_core::{Background, Color, Vector, border::Radius};
use crate::theme::THEME;
diff --git a/src/widget/button/text.rs b/src/widget/button/text.rs
index 55623ff..bcdd02b 100644
--- a/src/widget/button/text.rs
+++ b/src/widget/button/text.rs
@@ -4,10 +4,7 @@
use super::{Builder, ButtonClass};
use crate::widget::{icon, row, tooltip};
use crate::{Apply, Element};
-use iced_core::font::Weight;
-use iced_core::text::LineHeight;
-use iced_core::widget::Id;
-use iced_core::{Alignment, Length, Padding};
+use iced_core::{Alignment, Length, Padding, font::Weight, text::LineHeight, widget::Id};
use std::borrow::Cow;
pub type Button<'a, Message> = Builder<'a, Message, Text>;
@@ -122,7 +119,7 @@ impl<'a, Message: Clone + 'static> From> for Element<'a, Mes
.into()
});
- let button: super::Button<'a, Message> = row::with_capacity(3)
+ let mut button: super::Button<'a, Message> = row::with_capacity(3)
// Optional icon to place before label.
.push_maybe(leading_icon)
// Optional label between icons.
@@ -141,15 +138,13 @@ impl<'a, Message: Clone + 'static> From> for Element<'a, Mes
.class(builder.class);
#[cfg(feature = "a11y")]
- let button = {
- let mut button = button;
+ {
if !builder.label.is_empty() {
button = button.name(builder.label)
}
button = button.description(builder.description);
- button
- };
+ }
if builder.tooltip.is_empty() {
button.into()
diff --git a/src/widget/button/widget.rs b/src/widget/button/widget.rs
index e6b83d7..4acf3f2 100644
--- a/src/widget/button/widget.rs
+++ b/src/widget/button/widget.rs
@@ -9,14 +9,17 @@
use iced_runtime::core::widget::Id;
use iced_runtime::{Action, Task, keyboard, task};
-use iced_core::event::Event;
+use iced_core::event::{self, Event};
use iced_core::renderer::{self, Quad, Renderer};
+use iced_core::touch;
use iced_core::widget::Operation;
use iced_core::widget::tree::{self, Tree};
use iced_core::{
- Background, Border, Clipboard, Color, Layout, Length, Padding, Point, Rectangle, Shadow, Shell,
- Vector, Widget, layout, mouse, overlay, svg, touch,
+ Background, Clipboard, Color, Layout, Length, Padding, Point, Rectangle, Shell, Vector, Widget,
};
+use iced_core::{Border, mouse};
+use iced_core::{Shadow, overlay};
+use iced_core::{layout, svg};
use iced_renderer::core::widget::operation;
use crate::theme::THEME;
@@ -378,12 +381,13 @@ impl<'a, Message: 'a + Clone> Widget
match event {
Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Left))
| Event::Touch(touch::Event::FingerPressed { .. }) => {
- if let Some(position) = cursor.position()
- && removal_bounds(layout.bounds(), 4.0).contains(position) {
+ if let Some(position) = cursor.position() {
+ if removal_bounds(layout.bounds(), 4.0).contains(position) {
shell.publish(on_remove.clone());
shell.capture_event();
return;
}
+ }
}
_ => (),
@@ -556,9 +560,9 @@ impl<'a, Message: 'a + Clone> Widget
}
}
- if on_remove.is_some()
- && let Some(position) = cursor.position()
- && bounds.contains(position) {
+ if on_remove.is_some() {
+ if let Some(position) = cursor.position() {
+ if bounds.contains(position) {
let bounds = removal_bounds(layout.bounds(), 4.0);
renderer.fill_quad(
renderer::Quad {
@@ -590,6 +594,8 @@ impl<'a, Message: 'a + Clone> Widget
},
);
}
+ }
+ }
});
}
}
@@ -641,8 +647,10 @@ impl<'a, Message: 'a + Clone> Widget
state: &Tree,
p: mouse::Cursor,
) -> iced_accessibility::A11yTree {
- use iced_accessibility::accesskit::{Action, Node, NodeId, Rect, Role};
- use iced_accessibility::{A11yNode, A11yTree};
+ use iced_accessibility::{
+ A11yNode, A11yTree,
+ accesskit::{Action, Node, NodeId, Rect, Role},
+ };
// TODO why is state None sometimes?
if matches!(state.state, iced_core::widget::tree::State::None) {
tracing::info!("Button state is missing.");
@@ -659,7 +667,7 @@ impl<'a, Message: 'a + Clone> Widget
height,
} = layout.bounds();
let bounds = Rect::new(x as f64, y as f64, (x + width) as f64, (y + height) as f64);
- let _is_hovered = state.state.downcast_ref::().is_hovered;
+ let is_hovered = state.state.downcast_ref::().is_hovered;
let mut node = Node::new(Role::Button);
node.add_action(Action::Focus);
@@ -740,6 +748,12 @@ impl State {
self.is_focused
}
+ /// Returns whether the [`Button`] is currently hovered or not.
+ #[inline]
+ pub fn is_hovered(self) -> bool {
+ self.is_hovered
+ }
+
/// Focuses the [`Button`].
#[inline]
pub fn focus(&mut self) {
@@ -785,6 +799,7 @@ pub fn update<'a, Message: Clone>(
}
shell.capture_event();
+ return;
}
}
}
@@ -804,6 +819,7 @@ pub fn update<'a, Message: Clone>(
}
shell.capture_event();
+ return;
}
} else if on_press_down.is_some() {
let state = state();
@@ -811,7 +827,7 @@ pub fn update<'a, Message: Clone>(
}
}
#[cfg(feature = "a11y")]
- Event::A11y(_event_id, iced_accessibility::accesskit::ActionRequest { action, .. }) => {
+ Event::A11y(event_id, iced_accessibility::accesskit::ActionRequest { action, .. }) => {
let state = state();
if let Some(on_press) = matches!(action, iced_accessibility::accesskit::Action::Click)
.then_some(on_press)
@@ -823,6 +839,7 @@ pub fn update<'a, Message: Clone>(
shell.publish(msg);
}
shell.capture_event();
+ return;
}
Event::Keyboard(keyboard::Event::KeyPressed { key, .. }) => {
if let Some(on_press) = on_press {
@@ -833,6 +850,7 @@ pub fn update<'a, Message: Clone>(
shell.publish(msg);
shell.capture_event();
+ return;
}
}
}
@@ -852,7 +870,7 @@ pub fn draw(
viewport_bounds: Rectangle,
styling: &super::style::Style,
draw_contents: impl FnOnce(&mut Renderer, &Style),
- _is_image: bool,
+ is_image: bool,
) where
Theme: super::style::Catalog,
{
diff --git a/src/widget/calendar.rs b/src/widget/calendar.rs
index 35632c3..91c601d 100644
--- a/src/widget/calendar.rs
+++ b/src/widget/calendar.rs
@@ -8,8 +8,10 @@ use crate::widget::{button, column, grid, icon, row, text};
use apply::Apply;
use iced::alignment::Vertical;
use iced_core::{Alignment, Length};
-use jiff::ToSpan;
-use jiff::civil::{Date, Weekday};
+use jiff::{
+ ToSpan,
+ civil::{Date, Weekday},
+};
/// A widget that displays an interactive calendar.
pub fn calendar(
diff --git a/src/widget/cards.rs b/src/widget/cards.rs
index 4d6770f..66267a7 100644
--- a/src/widget/cards.rs
+++ b/src/widget/cards.rs
@@ -1,18 +1,23 @@
//! An expandable stack of cards
use std::time::Duration;
-use crate::anim;
-use crate::widget::card::style::Style;
-use crate::widget::icon::{self, Handle};
-use crate::widget::{button, column, row, text};
+use crate::{
+ anim,
+ widget::{
+ button,
+ card::style::Style,
+ column,
+ icon::{self, Handle},
+ row, text,
+ },
+};
use float_cmp::approx_eq;
use iced::widget;
-use iced_core::border::Radius;
-use iced_core::id::Id;
-use iced_core::layout::Node;
-use iced_core::renderer::Quad;
-use iced_core::widget::{Tree, tree};
-use iced_core::{Border, Element, Event, Length, Shadow, Size, Vector, Widget, window};
+use iced_core::{
+ Border, Element, Event, Length, Shadow, Size, Vector, Widget, border::Radius, id::Id,
+ layout::Node, renderer::Quad, widget::Tree,
+};
+use iced_core::{widget::tree, window};
const ICON_SIZE: u16 = 16;
const TOP_SPACING: u16 = 4;
@@ -93,7 +98,7 @@ where
/// Get an expandable stack of cards
#[allow(clippy::too_many_arguments)]
pub fn new(
- _id: widget::Id,
+ id: widget::Id,
card_inner_elements: Vec>,
on_clear_all: Message,
on_show_more: Option,
@@ -527,7 +532,7 @@ where
let c_layout = layout.next().unwrap();
let state = clear_all_state.unwrap();
self.clear_all_button.as_widget_mut().update(
- state, event, c_layout, cursor, renderer, clipboard, shell, viewport,
+ state, &event, c_layout, cursor, renderer, clipboard, shell, viewport,
);
}
@@ -537,7 +542,7 @@ where
for ((inner, layout), c_state) in self.elements.iter_mut().zip(layout).zip(tree_children) {
inner.as_widget_mut().update(
- c_state, event, layout, cursor, renderer, clipboard, shell, viewport,
+ c_state, &event, layout, cursor, renderer, clipboard, shell, viewport,
);
if shell.is_event_captured() || fully_unexpanded {
break;
diff --git a/src/widget/color_picker/mod.rs b/src/widget/color_picker/mod.rs
index 879cc60..318e943 100644
--- a/src/widget/color_picker/mod.rs
+++ b/src/widget/color_picker/mod.rs
@@ -12,12 +12,10 @@ use std::time::{Duration, Instant};
use crate::Element;
use crate::theme::iced::Slider;
use crate::theme::{Button, THEME};
-use crate::widget::button::Catalog;
-use crate::widget::segmented_button::Entity;
-use crate::widget::{container, slider};
+use crate::widget::{button::Catalog, container, segmented_button::Entity, slider};
use derive_setters::Setters;
use iced::Task;
-use iced_core::event::Event;
+use iced_core::event::{self, Event};
use iced_core::gradient::{ColorStop, Linear};
use iced_core::renderer::Quad;
use iced_core::widget::{Tree, tree};
@@ -27,8 +25,10 @@ use iced_core::{
};
use iced_widget::slider::HandleShape;
-use iced_widget::space::{horizontal, vertical};
-use iced_widget::{Row, canvas, column, row, scrollable};
+use iced_widget::{
+ Row, canvas, column, row, scrollable,
+ space::{horizontal, vertical},
+};
use palette::{FromColor, RgbHue};
use super::divider::horizontal;
@@ -619,10 +619,8 @@ where
let bounds = canvas_layout.bounds();
// Draw the handle on the saturation value canvas
- // Yoda: use the Theme passed into draw() instead of locking the global
- // THEME Mutex and cloning the whole Theme. Fires on every color-picker
- // redraw, so saving the Mutex lock + full Theme clone adds up.
- let t = theme.cosmic();
+ let t = THEME.lock().unwrap().clone();
+ let t = t.cosmic();
let handle_radius = f32::from(t.space_xs()) / 2.0;
let (x, y) = (
self.active_color
@@ -745,7 +743,7 @@ where
let column_tree = &mut tree.children[0];
self.inner.as_widget_mut().update(
column_tree,
- event,
+ &event,
column_layout,
cursor,
renderer,
@@ -758,19 +756,22 @@ where
return;
}
- if let Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) = event {
- let bounds = column_layout.children().nth(1).unwrap().bounds();
- if let Some(point) = cursor.position_over(bounds) {
- let relative_pos = point - bounds.position();
- let (s, v) = (
- relative_pos.x / bounds.width,
- 1.0 - relative_pos.y / bounds.height,
- );
- state.dragging = true;
- let hsv: palette::Hsv = palette::Hsv::new(self.active_color.hue, s, v);
- shell.publish((self.on_update)(ColorPickerUpdate::ActiveColor(hsv)));
- shell.capture_event();
+ match event {
+ Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) => {
+ let bounds = column_layout.children().nth(1).unwrap().bounds();
+ if let Some(point) = cursor.position_over(bounds) {
+ let relative_pos = point - bounds.position();
+ let (s, v) = (
+ relative_pos.x / bounds.width,
+ 1.0 - relative_pos.y / bounds.height,
+ );
+ state.dragging = true;
+ let hsv: palette::Hsv = palette::Hsv::new(self.active_color.hue, s, v);
+ shell.publish((self.on_update)(ColorPickerUpdate::ActiveColor(hsv)));
+ shell.capture_event();
+ }
}
+ _ => {}
}
}
diff --git a/src/widget/context_drawer/overlay.rs b/src/widget/context_drawer/overlay.rs
index 01f5cfc..39b3421 100644
--- a/src/widget/context_drawer/overlay.rs
+++ b/src/widget/context_drawer/overlay.rs
@@ -5,7 +5,8 @@ use crate::Element;
use iced::advanced::layout::{self, Layout};
use iced::advanced::widget::{self, Operation};
-use iced::advanced::{Clipboard, Shell, overlay, renderer};
+use iced::advanced::{Clipboard, Shell};
+use iced::advanced::{overlay, renderer};
use iced::{Event, Point, Size, mouse};
use iced_core::{Renderer, touch};
diff --git a/src/widget/context_drawer/widget.rs b/src/widget/context_drawer/widget.rs
index 9a7448e..7420738 100644
--- a/src/widget/context_drawer/widget.rs
+++ b/src/widget/context_drawer/widget.rs
@@ -6,10 +6,11 @@ use crate::widget::{self, LayerContainer, button, column, container, icon, row,
use crate::{Apply, Element, Renderer, Theme, fl};
use std::borrow::Cow;
+use iced_core::Alignment;
use iced_core::event::Event;
use iced_core::widget::{Operation, Tree};
use iced_core::{
- Alignment, Clipboard, Layout, Length, Rectangle, Shell, Vector, Widget, layout, mouse,
+ Clipboard, Layout, Length, Rectangle, Shell, Vector, Widget, layout, mouse,
overlay as iced_overlay, renderer,
};
diff --git a/src/widget/context_menu.rs b/src/widget/context_menu.rs
index 9256c95..3f35f04 100644
--- a/src/widget/context_menu.rs
+++ b/src/widget/context_menu.rs
@@ -6,6 +6,7 @@
#[cfg(all(
feature = "wayland",
target_os = "linux",
+ feature = "winit",
feature = "surface-message"
))]
use crate::app::cosmic::{WINDOWING_SYSTEM, WindowingSystem};
@@ -66,6 +67,7 @@ impl ContextMenu<'_, Message> {
#[cfg(all(
feature = "wayland",
target_os = "linux",
+ feature = "winit",
feature = "surface-message"
))]
#[allow(clippy::too_many_lines)]
@@ -79,8 +81,7 @@ impl ContextMenu<'_, Message> {
my_state: &mut LocalState,
) {
if self.window_id != window::Id::NONE && self.on_surface_action.is_some() {
- use crate::surface::action::destroy_popup;
- use crate::widget::menu::Menu;
+ use crate::{surface::action::destroy_popup, widget::menu::Menu};
use iced_runtime::platform_specific::wayland::popup::{
SctkPopupSettings, SctkPositioner,
};
@@ -89,7 +90,7 @@ impl ContextMenu<'_, Message> {
bounds.x = my_state.context_cursor.x;
bounds.y = my_state.context_cursor.y;
- let (id, _root_list) = my_state.menu_bar_state.inner.with_data_mut(|state| {
+ let (id, root_list) = my_state.menu_bar_state.inner.with_data_mut(|state| {
if let Some(id) = state.popup_id.get(&self.window_id).copied() {
// close existing popups
state.menu_states.clear();
@@ -147,7 +148,7 @@ impl ContextMenu<'_, Message> {
layout.bounds(),
-bounds.height,
);
- let (anchor_rect, _gravity) = my_state.menu_bar_state.inner.with_data_mut(|state| {
+ let (anchor_rect, gravity) = my_state.menu_bar_state.inner.with_data_mut(|state| {
use iced::Rectangle;
state.popup_id.insert(self.window_id, id);
@@ -376,6 +377,7 @@ impl Widget
#[cfg(all(
feature = "wayland",
target_os = "linux",
+ feature = "winit",
feature = "surface-message"
))]
if matches!(WINDOWING_SYSTEM.get(), Some(WindowingSystem::Wayland))
@@ -419,6 +421,7 @@ impl Widget
#[cfg(all(
feature = "wayland",
target_os = "linux",
+ feature = "winit",
feature = "surface-message"
))]
if matches!(WINDOWING_SYSTEM.get(), Some(WindowingSystem::Wayland)) {
@@ -440,6 +443,7 @@ impl Widget
#[cfg(all(
feature = "wayland",
target_os = "linux",
+ feature = "winit",
feature = "surface-message"
))]
if matches!(WINDOWING_SYSTEM.get(), Some(WindowingSystem::Wayland))
@@ -478,6 +482,7 @@ impl Widget
#[cfg(all(
feature = "wayland",
target_os = "linux",
+ feature = "winit",
feature = "surface-message"
))]
if matches!(WINDOWING_SYSTEM.get(), Some(WindowingSystem::Wayland))
diff --git a/src/widget/dialog.rs b/src/widget/dialog.rs
index 72ab11f..7d08462 100644
--- a/src/widget/dialog.rs
+++ b/src/widget/dialog.rs
@@ -1,5 +1,8 @@
-use crate::iced::{Length, Pixels};
-use crate::{Element, style, theme, widget};
+use crate::{
+ Element,
+ iced::{Length, Pixels},
+ style, theme, widget,
+};
use std::borrow::Cow;
pub fn dialog<'a, Message>() -> Dialog<'a, Message> {
diff --git a/src/widget/dnd_destination.rs b/src/widget/dnd_destination.rs
index afe135b..10bf7a8 100644
--- a/src/widget/dnd_destination.rs
+++ b/src/widget/dnd_destination.rs
@@ -1,17 +1,29 @@
-use std::borrow::Cow;
-use std::sync::atomic::{AtomicU64, Ordering};
+use std::{
+ borrow::Cow,
+ sync::atomic::{AtomicU64, Ordering},
+};
use iced::Vector;
-use crate::Element;
-use crate::widget::{Id, Widget};
+use crate::{
+ Element,
+ widget::{Id, Widget},
+};
-use iced::clipboard::dnd::{self, DndAction, DndDestinationRectangle, DndEvent, OfferEvent};
-use iced::clipboard::mime::AllowedMimeTypes;
-use iced::id::Internal;
-use iced::{Event, Length, Rectangle, event, mouse, overlay};
-use iced_core::widget::{Tree, tree};
-use iced_core::{self, Clipboard, Shell, layout};
+use iced::{
+ Event, Length, Rectangle,
+ clipboard::{
+ dnd::{self, DndAction, DndDestinationRectangle, DndEvent, OfferEvent},
+ mime::AllowedMimeTypes,
+ },
+ event,
+ id::Internal,
+ mouse, overlay,
+};
+use iced_core::{
+ self, Clipboard, Shell, layout,
+ widget::{Tree, tree},
+};
pub fn dnd_destination<'a, Message: 'static>(
child: impl Into>,
@@ -357,7 +369,7 @@ impl Widget
x, y, mime_types, ..
},
)) if *id == Some(my_id) => {
- if !self.mime_matches(mime_types) {
+ if !self.mime_matches(&mime_types) {
log::trace!(
target: DND_DEST_LOG_TARGET,
"offer enter id={my_id:?} ignored (mimes={mime_types:?} not in {:?})",
@@ -396,6 +408,7 @@ impl Widget
);
}
shell.capture_event();
+ return;
}
Event::Dnd(DndEvent::Offer(_, OfferEvent::Leave)) => {
log::trace!(
@@ -423,6 +436,7 @@ impl Widget
viewport,
);
}
+ return;
}
Event::Dnd(DndEvent::Offer(id, OfferEvent::Motion { x, y })) if *id == Some(my_id) => {
log::trace!(
@@ -457,6 +471,7 @@ impl Widget
);
}
shell.capture_event();
+ return;
}
Event::Dnd(DndEvent::Offer(_, OfferEvent::LeaveDestination)) => {
log::trace!(
@@ -469,6 +484,7 @@ impl Widget
{
shell.publish(msg);
}
+ return;
}
Event::Dnd(DndEvent::Offer(id, OfferEvent::Drop)) if *id == Some(my_id) => {
log::trace!(
@@ -481,6 +497,7 @@ impl Widget
shell.publish(msg);
}
shell.capture_event();
+ return;
}
Event::Dnd(DndEvent::Offer(id, OfferEvent::SelectedAction(action)))
if *id == Some(my_id) =>
@@ -498,6 +515,7 @@ impl Widget
shell.publish(msg);
}
shell.capture_event();
+ return;
}
Event::Dnd(DndEvent::Offer(id, OfferEvent::Data { data, mime_type }))
if *id == Some(my_id) =>
@@ -537,6 +555,7 @@ impl Widget
return;
}
shell.capture_event();
+ return;
}
_ => {}
}
diff --git a/src/widget/dnd_source.rs b/src/widget/dnd_source.rs
index 3cc9fa7..980723e 100644
--- a/src/widget/dnd_source.rs
+++ b/src/widget/dnd_source.rs
@@ -1,14 +1,20 @@
use std::any::Any;
-use iced_core::widget::Operation;
-use iced_core::window;
+use iced_core::{widget::Operation, window};
-use crate::Element;
-use crate::widget::{Id, Widget, container};
-use iced::clipboard::dnd::{DndAction, DndEvent, SourceEvent};
-use iced::{Event, Length, Point, Rectangle, Vector, event, mouse, overlay};
-use iced_core::widget::{Tree, tree};
-use iced_core::{self, Clipboard, Shell, layout, renderer};
+use crate::{
+ Element,
+ widget::{Id, Widget, container},
+};
+use iced::{
+ Event, Length, Point, Rectangle, Vector,
+ clipboard::dnd::{DndAction, DndEvent, SourceEvent},
+ event, mouse, overlay,
+};
+use iced_core::{
+ self, Clipboard, Shell, layout, renderer,
+ widget::{Tree, tree},
+};
pub fn dnd_source<
'a,
diff --git a/src/widget/dropdown/menu/appearance.rs b/src/widget/dropdown/menu/appearance.rs
index 2c32c01..d1bed21 100644
--- a/src/widget/dropdown/menu/appearance.rs
+++ b/src/widget/dropdown/menu/appearance.rs
@@ -3,8 +3,7 @@
// SPDX-License-Identifier: MPL-2.0 AND MIT
//! Change the appearance of menus.
-use iced_core::border::Radius;
-use iced_core::{Background, Color};
+use iced_core::{Background, Color, border::Radius};
/// The appearance of a menu.
#[derive(Debug, Clone, Copy)]
diff --git a/src/widget/dropdown/menu/mod.rs b/src/widget/dropdown/menu/mod.rs
index 99bee95..0c96c1c 100644
--- a/src/widget/dropdown/menu/mod.rs
+++ b/src/widget/dropdown/menu/mod.rs
@@ -8,8 +8,9 @@ use std::sync::{Arc, Mutex};
pub use appearance::{Appearance, StyleSheet};
+use crate::surface;
use crate::widget::{Container, RcWrapper, icon};
-use iced_core::event::Event;
+use iced_core::event::{self, Event};
use iced_core::layout::{self, Layout};
use iced_core::text::{self, Text};
use iced_core::widget::Tree;
@@ -390,7 +391,7 @@ impl<'a, Message: Clone + 'a> crate::widget::Widget {
let hovered_guard = self.hovered_option.lock().unwrap();
- if cursor.is_over(layout.bounds())
- && let Some(index) = *hovered_guard {
+ if cursor.is_over(layout.bounds()) {
+ if let Some(index) = *hovered_guard {
shell.publish((self.on_selected)(index));
if let Some(close_on_selected) = self.close_on_selected.as_ref() {
shell.publish(close_on_selected.clone());
}
shell.capture_event();
+ return;
}
+ }
}
Event::Mouse(mouse::Event::CursorMoved { .. }) => {
if let Some(cursor_position) = cursor.position_in(layout.bounds()) {
@@ -496,10 +499,11 @@ where
let new_hovered_option = (cursor_position.y / option_height) as usize;
let mut hovered_guard = self.hovered_option.lock().unwrap();
- if let Some(on_option_hovered) = self.on_option_hovered
- && *hovered_guard != Some(new_hovered_option) {
+ if let Some(on_option_hovered) = self.on_option_hovered {
+ if *hovered_guard != Some(new_hovered_option) {
shell.publish(on_option_hovered(new_hovered_option));
}
+ }
*hovered_guard = Some(new_hovered_option);
}
@@ -523,6 +527,7 @@ where
shell.publish(close_on_selected.clone());
}
shell.capture_event();
+ return;
}
}
}
@@ -549,12 +554,12 @@ where
fn draw(
&self,
- _state: &Tree,
+ state: &Tree,
renderer: &mut crate::Renderer,
theme: &crate::Theme,
- _style: &renderer::Style,
+ style: &renderer::Style,
layout: Layout<'_>,
- _cursor: mouse::Cursor,
+ cursor: mouse::Cursor,
viewport: &Rectangle,
) {
let appearance = theme.appearance(&());
diff --git a/src/widget/dropdown/mod.rs b/src/widget/dropdown/mod.rs
index 0ea3a21..b5fd4c0 100644
--- a/src/widget/dropdown/mod.rs
+++ b/src/widget/dropdown/mod.rs
@@ -50,7 +50,7 @@ pub fn popup_dropdown<
let dropdown: Dropdown<'_, S, Message, AppMessage> =
Dropdown::new(selections.into(), selected, on_selected);
- #[cfg(all(feature = "wayland", target_os = "linux"))]
+ #[cfg(all(feature = "winit", feature = "wayland", target_os = "linux"))]
let dropdown = dropdown.with_popup(_parent_id, _on_surface_action, _map_action);
dropdown
diff --git a/src/widget/dropdown/multi/menu.rs b/src/widget/dropdown/multi/menu.rs
index 883b8ad..0a76109 100644
--- a/src/widget/dropdown/multi/menu.rs
+++ b/src/widget/dropdown/multi/menu.rs
@@ -2,7 +2,7 @@ use super::Model;
pub use crate::widget::dropdown::menu::{Appearance, StyleSheet};
use crate::widget::Container;
-use iced_core::event::Event;
+use iced_core::event::{self, Event};
use iced_core::layout::{self, Layout};
use iced_core::text::{self, Text};
use iced_core::widget::Tree;
@@ -343,11 +343,13 @@ where
match event {
Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) => {
- if cursor.is_over(bounds)
- && let Some(item) = self.hovered_option.as_ref() {
+ if cursor.is_over(bounds) {
+ if let Some(item) = self.hovered_option.as_ref() {
shell.publish((self.on_selected)(item.clone()));
shell.capture_event();
+ return;
}
+ }
}
Event::Mouse(mouse::Event::CursorMoved { .. }) => {
if let Some(cursor_position) = cursor.position_in(bounds) {
diff --git a/src/widget/dropdown/multi/widget.rs b/src/widget/dropdown/multi/widget.rs
index c7a4659..779c6d0 100644
--- a/src/widget/dropdown/multi/widget.rs
+++ b/src/widget/dropdown/multi/widget.rs
@@ -5,14 +5,15 @@
use super::menu::{self, Menu};
use crate::widget::icon;
use derive_setters::Setters;
-use iced_core::event::Event;
-use iced_core::text::{self, Text};
+use iced_core::event::{self, Event};
+use iced_core::text::{self, Paragraph, Text};
use iced_core::widget::tree::{self, Tree};
use iced_core::{
- Clipboard, Layout, Length, Padding, Pixels, Rectangle, Shadow, Shell, Size, Vector, Widget,
- alignment, keyboard, layout, mouse, overlay, renderer, svg, touch,
+ Clipboard, Layout, Length, Padding, Pixels, Rectangle, Shell, Size, Vector, Widget,
};
+use iced_core::{Shadow, alignment, keyboard, layout, mouse, overlay, renderer, svg, touch};
use iced_widget::pick_list;
+use std::ffi::OsStr;
pub use iced_widget::pick_list::{Catalog, Style};
@@ -127,7 +128,7 @@ impl<'a, S: AsRef, Message: 'a, Item: Clone + PartialEq + 'static>
_viewport: &Rectangle,
) {
update(
- event,
+ &event,
layout,
cursor,
shell,
@@ -252,7 +253,7 @@ impl Default for State- {
/// Computes the layout of a [`Dropdown`].
#[allow(clippy::too_many_arguments)]
pub fn layout(
- _renderer: &crate::Renderer,
+ renderer: &crate::Renderer,
limits: &layout::Limits,
width: Length,
gap: f32,
@@ -375,7 +376,7 @@ pub fn mouse_interaction(layout: Layout<'_>, cursor: mouse::Cursor) -> mouse::In
#[allow(clippy::too_many_arguments)]
pub fn overlay<'a, S: AsRef, Message: 'a, Item: Clone + PartialEq + 'static>(
layout: Layout<'_>,
- _renderer: &crate::Renderer,
+ renderer: &crate::Renderer,
state: &'a mut State
- ,
gap: f32,
padding: Padding,
diff --git a/src/widget/dropdown/operation.rs b/src/widget/dropdown/operation.rs
index 4cd266d..1a4e1a9 100644
--- a/src/widget/dropdown/operation.rs
+++ b/src/widget/dropdown/operation.rs
@@ -2,6 +2,9 @@
// SPDX-License-Identifier: MPL-2.0 AND MIT
//! Operate on dropdown widgets.
+use super::State;
+use iced::Rectangle;
+use iced_core::widget::{Id, Operation};
pub trait Dropdown {
fn close(&mut self);
diff --git a/src/widget/dropdown/widget.rs b/src/widget/dropdown/widget.rs
index ebcf175..2ff9c92 100644
--- a/src/widget/dropdown/widget.rs
+++ b/src/widget/dropdown/widget.rs
@@ -8,15 +8,16 @@ use crate::widget::icon::{self, Handle};
use crate::{Element, surface};
use derive_setters::Setters;
use iced::window;
-use iced_core::event::Event;
+use iced_core::event::{self, Event};
use iced_core::text::{self, Paragraph, Text};
use iced_core::widget::tree::{self, Tree};
use iced_core::{
- Clipboard, Layout, Length, Padding, Pixels, Rectangle, Shadow, Shell, Size, Vector, Widget,
- alignment, keyboard, layout, mouse, overlay, renderer, svg, touch,
+ Clipboard, Layout, Length, Padding, Pixels, Rectangle, Shell, Size, Vector, Widget,
};
+use iced_core::{Shadow, alignment, keyboard, layout, mouse, overlay, renderer, svg, touch};
use iced_widget::pick_list::{self, Catalog};
use std::borrow::Cow;
+use std::ffi::OsStr;
use std::hash::{DefaultHasher, Hash, Hasher};
use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::{Arc, LazyLock, Mutex};
@@ -59,7 +60,7 @@ where
action_map: Option AppMessage + 'static + Send + Sync>>,
#[setters(strip_option)]
window_id: Option,
- #[cfg(all(feature = "wayland", target_os = "linux"))]
+ #[cfg(all(feature = "winit", feature = "wayland", target_os = "linux"))]
positioner: iced_runtime::platform_specific::wayland::popup::SctkPositioner,
}
@@ -95,14 +96,14 @@ where
text_line_height: text::LineHeight::Relative(1.2),
font: None,
window_id: None,
- #[cfg(all(feature = "wayland", target_os = "linux"))]
+ #[cfg(all(feature = "winit", feature = "wayland", target_os = "linux"))]
positioner: iced_runtime::platform_specific::wayland::popup::SctkPositioner::default(),
on_surface_action: None,
action_map: None,
}
}
- #[cfg(all(feature = "wayland", target_os = "linux"))]
+ #[cfg(all(feature = "winit", feature = "wayland", target_os = "linux"))]
/// Handle dropdown requests for popup creation.
/// Intended to be used with [`crate::app::message::get_popup`]
pub fn with_popup(
@@ -153,7 +154,7 @@ where
self
}
- #[cfg(all(feature = "wayland", target_os = "linux"))]
+ #[cfg(all(feature = "winit", feature = "wayland", target_os = "linux"))]
pub fn with_positioner(
mut self,
positioner: iced_runtime::platform_specific::wayland::popup::SctkPositioner,
@@ -263,11 +264,11 @@ where
_viewport: &Rectangle,
) {
update::(
- event,
+ &event,
layout,
cursor,
shell,
- #[cfg(all(feature = "wayland", target_os = "linux"))]
+ #[cfg(all(feature = "winit", feature = "wayland", target_os = "linux"))]
self.positioner.clone(),
self.on_selected.clone(),
self.selected,
@@ -327,10 +328,10 @@ where
fn operate(
&mut self,
- _tree: &mut Tree,
+ tree: &mut Tree,
_layout: Layout<'_>,
_renderer: &crate::Renderer,
- _operation: &mut dyn iced_core::widget::Operation,
+ operation: &mut dyn iced_core::widget::Operation,
) {
// TODO: double check operation handling
// let state = tree.state.downcast_mut::();
@@ -342,10 +343,10 @@ where
tree: &'b mut Tree,
layout: Layout<'b>,
renderer: &crate::Renderer,
- _viewport: &Rectangle,
+ viewport: &Rectangle,
translation: Vector,
) -> Option> {
- #[cfg(all(feature = "wayland", target_os = "linux"))]
+ #[cfg(all(feature = "winit", feature = "wayland", target_os = "linux"))]
if self.window_id.is_some() || self.on_surface_action.is_some() {
return None;
}
@@ -451,7 +452,7 @@ impl super::operation::Dropdown for State {
/// Computes the layout of a [`Dropdown`].
#[allow(clippy::too_many_arguments)]
pub fn layout(
- _renderer: &crate::Renderer,
+ renderer: &crate::Renderer,
limits: &layout::Limits,
width: Length,
gap: f32,
@@ -544,8 +545,8 @@ pub fn update<
layout: Layout<'_>,
cursor: mouse::Cursor,
shell: &mut Shell<'_, Message>,
- #[cfg(all(feature = "wayland", target_os = "linux"))]
- _positioner: iced_runtime::platform_specific::wayland::popup::SctkPositioner,
+ #[cfg(all(feature = "winit", feature = "wayland", target_os = "linux"))]
+ positioner: iced_runtime::platform_specific::wayland::popup::SctkPositioner,
on_selected: Arc Message + Send + Sync + 'static>,
selected: Option,
selections: &[S],
@@ -557,7 +558,7 @@ pub fn update<
gap: f32,
padding: Padding,
text_size: Option,
- _font: Option,
+ font: Option,
selected_option: Option,
) {
let state = state();
@@ -570,7 +571,7 @@ pub fn update<
*hovered_guard = selected;
let id = window::Id::unique();
state.popup_id = id;
- #[cfg(all(feature = "wayland", target_os = "linux"))]
+ #[cfg(all(feature = "winit", feature = "wayland", target_os = "linux"))]
if let Some(((on_surface_action, parent), action_map)) = on_surface_action
.as_ref()
.zip(_window_id)
@@ -657,7 +658,7 @@ pub fn update<
state.close_operation = false;
state.is_open.store(false, Ordering::SeqCst);
if is_open {
- #[cfg(all(feature = "wayland", target_os = "linux"))]
+ #[cfg(all(feature = "winit", feature = "wayland", target_os = "linux"))]
if let Some(ref on_close) = on_surface_action {
shell.publish(on_close(surface::action::destroy_popup(state.popup_id)));
}
@@ -680,7 +681,7 @@ pub fn update<
// Event wasn't processed by overlay, so cursor was clicked either outside it's
// bounds or on the drop-down, either way we close the overlay.
state.is_open.store(false, Ordering::Relaxed);
- #[cfg(all(feature = "wayland", target_os = "linux"))]
+ #[cfg(all(feature = "winit", feature = "wayland", target_os = "linux"))]
if let Some(on_close) = on_surface_action {
shell.publish(on_close(surface::action::destroy_popup(state.popup_id)));
}
@@ -725,7 +726,7 @@ pub fn mouse_interaction(layout: Layout<'_>, cursor: mouse::Cursor) -> mouse::In
}
}
-#[cfg(all(feature = "wayland", target_os = "linux"))]
+#[cfg(all(feature = "winit", feature = "wayland", target_os = "linux"))]
/// Returns the current menu widget of a [`Dropdown`].
#[allow(clippy::too_many_arguments)]
pub fn menu_widget<
diff --git a/src/widget/flex_row/widget.rs b/src/widget/flex_row/widget.rs
index e5c0b61..0b2e6e1 100644
--- a/src/widget/flex_row/widget.rs
+++ b/src/widget/flex_row/widget.rs
@@ -3,7 +3,7 @@
use crate::{Element, Renderer};
use derive_setters::Setters;
-use iced_core::event::Event;
+use iced_core::event::{self, Event};
use iced_core::widget::{Operation, Tree};
use iced_core::{
Clipboard, Layout, Length, Padding, Rectangle, Shell, Vector, Widget, layout, mouse, overlay,
diff --git a/src/widget/frames.rs b/src/widget/frames.rs
index bf985ce..a542cec 100644
--- a/src/widget/frames.rs
+++ b/src/widget/frames.rs
@@ -2,12 +2,14 @@
//! Based on
use std::ffi::OsStr;
+use std::fmt;
+use std::io;
use std::path::Path;
use std::time::{Duration, Instant};
-use std::{fmt, io};
use ::image as image_rs;
-use iced::{Task, mouse};
+use iced::Task;
+use iced::mouse;
use iced_core::image::Renderer as ImageRenderer;
use iced_core::mouse::Cursor;
use iced_core::widget::{Tree, tree};
diff --git a/src/widget/grid/widget.rs b/src/widget/grid/widget.rs
index 55ce3c9..e59ba90 100644
--- a/src/widget/grid/widget.rs
+++ b/src/widget/grid/widget.rs
@@ -3,7 +3,7 @@
use crate::{Element, Renderer};
use derive_setters::Setters;
-use iced_core::event::Event;
+use iced_core::event::{self, Event};
use iced_core::widget::{Operation, Tree};
use iced_core::{
Alignment, Clipboard, Layout, Length, Padding, Rectangle, Shell, Vector, Widget, layout, mouse,
diff --git a/src/widget/header_bar.rs b/src/widget/header_bar.rs
index 82a7e8e..a772f7d 100644
--- a/src/widget/header_bar.rs
+++ b/src/widget/header_bar.rs
@@ -5,8 +5,7 @@ use crate::cosmic_theme::{Density, Spacing};
use crate::{Element, theme, widget};
use apply::Apply;
use derive_setters::Setters;
-use iced_core::widget::tree;
-use iced_core::{Length, Size, Vector, Widget, layout, text};
+use iced_core::{Length, Size, Vector, Widget, layout, text, widget::tree};
use std::borrow::Cow;
#[must_use]
@@ -28,31 +27,9 @@ pub fn header_bar<'a, Message>() -> HeaderBar<'a, Message> {
is_ssd: false,
on_double_click: None,
transparent: false,
- controls_position: None,
}
}
-/// Position of the window control buttons (close/min/max) within the headerbar.
-#[derive(
- Clone,
- Copy,
- Debug,
- Default,
- PartialEq,
- Eq,
- serde::Serialize,
- serde::Deserialize,
-)]
-pub enum WindowControlsPosition {
- /// Controls packed at the start (left on LTR) — macOS style.
- /// Internal icon order becomes close → minimize → maximize.
- Start,
- /// Controls packed at the end (right on LTR) — Linux / GNOME style.
- /// Internal icon order is minimize → maximize → close.
- #[default]
- End,
-}
-
#[derive(Setters)]
pub struct HeaderBar<'a, Message> {
/// Defines the title of the window
@@ -114,14 +91,6 @@ pub struct HeaderBar<'a, Message> {
/// Whether the headerbar should be transparent
transparent: bool,
-
- /// Side on which the window control buttons (close / minimize / maximize)
- /// are rendered. `None` falls back to the user's CosmicTk config
- /// (`crate::config::window_controls_position()`). `Some` overrides it.
- /// `End` matches Linux / GNOME conventions; `Start` provides macOS-style
- /// left-side controls.
- #[setters(strip_option)]
- controls_position: Option,
}
impl<'a, Message: Clone + 'static> HeaderBar<'a, Message> {
@@ -401,25 +370,16 @@ impl<'a, Message: Clone + 'static> HeaderBar<'a, Message> {
space_xxs,
..
} = theme::spacing();
- let is_ssd = self.is_ssd;
// Take ownership of the regions to be packed.
- let mut start = std::mem::take(&mut self.start);
+ let start = std::mem::take(&mut self.start);
let center = std::mem::take(&mut self.center);
let mut end = std::mem::take(&mut self.end);
- // Pack window controls on the configured side (reads CosmicTk
- // config when the builder did not set an explicit override).
- let controls_position = self
- .controls_position
- .unwrap_or_else(crate::config::window_controls_position);
- let controls = self.window_controls(space_xxs, controls_position);
- match controls_position {
- WindowControlsPosition::End => end.push(controls),
- WindowControlsPosition::Start => start.insert(0, controls),
- }
+ // Also packs the window controls at the very end.
+ end.push(self.window_controls(space_xxs));
- let padding = if is_ssd {
+ let padding = if self.is_ssd {
[2, 8, 2, 8]
} else {
match (
@@ -464,7 +424,7 @@ impl<'a, Message: Clone + 'static> HeaderBar<'a, Message> {
.class(theme::Container::HeaderBar {
focused: self.focused,
sharp_corners: self.sharp_corners,
- transparent: if is_ssd { false } else { true },
+ transparent: self.transparent,
})
.height(Length::Fixed(32.0 + padding[0] as f32 + padding[2] as f32))
.padding(padding)
@@ -487,11 +447,7 @@ impl<'a, Message: Clone + 'static> HeaderBar<'a, Message> {
}
/// Creates the widget for window controls.
- fn window_controls(
- &mut self,
- spacing: u16,
- controls_position: WindowControlsPosition,
- ) -> Element<'a, Message> {
+ fn window_controls(&mut self, spacing: u16) -> Element<'a, Message> {
macro_rules! icon {
($name:expr, $size:expr, $on_press:expr) => {{
widget::icon::from_name($name)
@@ -504,37 +460,25 @@ impl<'a, Message: Clone + 'static> HeaderBar<'a, Message> {
}};
}
- let minimize = self
- .on_minimize
- .take()
- .map(|m| icon!("window-minimize-symbolic", 16, m));
- let maximize = self.on_maximize.take().map(|m| {
- if self.maximized {
- icon!("window-restore-symbolic", 16, m)
- } else {
- icon!("window-maximize-symbolic", 16, m)
- }
- });
- let close = self
- .on_close
- .take()
- .map(|m| icon!("window-close-symbolic", 16, m));
-
- // Icon order follows the OS convention for the chosen side:
- // End → minimize, maximize, close (Linux / GNOME)
- // Start → close, minimize, maximize (macOS)
- let row = widget::row::with_capacity(3);
- let row = match controls_position {
- WindowControlsPosition::End => row
- .push_maybe(minimize)
- .push_maybe(maximize)
- .push_maybe(close),
- WindowControlsPosition::Start => row
- .push_maybe(close)
- .push_maybe(minimize)
- .push_maybe(maximize),
- };
- row.spacing(spacing)
+ widget::row::with_capacity(3)
+ .push_maybe(
+ self.on_minimize
+ .take()
+ .map(|m| icon!("window-minimize-symbolic", 16, m)),
+ )
+ .push_maybe(self.on_maximize.take().map(|m| {
+ if self.maximized {
+ icon!("window-restore-symbolic", 16, m)
+ } else {
+ icon!("window-maximize-symbolic", 16, m)
+ }
+ }))
+ .push_maybe(
+ self.on_close
+ .take()
+ .map(|m| icon!("window-close-symbolic", 16, m)),
+ )
+ .spacing(spacing)
.align_y(iced::Alignment::Center)
.into()
}
diff --git a/src/widget/icon/bundle.rs b/src/widget/icon/bundle.rs
index 30a9938..bb6ce24 100644
--- a/src/widget/icon/bundle.rs
+++ b/src/widget/icon/bundle.rs
@@ -5,7 +5,7 @@
/// Icon bundling is not enabled on unix platforms.
#[cfg(all(unix, not(target_os = "macos")))]
-pub fn get(_icon_name: &str) -> Option {
+pub fn get(icon_name: &str) -> Option {
None
}
diff --git a/src/widget/icon/named.rs b/src/widget/icon/named.rs
index 8905030..dfd66cf 100644
--- a/src/widget/icon/named.rs
+++ b/src/widget/icon/named.rs
@@ -2,10 +2,7 @@
// SPDX-License-Identifier: MPL-2.0
use super::{Handle, Icon};
-use std::borrow::Cow;
-use std::ffi::OsStr;
-use std::path::PathBuf;
-use std::sync::Arc;
+use std::{borrow::Cow, ffi::OsStr, path::PathBuf, sync::Arc};
#[derive(Debug, Clone, Default, Hash)]
/// Fallback icon to use if the icon was not found.
@@ -39,10 +36,6 @@ pub struct Named {
/// Prioritizes SVG over PNG
pub prefer_svg: bool,
-
- /// Extra directories to search as flat paths before the icon theme chain.
- #[setters(skip)]
- pub extra_paths: Vec,
}
impl Named {
@@ -56,30 +49,19 @@ impl Named {
size: None,
scale: None,
prefer_svg: symbolic,
- extra_paths: Vec::new(),
}
}
- pub fn with_extra_paths(mut self, paths: Vec) -> Self {
- self.extra_paths = paths;
- self
- }
-
#[cfg(all(unix, not(target_os = "macos")))]
#[must_use]
pub fn path(self) -> Option {
let name = &*self.name;
let fallback = &self.fallback;
- let extra_paths = &self.extra_paths;
let locate = |theme: &str, name| {
let mut lookup = freedesktop_icons::lookup(name)
.with_theme(theme.as_ref())
.with_cache();
- if !extra_paths.is_empty() {
- lookup = lookup.with_extra_paths(extra_paths);
- }
-
if let Some(scale) = self.scale {
lookup = lookup.with_scale(scale);
}
diff --git a/src/widget/id_container.rs b/src/widget/id_container.rs
index 6b0d13c..716ee13 100644
--- a/src/widget/id_container.rs
+++ b/src/widget/id_container.rs
@@ -1,9 +1,10 @@
use iced_core::event::{self, Event};
+use iced_core::layout;
+use iced_core::mouse;
+use iced_core::overlay;
+use iced_core::renderer;
use iced_core::widget::{Id, Operation, Tree};
-use iced_core::{
- Clipboard, Element, Layout, Length, Rectangle, Shell, Vector, Widget, layout, mouse, overlay,
- renderer,
-};
+use iced_core::{Clipboard, Element, Layout, Length, Rectangle, Shell, Vector, Widget};
pub use iced_widget::container::{Catalog, Style};
pub fn id_container<'a, Message: 'static, Theme, E>(
diff --git a/src/widget/layer_container.rs b/src/widget/layer_container.rs
index 3958b03..110af51 100644
--- a/src/widget/layer_container.rs
+++ b/src/widget/layer_container.rs
@@ -2,10 +2,13 @@ use crate::Theme;
use cosmic_theme::LayeredTheme;
use iced::widget::Container;
use iced_core::event::{self, Event};
+use iced_core::layout;
+use iced_core::mouse;
+use iced_core::overlay;
+use iced_core::renderer;
use iced_core::widget::Tree;
use iced_core::{
Alignment, Clipboard, Element, Layout, Length, Padding, Rectangle, Shell, Vector, Widget,
- layout, mouse, overlay, renderer,
};
pub use iced_widget::container::{Catalog, Style};
diff --git a/src/widget/list/list_column.rs b/src/widget/list/list_column.rs
index 9e4204c..4ef3fc0 100644
--- a/src/widget/list/list_column.rs
+++ b/src/widget/list/list_column.rs
@@ -2,8 +2,7 @@
// SPDX-License-Identifier: MPL-2.0
use crate::widget::container::Catalog;
-use crate::widget::space::vertical;
-use crate::widget::{button, column, container, divider, row};
+use crate::widget::{button, column, container, divider, row, space::vertical};
use crate::{Apply, Element, theme};
use iced::{Length, Padding};
diff --git a/src/widget/menu/flex.rs b/src/widget/menu/flex.rs
index e4a3287..4a58f13 100644
--- a/src/widget/menu/flex.rs
+++ b/src/widget/menu/flex.rs
@@ -1,9 +1,11 @@
// From iced_aw, license MIT
-use iced_core::Widget;
-use iced_core::widget::Tree;
-use iced_widget::core::layout::{Limits, Node};
-use iced_widget::core::{Alignment, Element, Padding, Point, Size, renderer};
+use iced_core::{Widget, widget::Tree};
+use iced_widget::core::{
+ Alignment, Element, Padding, Point, Size,
+ layout::{Limits, Node},
+ renderer,
+};
use crate::widget::RcElementWrapper;
@@ -48,7 +50,6 @@ impl Axis {
/// padding and alignment to the items as needed.
///
/// It returns a new layout [`Node`].
-#[allow(dead_code)] // kept as public helper; not currently called by libcosmic
pub fn resolve<'a, E, Message, Renderer>(
axis: &Axis,
renderer: &Renderer,
@@ -247,7 +248,7 @@ pub fn resolve_wrapper<'a, Message>(
if align_items == Alignment::Center {
let mut fill_cross = axis.cross(limits.min());
- for (child, tree) in items.iter_mut().zip(tree.iter_mut()) {
+ for (child, tree) in items.into_iter().zip(tree.iter_mut()) {
let c_size = child.size();
let cross_fill_factor = match axis {
Axis::Horizontal => c_size.height,
@@ -270,7 +271,7 @@ pub fn resolve_wrapper<'a, Message>(
cross = fill_cross;
}
- for (i, (child, tree)) in items.iter_mut().zip(tree.iter_mut()).enumerate() {
+ for (i, (child, tree)) in items.into_iter().zip(tree.iter_mut()).enumerate() {
let c_size = child.size();
let fill_factor = match axis {
Axis::Horizontal => c_size.width,
@@ -313,7 +314,7 @@ pub fn resolve_wrapper<'a, Message>(
let remaining = available.max(0.0);
- for (i, (child, tree)) in items.iter_mut().zip(tree.iter_mut()).enumerate() {
+ for (i, (child, tree)) in items.into_iter().zip(tree.iter_mut()).enumerate() {
let c_size = child.size();
let fill_factor = match axis {
Axis::Horizontal => c_size.width,
diff --git a/src/widget/menu/key_bind.rs b/src/widget/menu/key_bind.rs
index ef87b34..8b4ed22 100644
--- a/src/widget/menu/key_bind.rs
+++ b/src/widget/menu/key_bind.rs
@@ -1,4 +1,3 @@
-use iced_core::keyboard::key::{Code, Physical};
use iced_core::keyboard::{Key, Modifiers};
use std::fmt;
@@ -28,102 +27,28 @@ pub struct KeyBind {
}
impl KeyBind {
- /// Checks if the given key and modifiers match the `KeyBind`, with an
- /// optional fallback to the physical key position for non-Latin keyboard
- /// layouts.
+ /// Checks if the given key and modifiers match the `KeyBind`.
///
/// # Arguments
///
/// * `modifiers` - A `Modifiers` instance representing the current active modifiers.
/// * `key` - A reference to the `Key` that is being checked.
- /// * `physical_key` - An optional reference to the physical key position,
- /// used as a fallback when the logical `key` does not match (e.g. on
- /// Cyrillic or other non-Latin layouts). Can be `None` for keys where
- /// the physical position is not relevant (e.g. `Key::Named`).
///
/// # Returns
///
/// * `bool` - `true` if the key and modifiers match the `KeyBind`, `false` otherwise.
- pub fn matches(
- &self,
- modifiers: Modifiers,
- key: &Key,
- physical_key: Option<&Physical>,
- ) -> bool {
- let key_eq = self.key_eq(key)
- || physical_key
- .and_then(physical_key_to_latin)
- .is_some_and(|latin| self.key_eq(&latin));
+ pub fn matches(&self, modifiers: Modifiers, key: &Key) -> bool {
+ let key_eq = match (key, &self.key) {
+ // CapsLock and Shift change the case of Key::Character, so we compare these in a case insensitive way
+ (Key::Character(a), Key::Character(b)) => a.eq_ignore_ascii_case(b),
+ (a, b) => a.eq(b),
+ };
key_eq
&& modifiers.logo() == self.modifiers.contains(&Modifier::Super)
&& modifiers.control() == self.modifiers.contains(&Modifier::Ctrl)
&& modifiers.alt() == self.modifiers.contains(&Modifier::Alt)
&& modifiers.shift() == self.modifiers.contains(&Modifier::Shift)
}
-
- fn key_eq(&self, key: &Key) -> bool {
- match (key, &self.key) {
- // CapsLock and Shift change the case of Key::Character, so we compare these in a case insensitive way
- (Key::Character(a), Key::Character(b)) => a.eq_ignore_ascii_case(b),
- (a, b) => a.eq(b),
- }
- }
-}
-
-/// Converts a physical key code to the corresponding US-layout Latin `Key`.
-///
-/// This mapping is intentionally limited to keys that may produce different
-/// characters on non-Latin keyboard layouts (letters and punctuation). Keys
-/// like digits are not included because they remain the same across layouts.
-///
-/// Only used as a fallback when the primary key comparison in
-/// [`KeyBind::matches`] does not match.
-fn physical_key_to_latin(physical_key: &Physical) -> Option {
- let code = match physical_key {
- Physical::Code(code) => code,
- Physical::Unidentified(_) => return None,
- };
- let ch = match code {
- Code::KeyA => "a",
- Code::KeyB => "b",
- Code::KeyC => "c",
- Code::KeyD => "d",
- Code::KeyE => "e",
- Code::KeyF => "f",
- Code::KeyG => "g",
- Code::KeyH => "h",
- Code::KeyI => "i",
- Code::KeyJ => "j",
- Code::KeyK => "k",
- Code::KeyL => "l",
- Code::KeyM => "m",
- Code::KeyN => "n",
- Code::KeyO => "o",
- Code::KeyP => "p",
- Code::KeyQ => "q",
- Code::KeyR => "r",
- Code::KeyS => "s",
- Code::KeyT => "t",
- Code::KeyU => "u",
- Code::KeyV => "v",
- Code::KeyW => "w",
- Code::KeyX => "x",
- Code::KeyY => "y",
- Code::KeyZ => "z",
- Code::Minus => "-",
- Code::Equal => "=",
- Code::BracketLeft => "[",
- Code::BracketRight => "]",
- Code::Backslash => "\\",
- Code::Semicolon => ";",
- Code::Quote => "'",
- Code::Backquote => "`",
- Code::Comma => ",",
- Code::Period => ".",
- Code::Slash => "/",
- _ => return None,
- };
- Some(Key::Character(ch.into()))
}
impl fmt::Display for KeyBind {
diff --git a/src/widget/menu/menu_bar.rs b/src/widget/menu/menu_bar.rs
index 3843c34..981446e 100644
--- a/src/widget/menu/menu_bar.rs
+++ b/src/widget/menu/menu_bar.rs
@@ -1,36 +1,42 @@
// From iced_aw, license MIT
//! A widget that handles menu trees
-use std::collections::HashMap;
-use std::sync::Arc;
+use std::{collections::HashMap, sync::Arc};
-use super::menu_inner::{
- CloseCondition, Direction, ItemHeight, ItemWidth, Menu, MenuState, PathHighlight,
+use super::{
+ menu_inner::{
+ CloseCondition, Direction, ItemHeight, ItemWidth, Menu, MenuState, PathHighlight,
+ },
+ menu_tree::MenuTree,
};
-use super::menu_tree::MenuTree;
-use crate::Renderer;
#[cfg(all(
feature = "multi-window",
feature = "wayland",
target_os = "linux",
+ feature = "winit",
feature = "surface-message"
))]
use crate::app::cosmic::{WINDOWING_SYSTEM, WindowingSystem};
-use crate::style::menu_bar::StyleSheet;
-use crate::widget::RcWrapper;
-use crate::widget::dropdown::menu::{self, State};
-use crate::widget::menu::menu_inner::init_root_menu;
+use crate::{
+ Renderer,
+ style::menu_bar::StyleSheet,
+ widget::{
+ RcWrapper,
+ dropdown::menu::{self, State},
+ menu::menu_inner::init_root_menu,
+ },
+};
-use iced::event::Status;
-use iced::{Point, Shadow, Vector, window};
+use iced::{Point, Shadow, Vector, event::Status, window};
use iced_core::Border;
-use iced_widget::core::layout::{Limits, Node};
-use iced_widget::core::mouse::{self, Cursor};
-use iced_widget::core::renderer::{self, Renderer as IcedRenderer};
-use iced_widget::core::widget::{Tree, tree};
use iced_widget::core::{
Alignment, Clipboard, Element, Layout, Length, Padding, Rectangle, Shell, Widget, event,
- overlay, touch,
+ layout::{Limits, Node},
+ mouse::{self, Cursor},
+ overlay,
+ renderer::{self, Renderer as IcedRenderer},
+ touch,
+ widget::{Tree, tree},
};
/// A `MenuBar` collects `MenuTree`s and handles all the layout, event processing, and drawing.
@@ -50,6 +56,7 @@ pub(crate) struct MenuBarStateInner {
pub(crate) tree: Tree,
pub(crate) popup_id: HashMap,
pub(crate) pressed: bool,
+ pub(crate) bar_pressed: bool,
pub(crate) view_cursor: Cursor,
pub(crate) open: bool,
pub(crate) active_root: Vec,
@@ -86,6 +93,7 @@ impl Default for MenuBarStateInner {
vertical_direction: Direction::Positive,
menu_states: Vec::new(),
popup_id: HashMap::new(),
+ bar_pressed: false,
}
}
}
@@ -162,6 +170,14 @@ where
}
}
+pub fn get_mut_or_default(vec: &mut Vec, index: usize) -> &mut T {
+ if index < vec.len() {
+ &mut vec[index]
+ } else {
+ vec.resize_with(index + 1, T::default);
+ &mut vec[index]
+ }
+}
/// A `MenuBar` collects `MenuTree`s and handles all the layout, event processing, and drawing.
#[allow(missing_debug_implementations)]
@@ -183,6 +199,7 @@ pub struct MenuBar {
#[cfg(all(
feature = "multi-window",
feature = "wayland",
+ feature = "winit",
target_os = "linux"
))]
positioner: iced_runtime::platform_specific::wayland::popup::SctkPositioner,
@@ -222,6 +239,7 @@ where
#[cfg(all(
feature = "multi-window",
feature = "wayland",
+ feature = "winit",
target_os = "linux"
))]
positioner: iced_runtime::platform_specific::wayland::popup::SctkPositioner::default(),
@@ -320,6 +338,7 @@ where
#[cfg(all(
feature = "multi-window",
feature = "wayland",
+ feature = "winit",
target_os = "linux"
))]
pub fn with_positioner(
@@ -357,6 +376,7 @@ where
feature = "multi-window",
feature = "wayland",
target_os = "linux",
+ feature = "winit",
feature = "surface-message"
))]
#[allow(clippy::too_many_lines)]
@@ -570,8 +590,7 @@ where
viewport: &Rectangle,
) {
use event::Event::{Mouse, Touch};
- use mouse::Button::Left;
- use mouse::Event::ButtonReleased;
+ use mouse::{Button::Left, Event::ButtonReleased};
use touch::Event::{FingerLifted, FingerLost};
process_root_events(
@@ -595,12 +614,14 @@ where
.with_data(|d| !d.open && !d.active_root.is_empty());
let open = my_state.inner.with_data_mut(|state| {
- if reset
- && let Some(popup_id) = state.popup_id.get(&self.window_id).copied()
- && let Some(handler) = self.on_surface_action.as_ref() {
+ if reset {
+ if let Some(popup_id) = state.popup_id.get(&self.window_id).copied() {
+ if let Some(handler) = self.on_surface_action.as_ref() {
shell.publish((handler)(crate::surface::Action::DestroyPopup(popup_id)));
state.reset();
}
+ }
+ }
state.open
});
@@ -626,6 +647,7 @@ where
#[cfg(all(
feature = "wayland",
target_os = "linux",
+ feature = "winit",
feature = "surface-message"
))]
{
@@ -649,6 +671,7 @@ where
feature = "multi-window",
feature = "wayland",
target_os = "linux",
+ feature = "winit",
feature = "surface-message"
))]
if matches!(WINDOWING_SYSTEM.get(), Some(WindowingSystem::Wayland)) {
@@ -663,6 +686,7 @@ where
feature = "multi-window",
feature = "wayland",
target_os = "linux",
+ feature = "winit",
feature = "surface-message"
))]
if matches!(WINDOWING_SYSTEM.get(), Some(WindowingSystem::Wayland)) {
@@ -745,6 +769,7 @@ where
feature = "multi-window",
feature = "wayland",
target_os = "linux",
+ feature = "winit",
feature = "surface-message"
))]
if matches!(WINDOWING_SYSTEM.get(), Some(WindowingSystem::Wayland))
diff --git a/src/widget/menu/menu_inner.rs b/src/widget/menu/menu_inner.rs
index c534c5b..74afe60 100644
--- a/src/widget/menu/menu_inner.rs
+++ b/src/widget/menu/menu_inner.rs
@@ -1,15 +1,14 @@
// From iced_aw, license MIT
//! Menu tree overlay
-use std::borrow::Cow;
-use std::sync::Arc;
+use std::{borrow::Cow, sync::Arc};
-use super::menu_bar::MenuBarState;
-use super::menu_tree::MenuTree;
+use super::{menu_bar::MenuBarState, menu_tree::MenuTree};
#[cfg(all(
feature = "multi-window",
feature = "wayland",
target_os = "linux",
+ feature = "winit",
feature = "surface-message"
))]
use crate::app::cosmic::{WINDOWING_SYSTEM, WindowingSystem};
@@ -17,12 +16,12 @@ use crate::style::menu_bar::StyleSheet;
use iced::window;
use iced_core::{Border, Renderer as IcedRenderer, Shadow, Widget};
-use iced_widget::core::layout::{Limits, Node};
-use iced_widget::core::mouse::{self, Cursor};
-use iced_widget::core::widget::Tree;
use iced_widget::core::{
- Clipboard, Layout, Length, Padding, Point, Rectangle, Shell, Size, Vector, event, overlay,
- renderer, touch,
+ Clipboard, Layout, Length, Padding, Point, Rectangle, Shell, Size, Vector, event,
+ layout::{Limits, Node},
+ mouse::{self, Cursor},
+ overlay, renderer, touch,
+ widget::Tree,
};
/// The condition of when to close a menu
@@ -560,10 +559,14 @@ impl<'b, Message: Clone + 'static> Menu<'b, Message> {
clipboard: &mut dyn Clipboard,
shell: &mut Shell<'_, Message>,
) -> Option<(usize, MenuState)> {
- use event::Event::{Mouse, Touch};
- use event::Status::{Captured, Ignored};
- use mouse::Button::Left;
- use mouse::Event::{ButtonPressed, ButtonReleased, CursorMoved, WheelScrolled};
+ use event::{
+ Event::{Mouse, Touch},
+ Status::{Captured, Ignored},
+ };
+ use mouse::{
+ Button::Left,
+ Event::{ButtonPressed, ButtonReleased, CursorMoved, WheelScrolled},
+ };
use touch::Event::{FingerLifted, FingerMoved, FingerPressed};
if !self
@@ -679,6 +682,7 @@ impl<'b, Message: Clone + 'static> Menu<'b, Message> {
feature = "multi-window",
feature = "wayland",
target_os = "linux",
+ feature = "winit",
feature = "surface-message"
))]
if matches!(WINDOWING_SYSTEM.get(), Some(WindowingSystem::Wayland))
@@ -963,6 +967,7 @@ impl Widget(
feature = "multi-window",
feature = "wayland",
target_os = "linux",
+ feature = "winit",
feature = "surface-message"
))]
pub(super) fn init_root_popup_menu(
@@ -1521,14 +1527,15 @@ where
.as_ref()
.is_some_and(|i| *i != new_index && !active_menu[*i].children.is_empty());
- #[cfg(all(feature = "multi-window", feature = "wayland", target_os = "linux", feature = "surface-message"))]
- if matches!(WINDOWING_SYSTEM.get(), Some(WindowingSystem::Wayland)) && remove
- && let Some(id) = state.popup_id.remove(&menu.window_id) {
+ #[cfg(all(feature = "multi-window", feature = "wayland",target_os = "linux", feature = "winit", feature = "surface-message"))]
+ if matches!(WINDOWING_SYSTEM.get(), Some(WindowingSystem::Wayland)) && remove {
+ if let Some(id) = state.popup_id.remove(&menu.window_id) {
state.active_root.truncate(menu.depth + 1);
shell.publish((menu.on_surface_action.as_ref().unwrap())({
crate::surface::action::destroy_popup(id)
}));
}
+ }
let item = &active_menu[new_index];
// set new index
let old_index = last_menu_state.index.replace(new_index);
diff --git a/src/widget/menu/menu_tree.rs b/src/widget/menu/menu_tree.rs
index efcf980..41cf1df 100644
--- a/src/widget/menu/menu_tree.rs
+++ b/src/widget/menu/menu_tree.rs
@@ -234,7 +234,6 @@ pub fn menu_items<
color.alpha *= 0.75;
TextStyle {
color: Some(color.into()),
- ..Default::default()
}
}
let key_class = theme::Text::Custom(key_style);
diff --git a/src/widget/mod.rs b/src/widget/mod.rs
index 5764ab4..f442b0d 100644
--- a/src/widget/mod.rs
+++ b/src/widget/mod.rs
@@ -119,6 +119,8 @@ pub mod calendar;
pub use calendar::{Calendar, calendar};
pub mod card;
+#[doc(inline)]
+pub use card::*;
pub mod color_picker;
#[doc(inline)]
@@ -152,7 +154,7 @@ pub use dialog::{Dialog, dialog};
pub mod divider {
/// Horizontal variant of a divider.
pub mod horizontal {
- use iced::widget::{Rule, rule};
+ use iced::{widget::Rule, widget::rule};
/// Horizontal divider with default thickness
#[must_use]
@@ -213,17 +215,13 @@ pub mod flex_row;
#[doc(inline)]
pub use flex_row::{FlexRow, flex_row};
-pub mod reorderable_flex_row;
-#[doc(inline)]
-pub use reorderable_flex_row::{ReorderableFlexRow, reorderable_flex_row};
-
pub mod grid;
#[doc(inline)]
pub use grid::{Grid, grid};
mod header_bar;
#[doc(inline)]
-pub use header_bar::{HeaderBar, WindowControlsPosition, header_bar};
+pub use header_bar::{HeaderBar, header_bar};
pub mod icon;
#[doc(inline)]
@@ -310,7 +308,7 @@ pub use toggler::{Toggler, toggler};
#[doc(inline)]
pub use tooltip::{Tooltip, tooltip};
-#[cfg(all(feature = "wayland", target_os = "linux"))]
+#[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
pub mod wayland;
pub mod tooltip {
diff --git a/src/widget/nav_bar.rs b/src/widget/nav_bar.rs
index b7391ab..ad6f920 100644
--- a/src/widget/nav_bar.rs
+++ b/src/widget/nav_bar.rs
@@ -6,9 +6,10 @@
//! For details on the model, see the [`segmented_button`] module for more details.
use apply::Apply;
-use iced::clipboard::dnd::DndAction;
-use iced::clipboard::mime::AllowedMimeTypes;
-use iced::{Background, Length};
+use iced::{
+ Background, Length,
+ clipboard::{dnd::DndAction, mime::AllowedMimeTypes},
+};
use iced_core::{Border, Color, Shadow};
use crate::widget::{Container, Icon, container, menu, scrollable, segmented_button};
diff --git a/src/widget/popover.rs b/src/widget/popover.rs
index 138d5a1..af5370a 100644
--- a/src/widget/popover.rs
+++ b/src/widget/popover.rs
@@ -5,10 +5,14 @@
use iced::widget;
use iced_core::event::{self, Event};
+use iced_core::layout;
+use iced_core::mouse;
+use iced_core::overlay;
+use iced_core::renderer;
+use iced_core::touch;
use iced_core::widget::{Operation, Tree};
use iced_core::{
- Clipboard, Element, Layout, Length, Point, Rectangle, Shell, Size, Vector, Widget, layout,
- mouse, overlay, renderer, touch,
+ Clipboard, Element, Layout, Length, Point, Rectangle, Shell, Size, Vector, Widget,
};
pub use iced_widget::container::{Catalog, Style};
@@ -160,8 +164,8 @@ where
shell.capture_event();
return;
}
- } else if let Some(on_close) = self.on_close.as_ref()
- && matches!(
+ } else if let Some(on_close) = self.on_close.as_ref() {
+ if matches!(
event,
Event::Mouse(mouse::Event::ButtonPressed(_))
| Event::Touch(touch::Event::FingerPressed { .. })
@@ -169,6 +173,7 @@ where
{
shell.publish(on_close.clone());
}
+ }
}
// Hide cursor from background content when modal popup is active
@@ -471,6 +476,12 @@ where
}
}
+/// The local state of a [`Popover`].
+#[derive(Debug, Default)]
+struct State {
+ is_open: bool,
+}
+
/// The first child in [`Popover::children`] is always the wrapped content.
fn content_tree(tree: &Tree) -> &Tree {
&tree.children[0]
diff --git a/src/widget/progress_bar/animation.rs b/src/widget/progress_bar/animation.rs
deleted file mode 100644
index a9d5283..0000000
--- a/src/widget/progress_bar/animation.rs
+++ /dev/null
@@ -1,115 +0,0 @@
-use crate::anim::smootherstep;
-use iced::time::Instant;
-use std::time::Duration;
-
-const LAG: f32 = 0.1;
-
-#[derive(Default)]
-pub struct Progress {
- pub current: f32,
- target: Option,
- last: Option,
-}
-
-impl Progress {
- /// Smoothly chases `target` using exponential decay.
- /// Returns `true` if a redraw should be requested.
- pub fn update(&mut self, target: f32, now: Instant) -> bool {
- // Don't animate on start
- let Some(last) = self.last else {
- self.current = target;
- self.target = Some(target);
- self.last = Some(now);
- return false;
- };
-
- // Sync animation clock when target changes
- if self.target != Some(target) {
- self.target = Some(target);
- self.last = Some(now);
- return true;
- }
-
- let dt = (now - last).as_secs_f32();
- self.last = Some(now);
- let diff = target - self.current;
-
- if diff.abs() > 0.001 {
- self.current += diff * (1.0 - (-dt / LAG).exp());
- true
- } else {
- self.current = target;
- false
- }
- }
-}
-
-#[derive(Clone, Copy)]
-pub struct Animation {
- expanding: bool,
- start: Instant,
- last: Instant,
- offset: u32,
-}
-
-impl Default for Animation {
- fn default() -> Self {
- let now = Instant::now();
- Self {
- expanding: true,
- start: now,
- last: now,
- offset: 0,
- }
- }
-}
-
-impl Animation {
- pub fn timed_transition(
- &self,
- cycle_duration: Duration,
- period: Duration,
- wrap: f32,
- now: Instant,
- ) -> Self {
- let additional =
- ((now - self.last).as_secs_f32() / period.as_secs_f32() * u32::MAX as f32) as u32;
- let new_offset = self.offset.wrapping_add(additional);
-
- if !cycle_duration.is_zero() && now.duration_since(self.start) > cycle_duration {
- let offset = if self.expanding {
- new_offset
- } else {
- new_offset.wrapping_add((wrap * u32::MAX as f32) as u32)
- };
- Self {
- expanding: !self.expanding,
- start: now,
- last: now,
- offset,
- }
- } else {
- Self {
- last: now,
- offset: new_offset,
- ..*self
- }
- }
- }
-
- pub fn bar_positions(&self, cycle_duration: Duration, min: f32, wrap: f32) -> (f32, f32) {
- let offset = self.offset as f32 / u32::MAX as f32;
- let progress = if !cycle_duration.is_zero() {
- smootherstep(
- self.last.duration_since(self.start).as_secs_f32() / cycle_duration.as_secs_f32(),
- )
- } else {
- 1.0
- };
- if self.expanding {
- (offset, offset + min + wrap * progress)
- } else {
- (offset + wrap * progress, offset + min + wrap)
- }
- }
-}
diff --git a/src/widget/progress_bar/circular.rs b/src/widget/progress_bar/circular.rs
index 3a3fedc..fa8c38f 100644
--- a/src/widget/progress_bar/circular.rs
+++ b/src/widget/progress_bar/circular.rs
@@ -1,10 +1,15 @@
//! Show a circular progress indicator.
-use super::animation::{Animation, Progress};
use super::style::StyleSheet;
+use crate::anim::smootherstep;
+use iced::advanced::layout;
+use iced::advanced::renderer;
use iced::advanced::widget::tree::{self, Tree};
-use iced::advanced::{self, Clipboard, Layout, Shell, Widget, layout, renderer};
+use iced::advanced::{self, Clipboard, Layout, Shell, Widget};
+use iced::mouse;
+use iced::time::Instant;
use iced::widget::canvas;
-use iced::{Element, Event, Length, Radians, Rectangle, Renderer, Size, Vector, mouse, window};
+use iced::window;
+use iced::{Element, Event, Length, Radians, Rectangle, Renderer, Size, Vector};
use std::f32::consts::PI;
use std::time::Duration;
@@ -18,9 +23,9 @@ where
{
size: f32,
bar_height: f32,
- style: Theme::Style,
+ style: ::Style,
cycle_duration: Duration,
- period: Duration,
+ rotation_duration: Duration,
progress: Option,
}
@@ -33,9 +38,9 @@ where
Circular {
size: 40.0,
bar_height: 4.0,
- style: Theme::Style::default(),
+ style: ::Style::default(),
cycle_duration: Duration::from_millis(1500),
- period: Duration::from_secs(2),
+ rotation_duration: Duration::from_secs(2),
progress: None,
}
}
@@ -53,7 +58,7 @@ where
}
/// Sets the style variant of this [`Circular`].
- pub fn style(mut self, style: Theme::Style) -> Self {
+ pub fn style(mut self, style: ::Style) -> Self {
self.style = style;
self
}
@@ -64,10 +69,10 @@ where
self
}
- /// Sets the base period of this [`Circular`]. This is the duration that a full rotation
- /// would take if the cycle duration were set to 0.0 (no expanding or contracting)
- pub fn period(mut self, duration: Duration) -> Self {
- self.period = duration;
+ /// Sets the base rotation duration of this [`Circular`]. This is the duration that a full
+ /// rotation would take if the cycle rotation were set to 0.0 (no expanding or contracting)
+ pub fn rotation_duration(mut self, duration: Duration) -> Self {
+ self.rotation_duration = duration;
self
}
@@ -77,10 +82,10 @@ where
self
}
- fn min_wrap(&self, track_radius: f32) -> (f32, f32) {
+ fn min_wrap_angle(&self, track_radius: f32) -> (f32, f32) {
let cap_angle = self.bar_height / track_radius;
let gap = MIN_ANGLE.0.max(cap_angle);
- ((gap - cap_angle) / (2.0 * PI), 1.0 - gap / PI)
+ (gap - cap_angle, 2.0 * PI - gap * 2.0)
}
}
@@ -93,11 +98,125 @@ where
}
}
+#[derive(Clone, Copy)]
+enum Animation {
+ Expanding {
+ start: Instant,
+ progress: f32,
+ rotation: u32,
+ last: Instant,
+ },
+ Contracting {
+ start: Instant,
+ progress: f32,
+ rotation: u32,
+ last: Instant,
+ },
+}
+
+impl Default for Animation {
+ fn default() -> Self {
+ Self::Expanding {
+ start: Instant::now(),
+ progress: 0.0,
+ rotation: 0,
+ last: Instant::now(),
+ }
+ }
+}
+
+impl Animation {
+ fn next(&self, additional_rotation: u32, wrap_angle: f32, now: Instant) -> Self {
+ match self {
+ Self::Expanding { rotation, .. } => Self::Contracting {
+ start: now,
+ progress: 0.0,
+ rotation: rotation.wrapping_add(additional_rotation),
+ last: now,
+ },
+ Self::Contracting { rotation, .. } => Self::Expanding {
+ start: now,
+ progress: 0.0,
+ rotation: rotation.wrapping_add(
+ (f64::from((wrap_angle) / (2.0 * PI)) * f64::from(u32::MAX)) as u32,
+ ),
+ last: now,
+ },
+ }
+ }
+
+ fn start(&self) -> Instant {
+ match self {
+ Self::Expanding { start, .. } | Self::Contracting { start, .. } => *start,
+ }
+ }
+
+ fn last(&self) -> Instant {
+ match self {
+ Self::Expanding { last, .. } | Self::Contracting { last, .. } => *last,
+ }
+ }
+
+ fn timed_transition(
+ &self,
+ cycle_duration: Duration,
+ rotation_duration: Duration,
+ wrap_angle: f32,
+ now: Instant,
+ ) -> Self {
+ let elapsed = now.duration_since(self.start());
+ let additional_rotation = ((now - self.last()).as_secs_f32()
+ / rotation_duration.as_secs_f32()
+ * (u32::MAX) as f32) as u32;
+
+ match elapsed {
+ elapsed if elapsed > cycle_duration => self.next(additional_rotation, wrap_angle, now),
+ _ => self.with_elapsed(cycle_duration, additional_rotation, elapsed, now),
+ }
+ }
+
+ fn with_elapsed(
+ &self,
+ cycle_duration: Duration,
+ additional_rotation: u32,
+ elapsed: Duration,
+ now: Instant,
+ ) -> Self {
+ let progress = elapsed.as_secs_f32() / cycle_duration.as_secs_f32();
+ match self {
+ Self::Expanding {
+ start, rotation, ..
+ } => Self::Expanding {
+ start: *start,
+ progress,
+ rotation: rotation.wrapping_add(additional_rotation),
+ last: now,
+ },
+ Self::Contracting {
+ start, rotation, ..
+ } => Self::Contracting {
+ start: *start,
+ progress,
+ rotation: rotation.wrapping_add(additional_rotation),
+ last: now,
+ },
+ }
+ }
+
+ fn rotation(&self) -> f32 {
+ match self {
+ Self::Expanding { rotation, .. } | Self::Contracting { rotation, .. } => {
+ *rotation as f32 / u32::MAX as f32
+ }
+ }
+ }
+}
+
#[derive(Default)]
struct State {
animation: Animation,
cache: canvas::Cache,
- progress: Progress,
+ progress: Option,
}
impl Widget for Circular
@@ -141,21 +260,28 @@ where
_viewport: &Rectangle,
) {
let state = tree.state.downcast_mut::();
- if let Event::Window(window::Event::RedrawRequested(now)) = event {
- if let Some(target) = self.progress {
- if state.progress.update(target, *now) {
- state.cache.clear();
- shell.request_redraw();
- }
- } else {
- let (_, wrap) = self.min_wrap(self.size / 2.0 - self.bar_height);
- state.animation =
- state
- .animation
- .timed_transition(self.cycle_duration, self.period, wrap, *now);
+ if self.progress.is_some() {
+ if !float_cmp::approx_eq!(
+ f32,
+ state.progress.unwrap_or_default(),
+ self.progress.unwrap_or_default()
+ ) {
+ state.progress = self.progress;
state.cache.clear();
- shell.request_redraw();
}
+ return;
+ }
+ if let Event::Window(window::Event::RedrawRequested(now)) = event {
+ let (_, wrap_angle) = self.min_wrap_angle(self.size / 2.0 - self.bar_height);
+ state.animation = state.animation.timed_transition(
+ self.cycle_duration,
+ self.rotation_duration,
+ wrap_angle,
+ *now,
+ );
+
+ state.cache.clear();
+ shell.request_redraw();
}
}
@@ -173,13 +299,11 @@ where
let state = tree.state.downcast_ref::();
let bounds = layout.bounds();
- let custom_style = Theme::appearance(theme, &self.style, self.progress.is_some(), true);
+ let custom_style =
+ ::appearance(theme, &self.style, self.progress.is_some(), true);
let geometry = state.cache.draw(renderer, bounds.size(), |frame| {
let track_radius = frame.width() / 2.0 - self.bar_height;
- if track_radius <= 0.0 {
- return;
- }
let track_path = canvas::Path::circle(frame.center(), track_radius);
frame.stroke(
@@ -189,65 +313,133 @@ where
.with_width(self.bar_height),
);
- // Converts a track fraction to an angle in radians, with 0 being top of circle
- let to_angle = |t: f32| t * 2.0 * PI - PI / 2.0;
+ if let Some(progress) = self.progress {
+ // outer border
+ if let Some(border_color) = custom_style.border_color {
+ let border_path =
+ canvas::Path::circle(frame.center(), track_radius + self.bar_height / 2.0);
- let draw_cap = |frame: &mut canvas::Frame, t: f32, flip: bool| {
- let angle = to_angle(t);
- let center = frame.center() + Vector::new(angle.cos(), angle.sin()) * track_radius;
- let (start_angle, end_angle) = if flip {
- (angle - PI, angle)
- } else {
- (angle, angle + PI)
- };
- let mut builder = canvas::path::Builder::new();
- builder.arc(canvas::path::Arc {
- center,
- radius: self.bar_height / 2.0,
- start_angle: Radians(start_angle),
- end_angle: Radians(end_angle),
- });
- frame.fill(&builder.build(), custom_style.bar_color);
- };
+ frame.stroke(
+ &border_path,
+ canvas::Stroke::default()
+ .with_color(border_color)
+ .with_width(1.0),
+ );
+ }
- let draw_bar = |frame: &mut canvas::Frame, start: f32, end: f32| {
+ // inner border
+ if let Some(border_color) = custom_style.border_color {
+ let border_path =
+ canvas::Path::circle(frame.center(), track_radius - self.bar_height / 2.0);
+
+ frame.stroke(
+ &border_path,
+ canvas::Stroke::default()
+ .with_color(border_color)
+ .with_width(1.0),
+ );
+ }
+
+ // bar
let mut builder = canvas::path::Builder::new();
+
builder.arc(canvas::path::Arc {
center: frame.center(),
radius: track_radius,
- start_angle: Radians(to_angle(start)),
- end_angle: Radians(to_angle(end)),
+ start_angle: Radians(-PI / 2.0),
+ end_angle: Radians(-PI / 2.0 + progress * 2.0 * PI),
});
+
+ let bar_path = builder.build();
+
frame.stroke(
- &builder.build(),
+ &bar_path,
canvas::Stroke::default()
.with_color(custom_style.bar_color)
.with_width(self.bar_height),
);
- draw_cap(frame, end, false);
- draw_cap(frame, start, true);
- };
- if self.progress.is_some() {
- if let Some(border_color) = custom_style.border_color {
- for radius_offset in [self.bar_height / 2.0, -(self.bar_height / 2.0)] {
- let border_path =
- canvas::Path::circle(frame.center(), track_radius + radius_offset);
- frame.stroke(
- &border_path,
- canvas::Stroke::default()
- .with_color(border_color)
- .with_width(1.0),
- );
- }
- }
- draw_bar(frame, 0.0, state.progress.current);
+ let mut builder = canvas::path::Builder::new();
+
+ // get center of end of arc for rounded cap
+ let end_angle = -PI / 2.0 + progress * 2.0 * PI;
+ let end_center =
+ frame.center() + Vector::new(end_angle.cos(), end_angle.sin()) * track_radius;
+ builder.arc(canvas::path::Arc {
+ center: end_center,
+ radius: self.bar_height / 2.0,
+ start_angle: Radians(end_angle),
+ end_angle: Radians(end_angle + PI),
+ });
+
+ // get center of start of arc for rounded cap
+ let start_angle = -PI / 2.0;
+ let start_center = frame.center()
+ + Vector::new(start_angle.cos(), start_angle.sin()) * track_radius;
+ builder.arc(canvas::path::Arc {
+ center: start_center,
+ radius: self.bar_height / 2.0,
+ start_angle: Radians(start_angle - PI),
+ end_angle: Radians(start_angle),
+ });
+
+ let cap_path = builder.build();
+ frame.fill(&cap_path, custom_style.bar_color);
} else {
- let (min, wrap) = self.min_wrap(track_radius);
- let (start, end) = state
- .animation
- .bar_positions(self.cycle_duration, min, wrap);
- draw_bar(frame, start, end);
+ let mut builder = canvas::path::Builder::new();
+
+ let start = state.animation.rotation() * 2.0 * PI;
+ let (min_angle, wrap_angle) = self.min_wrap_angle(track_radius);
+ let (start_angle, end_angle) = match state.animation {
+ Animation::Expanding { progress, .. } => (
+ start,
+ start + min_angle + wrap_angle * smootherstep(progress),
+ ),
+ Animation::Contracting { progress, .. } => (
+ start + wrap_angle * smootherstep(progress),
+ start + min_angle + wrap_angle,
+ ),
+ };
+ builder.arc(canvas::path::Arc {
+ center: frame.center(),
+ radius: track_radius,
+ start_angle: Radians(start_angle),
+ end_angle: Radians(end_angle),
+ });
+
+ let bar_path = builder.build();
+
+ frame.stroke(
+ &bar_path,
+ canvas::Stroke::default()
+ .with_color(custom_style.bar_color)
+ .with_width(self.bar_height),
+ );
+
+ let mut builder = canvas::path::Builder::new();
+
+ // get center of end of arc for rounded cap
+ let end_center =
+ frame.center() + Vector::new(end_angle.cos(), end_angle.sin()) * track_radius;
+ builder.arc(canvas::path::Arc {
+ center: end_center,
+ radius: self.bar_height / 2.0,
+ start_angle: Radians(end_angle),
+ end_angle: Radians(end_angle + PI),
+ });
+
+ // get center of start of arc for rounded cap
+ let start_center = frame.center()
+ + Vector::new(start_angle.cos(), start_angle.sin()) * track_radius;
+ builder.arc(canvas::path::Arc {
+ center: start_center,
+ radius: self.bar_height / 2.0,
+ start_angle: Radians(start_angle - PI),
+ end_angle: Radians(start_angle),
+ });
+
+ let cap_path = builder.build();
+ frame.fill(&cap_path, custom_style.bar_color);
}
});
diff --git a/src/widget/progress_bar/linear.rs b/src/widget/progress_bar/linear.rs
index 0ebe402..226b2b5 100644
--- a/src/widget/progress_bar/linear.rs
+++ b/src/widget/progress_bar/linear.rs
@@ -1,15 +1,19 @@
//! Show a linear progress indicator.
-use super::animation::{Animation, Progress};
-use super::style::StyleSheet;
+use iced::advanced::layout;
+use iced::advanced::renderer::{self, Quad};
use iced::advanced::widget::tree::{self, Tree};
-use iced::advanced::{self, Clipboard, Layout, Shell, Widget, layout, renderer};
-use iced::{Background, Element, Event, Length, Pixels, Rectangle, Size, mouse, window};
+use iced::advanced::{self, Clipboard, Layout, Shell, Widget};
+use iced::mouse;
+use iced::time::Instant;
+use iced::window;
+use iced::{Background, Element, Event, Length, Rectangle, Size};
+
+use crate::anim::smootherstep;
+
+use super::style::StyleSheet;
use std::time::Duration;
-const MIN_LENGTH: f32 = 0.15;
-const WRAP_LENGTH: f32 = 0.618; // avoids animation repetition
-
#[must_use]
pub struct Linear
where
@@ -19,10 +23,7 @@ where
girth: Length,
style: Theme::Style,
cycle_duration: Duration,
- period: Duration,
progress: Option,
- markers: Vec,
- segment_spacing: f32,
}
impl Linear
@@ -36,10 +37,7 @@ where
girth: Length::Fixed(4.0),
style: Theme::Style::default(),
cycle_duration: Duration::from_millis(1500),
- period: Duration::from_secs(2),
progress: None,
- markers: Vec::new(),
- segment_spacing: 0.0,
}
}
@@ -67,38 +65,11 @@ where
self
}
- /// Sets the base period of this [`Linear`]. This is the duration that a full traversal
- /// would take if the cycle duration were set to 0.0 (no expanding or contracting)
- pub fn period(mut self, duration: Duration) -> Self {
- self.period = duration;
- self
- }
-
/// Override the default behavior by providing a determinate progress value between `0.0` and `1.0`.
pub fn progress(mut self, progress: f32) -> Self {
self.progress = Some(progress.clamp(0.0, 1.0));
self
}
-
- /// Sets the markers of a determinate progress bar, which divide the bar into segments.
- /// Each value is a progress fraction between `0.0` and `1.0 at which a visual gap is inserted.
- pub fn markers(mut self, markers: impl Into>) -> Self {
- let mut markers = markers.into();
- for bp in &mut markers {
- *bp = bp.clamp(0.0, 1.0);
- }
- markers.sort_by(f32::total_cmp);
- markers.dedup();
-
- self.markers = markers;
- self
- }
-
- /// Sets the spacing between segments at each marker.
- pub fn segment_spacing(mut self, spacing: impl Into) -> Self {
- self.segment_spacing = spacing.into().0;
- self
- }
}
impl Default for Linear
@@ -110,10 +81,63 @@ where
}
}
-#[derive(Default)]
-struct State {
- animation: Animation,
- progress: Progress,
+#[derive(Clone, Copy)]
+enum State {
+ Expanding { start: Instant, progress: f32 },
+ Contracting { start: Instant, progress: f32 },
+}
+
+impl Default for State {
+ fn default() -> Self {
+ Self::Expanding {
+ start: Instant::now(),
+ progress: 0.0,
+ }
+ }
+}
+
+impl State {
+ fn next(&self, now: Instant) -> Self {
+ match self {
+ Self::Expanding { .. } => Self::Contracting {
+ start: now,
+ progress: 0.0,
+ },
+ Self::Contracting { .. } => Self::Expanding {
+ start: now,
+ progress: 0.0,
+ },
+ }
+ }
+
+ fn start(&self) -> Instant {
+ match self {
+ Self::Expanding { start, .. } | Self::Contracting { start, .. } => *start,
+ }
+ }
+
+ fn timed_transition(&self, cycle_duration: Duration, now: Instant) -> Self {
+ let elapsed = now.duration_since(self.start());
+
+ match elapsed {
+ elapsed if elapsed > cycle_duration => self.next(now),
+ _ => self.with_elapsed(cycle_duration, elapsed),
+ }
+ }
+
+ fn with_elapsed(&self, cycle_duration: Duration, elapsed: Duration) -> Self {
+ let progress = elapsed.as_secs_f32() / cycle_duration.as_secs_f32();
+ match self {
+ Self::Expanding { start, .. } => Self::Expanding {
+ start: *start,
+ progress,
+ },
+ Self::Contracting { start, .. } => Self::Contracting {
+ start: *start,
+ progress,
+ },
+ }
+ }
}
impl Widget for Linear
@@ -157,21 +181,16 @@ where
shell: &mut Shell<'_, Message>,
_viewport: &Rectangle,
) {
+ if self.progress.is_some() {
+ return;
+ }
+
let state = tree.state.downcast_mut::();
+
if let Event::Window(window::Event::RedrawRequested(now)) = event {
- if let Some(target) = self.progress {
- if state.progress.update(target, *now) {
- shell.request_redraw();
- }
- } else {
- state.animation = state.animation.timed_transition(
- self.cycle_duration,
- self.period,
- WRAP_LENGTH,
- *now,
- );
- shell.request_redraw();
- }
+ *state = state.timed_transition(self.cycle_duration, *now);
+
+ shell.request_redraw();
}
}
@@ -189,148 +208,88 @@ where
let custom_style = theme.appearance(&self.style, self.progress.is_some(), false);
let state = tree.state.downcast_ref::();
- let border_width = if custom_style.border_color.is_some() {
- 1.0
- } else {
- 0.0
- };
- let border_color = custom_style.border_color.unwrap_or(custom_style.bar_color);
- let radius = custom_style.border_radius;
+ renderer.fill_quad(
+ renderer::Quad {
+ bounds: Rectangle {
+ x: bounds.x,
+ y: bounds.y,
+ width: bounds.width,
+ height: bounds.height,
+ },
+ border: iced::Border {
+ width: if custom_style.border_color.is_some() {
+ 1.0
+ } else {
+ 0.0
+ },
+ color: custom_style.border_color.unwrap_or(custom_style.bar_color),
+ radius: custom_style.border_radius.into(),
+ },
+ snap: true,
+ ..renderer::Quad::default()
+ },
+ Background::Color(custom_style.track_color),
+ );
- let mut draw_quad = |x: f32, width: f32, color: iced::Color, border: iced::Border| {
- // don't draw if width is less than 0.1 pixels
- if width * bounds.width > 0.1 {
- renderer.fill_quad(
+ if let Some(progress) = self.progress {
+ renderer.fill_quad(
+ renderer::Quad {
+ bounds: Rectangle {
+ x: bounds.x,
+ y: bounds.y,
+ width: progress * bounds.width,
+ height: bounds.height,
+ },
+ border: iced::Border {
+ width: 0.,
+ color: iced::Color::TRANSPARENT,
+ radius: custom_style.border_radius.into(),
+ },
+ snap: true,
+ ..renderer::Quad::default()
+ },
+ Background::Color(custom_style.bar_color),
+ );
+ } else {
+ match state {
+ State::Expanding { progress, .. } => renderer.fill_quad(
renderer::Quad {
bounds: Rectangle {
- x: bounds.x + x * bounds.width,
+ x: bounds.x,
y: bounds.y,
- width: width * bounds.width,
+ width: smootherstep(*progress) * bounds.width,
height: bounds.height,
},
- border,
+ border: iced::Border {
+ width: 0.,
+ color: iced::Color::TRANSPARENT,
+ radius: custom_style.border_radius.into(),
+ },
snap: true,
..renderer::Quad::default()
},
- Background::Color(color),
- );
- }
- };
+ Background::Color(custom_style.bar_color),
+ ),
- if self.progress.is_some() {
- let spacing = self.segment_spacing.max(1.0);
- let radius_inner = radius.min(spacing);
-
- let gap = if self.markers.is_empty() {
- 0.0
- } else {
- spacing / bounds.width
- };
- let drawable = 1.0 - gap * self.markers.len() as f32;
- let num_segments = self.markers.len() + 1;
-
- let segment_bounds = |i: usize| {
- let seg_lo = if i == 0 { 0.0 } else { self.markers[i - 1] };
- let seg_hi = if i == num_segments - 1 {
- 1.0
- } else {
- self.markers[i]
- };
- (seg_lo, seg_hi)
- };
- let get_radius = |i: usize| {
- let r_left = if i == 0 { radius } else { radius_inner };
- let r_right = if i == num_segments - 1 {
- radius
- } else {
- radius_inner
- };
- [r_left, r_right, r_right, r_left].into()
- };
-
- // draw track segments
- for i in 0..num_segments {
- let (seg_lo, seg_hi) = segment_bounds(i);
- let x_start = seg_lo * drawable + i as f32 * gap;
- let x_width = (seg_hi - seg_lo) * drawable;
-
- draw_quad(
- x_start,
- x_width,
- custom_style.track_color,
- iced::Border {
- width: border_width,
- color: border_color,
- radius: get_radius(i),
+ State::Contracting { progress, .. } => renderer.fill_quad(
+ Quad {
+ bounds: Rectangle {
+ x: bounds.x + smootherstep(*progress) * bounds.width,
+ y: bounds.y,
+ width: (1.0 - smootherstep(*progress)) * bounds.width,
+ height: bounds.height,
+ },
+ border: iced::Border {
+ width: 0.,
+ color: iced::Color::TRANSPARENT,
+ radius: custom_style.border_radius.into(),
+ },
+ snap: true,
+ ..renderer::Quad::default()
},
- );
+ Background::Color(custom_style.bar_color),
+ ),
}
-
- // draw bar segments
- let current_p = state.progress.current;
- for i in 0..num_segments {
- let (seg_lo, seg_hi) = segment_bounds(i);
-
- // don't iterate over non-filled segments
- if current_p < seg_lo {
- break;
- }
-
- let x_start = seg_lo * drawable + i as f32 * gap;
- let x_width = (seg_hi - seg_lo) * drawable;
- let fill = ((current_p - seg_lo) / (seg_hi - seg_lo)).clamp(0.0, 1.0);
-
- draw_quad(
- x_start,
- x_width * fill,
- custom_style.bar_color,
- iced::Border {
- radius: get_radius(i),
- ..iced::Border::default()
- },
- );
- }
- } else {
- // draw track
- draw_quad(
- 0.0,
- 1.0,
- custom_style.track_color,
- iced::Border {
- width: border_width,
- color: border_color,
- radius: radius.into(),
- },
- );
-
- // draw bar
- let (bar_start, bar_end) =
- state
- .animation
- .bar_positions(self.cycle_duration, MIN_LENGTH, WRAP_LENGTH);
- let length = bar_end - bar_start;
- let start = bar_start % 1.0;
- let right_width = (1.0 - start).min(length);
- let left_width = length - right_width;
-
- draw_quad(
- start,
- right_width,
- custom_style.bar_color,
- iced::Border {
- radius: radius.into(),
- ..iced::Border::default()
- },
- );
- draw_quad(
- 0.0,
- left_width,
- custom_style.bar_color,
- iced::Border {
- radius: radius.into(),
- ..iced::Border::default()
- },
- );
}
}
}
diff --git a/src/widget/progress_bar/mod.rs b/src/widget/progress_bar/mod.rs
index cb24ada..4e277b0 100644
--- a/src/widget/progress_bar/mod.rs
+++ b/src/widget/progress_bar/mod.rs
@@ -1,4 +1,3 @@
-mod animation;
pub mod circular;
pub mod linear;
pub mod style;
diff --git a/src/widget/radio.rs b/src/widget/radio.rs
index f8e174e..c3f115c 100644
--- a/src/widget/radio.rs
+++ b/src/widget/radio.rs
@@ -2,10 +2,14 @@
use crate::{Theme, theme};
use iced::border;
use iced_core::event::{self, Event};
+use iced_core::layout;
+use iced_core::mouse;
+use iced_core::overlay;
+use iced_core::renderer;
+use iced_core::touch;
use iced_core::widget::tree::Tree;
use iced_core::{
Border, Clipboard, Element, Layout, Length, Pixels, Rectangle, Shell, Size, Vector, Widget,
- layout, mouse, overlay, renderer, touch,
};
use iced_widget::radio as iced_radio;
@@ -262,6 +266,7 @@ where
if cursor.is_over(layout.bounds()) {
shell.publish(self.on_click.clone());
shell.capture_event();
+ return;
}
}
_ => {}
diff --git a/src/widget/rectangle_tracker/mod.rs b/src/widget/rectangle_tracker/mod.rs
index 839fa9a..b3066ec 100644
--- a/src/widget/rectangle_tracker/mod.rs
+++ b/src/widget/rectangle_tracker/mod.rs
@@ -6,13 +6,13 @@ use iced::widget::Container;
pub use subscription::*;
use iced_core::event::{self, Event};
+use iced_core::layout;
+use iced_core::mouse;
+use iced_core::overlay;
+use iced_core::renderer;
use iced_core::widget::Tree;
-use iced_core::{
- Alignment, Clipboard, Element, Layout, Length, Padding, Rectangle, Shell, Widget, layout,
- mouse, overlay, renderer,
-};
-use std::fmt::Debug;
-use std::hash::Hash;
+use iced_core::{Alignment, Clipboard, Element, Layout, Length, Padding, Rectangle, Shell, Widget};
+use std::{fmt::Debug, hash::Hash};
pub use iced_widget::container::{Catalog, Style};
diff --git a/src/widget/rectangle_tracker/subscription.rs b/src/widget/rectangle_tracker/subscription.rs
index 22b4244..02fa432 100644
--- a/src/widget/rectangle_tracker/subscription.rs
+++ b/src/widget/rectangle_tracker/subscription.rs
@@ -1,10 +1,13 @@
-use iced::Rectangle;
-use iced::futures::channel::mpsc::{UnboundedReceiver, unbounded};
-use iced::futures::{StreamExt, stream};
+use iced::{
+ Rectangle,
+ futures::{
+ StreamExt,
+ channel::mpsc::{UnboundedReceiver, unbounded},
+ stream,
+ },
+};
use iced_futures::Subscription;
-use std::collections::HashMap;
-use std::fmt::Debug;
-use std::hash::Hash;
+use std::{collections::HashMap, fmt::Debug, hash::Hash};
use super::RectangleTracker;
diff --git a/src/widget/reorderable_flex_row/mod.rs b/src/widget/reorderable_flex_row/mod.rs
deleted file mode 100644
index d5da9f4..0000000
--- a/src/widget/reorderable_flex_row/mod.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2026 System76
-// SPDX-License-Identifier: MPL-2.0
-
-//! A keyed wrapping flex row whose items can be dragged to reorder.
-
-mod widget;
-
-pub use widget::{ReorderableFlexRow, reorderable_flex_row};
diff --git a/src/widget/reorderable_flex_row/widget.rs b/src/widget/reorderable_flex_row/widget.rs
deleted file mode 100644
index 0378987..0000000
--- a/src/widget/reorderable_flex_row/widget.rs
+++ /dev/null
@@ -1,1297 +0,0 @@
-// Copyright 2026 System76
-// SPDX-License-Identifier: MPL-2.0
-
-use crate::{Element, Renderer};
-use iced::{Alignment, Pixels, alignment};
-use iced_core::event::Event;
-use iced_core::layout::{self, Layout};
-use iced_core::mouse::{self, Cursor};
-use iced_core::widget::Operation;
-use iced_core::widget::tree::{self, Tree};
-#[cfg(feature = "wgpu")]
-use iced_core::{Background, Border, Shadow};
-use iced_core::{
- Clipboard, Length, Padding, Point, Rectangle, Renderer as _, Shell, Size, Vector, Widget,
- overlay, renderer, window,
-};
-use std::collections::{HashMap, HashSet};
-use std::hash::Hash;
-use std::time::{Duration, Instant};
-
-const DEFAULT_ANIMATION_DURATION: Duration = Duration::from_millis(180);
-const DEFAULT_DRAG_LIFT: f32 = 10.0;
-const DEFAULT_DRAG_THRESHOLD: f32 = 6.0;
-#[cfg(feature = "wgpu")]
-const SHADOW_BLUR_RADIUS: f32 = 20.0;
-const POSITION_EPSILON: f32 = 0.5;
-
-#[derive(Debug, Clone)]
-struct SlotAnimation {
- from: Point,
- to: Point,
- started_at: Option,
-}
-
-impl SlotAnimation {
- fn new(position: Point) -> Self {
- Self {
- from: position,
- to: position,
- started_at: None,
- }
- }
-
- fn current_position(&self, duration: Duration) -> Point {
- let Some(started_at) = self.started_at else {
- return self.to;
- };
-
- let duration_secs = duration.as_secs_f32();
- if duration_secs <= f32::EPSILON {
- return self.to;
- }
-
- let progress = (started_at.elapsed().as_secs_f32() / duration_secs).clamp(0.0, 1.0);
- let eased = 1.0 - (1.0 - progress).powi(3);
-
- Point::new(
- self.from.x + (self.to.x - self.from.x) * eased,
- self.from.y + (self.to.y - self.from.y) * eased,
- )
- }
-
- fn retarget(&mut self, new_target: Point, duration: Duration) {
- if approx_eq_point(self.to, new_target) {
- if !self.is_animating(duration) {
- self.from = new_target;
- self.to = new_target;
- self.started_at = None;
- }
- return;
- }
-
- self.from = self.current_position(duration);
- self.to = new_target;
- self.started_at = Some(Instant::now());
- }
-
- fn is_animating(&self, duration: Duration) -> bool {
- self.started_at
- .is_some_and(|started_at| started_at.elapsed() < duration)
- }
-
- fn finish_if_done(&mut self, duration: Duration) {
- if self
- .started_at
- .is_some_and(|started_at| started_at.elapsed() >= duration)
- {
- self.from = self.to;
- self.started_at = None;
- }
- }
-}
-
-#[derive(Debug, Clone)]
-struct PendingDragState
-where
- Key: Clone + Eq + Hash + 'static,
-{
- key: Key,
- item_index: usize,
- original_index: usize,
- press_local: Point,
- pointer_offset: Vector,
-}
-
-#[derive(Debug, Clone)]
-struct DragState
-where
- Key: Clone + Eq + Hash + 'static,
-{
- key: Key,
- item_index: usize,
- original_index: usize,
- current_index: usize,
- cursor_local: Point,
- pointer_offset: Vector,
-}
-
-#[derive(Debug, Clone)]
-struct State
-where
- Key: Clone + Eq + Hash + 'static,
-{
- keys: Vec,
- slot_positions: HashMap,
- pending_drag: Option>,
- drag: Option>,
- wrap_width: f32,
- initialized: bool,
-}
-
-impl Default for State
-where
- Key: Clone + Eq + Hash + 'static,
-{
- fn default() -> Self {
- Self {
- keys: Vec::new(),
- slot_positions: HashMap::new(),
- pending_drag: None,
- drag: None,
- wrap_width: f32::INFINITY,
- initialized: false,
- }
- }
-}
-
-impl State
-where
- Key: Clone + Eq + Hash + 'static,
-{
- fn retain_keys(&mut self, keys: &[Key]) {
- let keep: HashSet<_> = keys.iter().cloned().collect();
- self.slot_positions.retain(|key, _| keep.contains(key));
-
- if self
- .pending_drag
- .as_ref()
- .is_some_and(|drag| !keep.contains(&drag.key))
- {
- self.pending_drag = None;
- }
-
- if self
- .drag
- .as_ref()
- .is_some_and(|drag| !keep.contains(&drag.key))
- {
- self.drag = None;
- }
- }
-
- fn finish_animations(&mut self, duration: Duration) {
- self.slot_positions
- .values_mut()
- .for_each(|slot| slot.finish_if_done(duration));
- }
-
- fn is_animating(&self, duration: Duration) -> bool {
- self.slot_positions
- .values()
- .any(|slot| slot.is_animating(duration))
- }
-
- fn current_slot_position(&self, key: &Key, fallback: Point, duration: Duration) -> Point {
- self.slot_positions
- .get(key)
- .map(|slot| slot.current_position(duration))
- .unwrap_or(fallback)
- }
-
- fn retarget_slot(&mut self, key: &Key, target: Point, duration: Duration) {
- self.slot_positions
- .entry(key.clone())
- .or_insert_with(|| SlotAnimation::new(target))
- .retarget(target, duration);
- }
-
- fn snap_slot(&mut self, key: &Key, target: Point) {
- self.slot_positions
- .insert(key.clone(), SlotAnimation::new(target));
- }
-
- fn apply_layout_position(&mut self, key: &Key, target: Point, duration: Duration) {
- if self.initialized {
- self.retarget_slot(key, target, duration);
- } else {
- self.snap_slot(key, target);
- }
- }
-}
-
-#[derive(Debug, Clone)]
-struct LocalSlot
-where
- Key: Clone + Eq + Hash + 'static,
-{
- key: Key,
- locked: bool,
- bounds: Rectangle,
-}
-
-/// A horizontal flex row with drag-to-reorder behavior.
-#[must_use]
-pub struct ReorderableFlexRow<'a, Key, Message>
-where
- Key: Clone + Eq + Hash + 'static,
-{
- spacing: f32,
- padding: Padding,
- width: Length,
- height: Length,
- align: Alignment,
- clip: bool,
- drag_lift: f32,
- animation_duration: Duration,
- on_reorder: Box) -> Message + 'a>,
- keys: Vec,
- locked: Vec,
- children: Vec>,
-}
-
-impl<'a, Key, Message> ReorderableFlexRow<'a, Key, Message>
-where
- Key: Clone + Eq + Hash + 'static,
-{
- pub fn new(on_reorder: impl Fn(Vec) -> Message + 'a) -> Self {
- Self {
- spacing: 0.0,
- padding: Padding::ZERO,
- width: Length::Shrink,
- height: Length::Shrink,
- align: Alignment::Start,
- clip: false,
- drag_lift: DEFAULT_DRAG_LIFT,
- animation_duration: DEFAULT_ANIMATION_DURATION,
- on_reorder: Box::new(on_reorder),
- keys: Vec::new(),
- locked: Vec::new(),
- children: Vec::new(),
- }
- }
-
- pub fn with_capacity(capacity: usize, on_reorder: impl Fn(Vec) -> Message + 'a) -> Self {
- let mut row = Self::new(on_reorder);
- row.keys = Vec::with_capacity(capacity);
- row.locked = Vec::with_capacity(capacity);
- row.children = Vec::with_capacity(capacity);
- row
- }
-
- pub fn spacing(mut self, amount: impl Into) -> Self {
- self.spacing = amount.into().0;
- self
- }
-
- pub fn padding>(mut self, padding: P) -> Self {
- self.padding = padding.into();
- self
- }
-
- pub fn width(mut self, width: impl Into) -> Self {
- self.width = width.into();
- self
- }
-
- pub fn height(mut self, height: impl Into) -> Self {
- self.height = height.into();
- self
- }
-
- pub fn align_y(mut self, align: impl Into) -> Self {
- self.align = Alignment::from(align.into());
- self
- }
-
- /// Leave disabled for dragged item to visibly lift above the row.
- pub fn clip(mut self, clip: bool) -> Self {
- self.clip = clip;
- self
- }
-
- pub fn drag_lift(mut self, lift: f32) -> Self {
- self.drag_lift = lift.max(0.0);
- self
- }
-
- pub fn animation_duration(mut self, duration: Duration) -> Self {
- self.animation_duration = duration;
- self
- }
-
- pub fn push(self, key: Key, child: impl Into>) -> Self {
- self.push_with_lock(key, false, child)
- }
-
- /// Item stays fixed, never participates in reordering.
- pub fn push_locked(self, key: Key, child: impl Into>) -> Self {
- self.push_with_lock(key, true, child)
- }
-
- fn push_with_lock(
- mut self,
- key: Key,
- locked: bool,
- child: impl Into>,
- ) -> Self {
- let child = child.into();
- let child_size = child.as_widget().size_hint();
-
- if !child_size.is_void() {
- self.width = self.width.enclose(child_size.width);
- self.height = self.height.enclose(child_size.height);
- self.keys.push(key);
- self.locked.push(locked);
- self.children.push(child);
- }
-
- self
- }
-
- pub fn extend(self, items: impl IntoIterator
- )>) -> Self {
- items
- .into_iter()
- .fold(self, |row, (key, child)| row.push(key, child))
- }
-
- pub fn extend_locked(
- self,
- items: impl IntoIterator
- )>,
- ) -> Self {
- items
- .into_iter()
- .fold(self, |row, (key, child)| row.push_locked(key, child))
- }
-
- fn item_local_slots_from_layout(
- &self,
- bounds: Rectangle,
- child_layouts: &[Layout<'_>],
- ) -> Vec> {
- self.keys
- .iter()
- .zip(self.locked.iter())
- .zip(child_layouts.iter())
- .map(|((key, locked), child_layout)| {
- let child_bounds = child_layout.bounds();
- LocalSlot {
- key: key.clone(),
- locked: *locked,
- bounds: Rectangle {
- x: child_bounds.x - bounds.x,
- y: child_bounds.y - bounds.y,
- width: child_bounds.width,
- height: child_bounds.height,
- },
- }
- })
- .collect()
- }
-
- fn sync_slot_positions(&self, state: &mut State, slots: &[LocalSlot]) {
- let ordered_keys: Vec = slots.iter().map(|slot| slot.key.clone()).collect();
- state.retain_keys(&ordered_keys);
-
- let size_by_key: HashMap = slots
- .iter()
- .map(|slot| {
- (
- slot.key.clone(),
- Size::new(slot.bounds.width, slot.bounds.height),
- )
- })
- .collect();
- let locked_by_key: HashMap = slots
- .iter()
- .map(|slot| (slot.key.clone(), slot.locked))
- .collect();
-
- let Some(drag_snapshot) = state.drag.as_ref().map(|drag| {
- (
- drag.key.clone(),
- drag.cursor_local,
- drag.pointer_offset,
- drag.item_index,
- )
- }) else {
- for slot in slots {
- state.apply_layout_position(
- &slot.key,
- Point::new(slot.bounds.x, slot.bounds.y),
- self.animation_duration,
- );
- }
- return;
- };
-
- let (drag_key, cursor_local, pointer_offset, drag_item_index) = drag_snapshot;
-
- let Some(dragged_slot) = slots.iter().find(|slot| slot.key == drag_key) else {
- state.drag = None;
- for slot in slots {
- state.apply_layout_position(
- &slot.key,
- Point::new(slot.bounds.x, slot.bounds.y),
- self.animation_duration,
- );
- }
- return;
- };
-
- if dragged_slot.locked {
- state.drag = None;
- return;
- }
-
- let dragged_center = Point::new(
- cursor_local.x - pointer_offset.x + dragged_slot.bounds.width / 2.0,
- cursor_local.y - pointer_offset.y + dragged_slot.bounds.height / 2.0,
- );
- let target_index = target_index_for_drag(slots, &drag_key, dragged_center);
- let prior_index = state.drag.as_ref().map(|drag| drag.current_index);
-
- if let Some(drag) = state.drag.as_mut() {
- drag.current_index = target_index;
- drag.item_index = drag_item_index;
- }
-
- if prior_index == Some(target_index) {
- return;
- }
-
- let reordered_keys =
- reordered_keys_for_drag(&ordered_keys, &locked_by_key, &drag_key, target_index);
- let (target_slots, _) = compute_wrapped_slots(
- &reordered_keys,
- &locked_by_key,
- &size_by_key,
- state.wrap_width,
- self.padding,
- self.spacing,
- self.align,
- );
- let target_positions: HashMap = target_slots
- .iter()
- .map(|slot| (slot.key.clone(), Point::new(slot.bounds.x, slot.bounds.y)))
- .collect();
-
- for slot in slots {
- let target = target_positions
- .get(&slot.key)
- .copied()
- .unwrap_or(Point::new(slot.bounds.x, slot.bounds.y));
- state.retarget_slot(&slot.key, target, self.animation_duration);
- }
- }
-}
-
-impl<'a, Key, Message> Widget
- for ReorderableFlexRow<'a, Key, Message>
-where
- Key: Clone + Eq + Hash + 'static,
- Message: 'a,
-{
- fn tag(&self) -> tree::Tag {
- tree::Tag::of::>()
- }
-
- fn state(&self) -> tree::State {
- tree::State::new(State {
- keys: self.keys.clone(),
- ..State::default()
- })
- }
-
- fn children(&self) -> Vec {
- self.children.iter().map(Tree::new).collect()
- }
-
- fn diff(&mut self, tree: &mut Tree) {
- let Tree {
- state, children, ..
- } = tree;
- let state = state.downcast_mut::>();
- let previous_keys = state.keys.clone();
- let previous_children = std::mem::take(children);
- let mut previous_by_key = HashMap::with_capacity(previous_keys.len());
-
- for (key, child_tree) in previous_keys.into_iter().zip(previous_children) {
- previous_by_key.insert(key, child_tree);
- }
-
- children.reserve(self.children.len());
-
- for (key, child) in self.keys.iter().cloned().zip(self.children.iter_mut()) {
- let mut child_tree = previous_by_key
- .remove(&key)
- .unwrap_or_else(|| Tree::new(child.as_widget()));
- child.as_widget_mut().diff(&mut child_tree);
- children.push(child_tree);
- }
-
- if state.keys != self.keys {
- state.keys.clone_from(&self.keys);
- }
- state.retain_keys(&self.keys);
- }
-
- fn size(&self) -> Size {
- Size {
- width: self.width,
- height: self.height,
- }
- }
-
- fn layout(
- &mut self,
- tree: &mut Tree,
- renderer: &Renderer,
- limits: &layout::Limits,
- ) -> layout::Node {
- let limits = limits
- .width(self.width)
- .height(self.height)
- .shrink(self.padding);
- let child_limits = limits.loose();
- let wrap_width = limits.max().width;
-
- let mut nodes = Vec::with_capacity(self.children.len());
- let mut size_by_key = HashMap::with_capacity(self.children.len());
- let locked_by_key: HashMap = self
- .keys
- .iter()
- .cloned()
- .zip(self.locked.iter().copied())
- .collect();
-
- for ((key, child), child_tree) in self
- .keys
- .iter()
- .zip(self.children.iter_mut())
- .zip(tree.children.iter_mut())
- {
- let node = child
- .as_widget_mut()
- .layout(child_tree, renderer, &child_limits);
- size_by_key.insert(key.clone(), node.size());
- nodes.push(node);
- }
-
- let (slots, intrinsic_size) = compute_wrapped_slots(
- &self.keys,
- &locked_by_key,
- &size_by_key,
- wrap_width,
- self.padding,
- self.spacing,
- self.align,
- );
-
- for (node, slot) in nodes.iter_mut().zip(&slots) {
- node.move_to_mut(Point::new(slot.bounds.x, slot.bounds.y));
- }
-
- let size = limits.resolve(self.width, self.height, intrinsic_size);
- let node = layout::Node::with_children(size.expand(self.padding), nodes);
- let state = tree.state.downcast_mut::>();
- state.wrap_width = wrap_width;
- self.sync_slot_positions(state, &slots);
-
- node
- }
-
- fn operate(
- &mut self,
- tree: &mut Tree,
- layout: Layout<'_>,
- renderer: &Renderer,
- operation: &mut dyn Operation,
- ) {
- operation.container(None, layout.bounds());
- operation.traverse(&mut |operation| {
- self.children
- .iter_mut()
- .zip(&mut tree.children)
- .zip(layout.children())
- .for_each(|((child, state), child_layout)| {
- child.as_widget_mut().operate(
- state,
- child_layout.with_virtual_offset(layout.virtual_offset()),
- renderer,
- operation,
- );
- });
- });
- }
-
- fn update(
- &mut self,
- tree: &mut Tree,
- event: &Event,
- layout: Layout<'_>,
- cursor: Cursor,
- renderer: &Renderer,
- clipboard: &mut dyn Clipboard,
- shell: &mut Shell<'_, Message>,
- viewport: &Rectangle,
- ) {
- let bounds = layout.bounds();
- let state = tree.state.downcast_mut::>();
- let child_layouts: Vec<_> = layout.children().collect();
-
- if let Event::Window(window::Event::RedrawRequested(_)) = event {
- state.initialized = true;
- state.finish_animations(self.animation_duration);
- if state.drag.is_some() || state.is_animating(self.animation_duration) {
- shell.request_redraw();
- }
- }
-
- match event {
- Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) => {
- if state.drag.is_none()
- && state.pending_drag.is_none()
- && let Some(cursor_pos) = cursor.position()
- && let Some((index, child_layout)) = child_layouts
- .iter()
- .enumerate()
- .find(|(_, child_layout)| child_layout.bounds().contains(cursor_pos))
- && !self.locked.get(index).copied().unwrap_or(false)
- && let Some(reorder_index) = reorderable_index_for_child(&self.locked, index)
- {
- let child_bounds = child_layout.bounds();
- state.pending_drag = Some(PendingDragState {
- key: self.keys[index].clone(),
- item_index: index,
- original_index: reorder_index,
- press_local: Point::new(cursor_pos.x - bounds.x, cursor_pos.y - bounds.y),
- pointer_offset: Vector::new(
- cursor_pos.x - child_bounds.x,
- cursor_pos.y - child_bounds.y,
- ),
- });
- }
- }
- Event::Mouse(mouse::Event::CursorMoved { .. }) => {
- if let Some(pending) = state.pending_drag.clone()
- && let Some(cursor_pos) = cursor.position()
- {
- let cursor_local = Point::new(cursor_pos.x - bounds.x, cursor_pos.y - bounds.y);
- let delta = Vector::new(
- cursor_local.x - pending.press_local.x,
- cursor_local.y - pending.press_local.y,
- );
- let distance = (delta.x.powi(2) + delta.y.powi(2)).sqrt();
-
- if distance >= DEFAULT_DRAG_THRESHOLD {
- if let (Some(child), Some(child_tree), Some(child_layout)) = (
- self.children.get_mut(pending.item_index),
- tree.children.get_mut(pending.item_index),
- child_layouts.get(pending.item_index),
- ) {
- let cursor_left = Event::Mouse(mouse::Event::CursorLeft);
- child.as_widget_mut().update(
- child_tree,
- &cursor_left,
- child_layout.with_virtual_offset(layout.virtual_offset()),
- cursor,
- renderer,
- clipboard,
- shell,
- viewport,
- );
- }
-
- state.pending_drag = None;
- state.drag = Some(DragState {
- key: pending.key,
- item_index: pending.item_index,
- original_index: pending.original_index,
- current_index: pending.original_index,
- cursor_local,
- pointer_offset: pending.pointer_offset,
- });
- let slots = self.item_local_slots_from_layout(bounds, &child_layouts);
- self.sync_slot_positions(state, &slots);
- shell.capture_event();
- shell.request_redraw();
- return;
- }
- }
-
- if let Some(drag) = state.drag.as_mut()
- && let Some(cursor_pos) = cursor.position()
- {
- drag.cursor_local =
- Point::new(cursor_pos.x - bounds.x, cursor_pos.y - bounds.y);
- let slots = self.item_local_slots_from_layout(bounds, &child_layouts);
- self.sync_slot_positions(state, &slots);
- shell.capture_event();
- shell.request_redraw();
- return;
- }
- }
- Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Left)) => {
- state.pending_drag = None;
-
- if state.drag.is_some() {
- let slots = self.item_local_slots_from_layout(bounds, &child_layouts);
- self.sync_slot_positions(state, &slots);
- }
- if let Some(drag) = state.drag.take() {
- if drag.current_index != drag.original_index {
- let locked_by_key: HashMap = self
- .keys
- .iter()
- .cloned()
- .zip(self.locked.iter().copied())
- .collect();
- let new_order = reordered_keys_for_drag(
- &self.keys,
- &locked_by_key,
- &drag.key,
- drag.current_index,
- );
- shell.publish((self.on_reorder)(new_order));
- }
- shell.capture_event();
- shell.request_redraw();
- return;
- }
- }
- _ => {}
- }
-
- if state.drag.is_some() {
- return;
- }
-
- for ((item, tree), child_layout) in self
- .children
- .iter_mut()
- .zip(&mut tree.children)
- .zip(child_layouts.into_iter())
- {
- item.as_widget_mut().update(
- tree,
- event,
- child_layout.with_virtual_offset(layout.virtual_offset()),
- cursor,
- renderer,
- clipboard,
- shell,
- viewport,
- );
- }
- }
-
- fn mouse_interaction(
- &self,
- tree: &Tree,
- layout: Layout<'_>,
- cursor: Cursor,
- viewport: &Rectangle,
- renderer: &Renderer,
- ) -> mouse::Interaction {
- let state = tree.state.downcast_ref::>();
-
- if state.drag.is_some() {
- return mouse::Interaction::Grabbing;
- }
-
- if let Some(cursor_pos) = cursor.position()
- && self
- .locked
- .iter()
- .zip(layout.children())
- .any(|(locked, child_layout)| {
- !*locked && child_layout.bounds().contains(cursor_pos)
- })
- {
- return mouse::Interaction::Grab;
- }
-
- self.children
- .iter()
- .zip(&tree.children)
- .zip(layout.children())
- .map(|((child, tree), child_layout)| {
- child.as_widget().mouse_interaction(
- tree,
- child_layout.with_virtual_offset(layout.virtual_offset()),
- cursor,
- viewport,
- renderer,
- )
- })
- .max()
- .unwrap_or_default()
- }
-
- fn draw(
- &self,
- tree: &Tree,
- renderer: &mut Renderer,
- theme: &crate::Theme,
- style: &renderer::Style,
- layout: Layout<'_>,
- cursor: Cursor,
- viewport: &Rectangle,
- ) {
- let state = tree.state.downcast_ref::>();
- let bounds = layout.bounds();
-
- let Some(clipped_viewport) = bounds.intersection(viewport) else {
- return;
- };
-
- let viewport = if self.clip {
- &clipped_viewport
- } else {
- viewport
- };
- let drag_key = state.drag.as_ref().map(|drag| &drag.key);
- let drag_item = state.drag.as_ref().and_then(|drag| {
- self.keys
- .iter()
- .zip(&self.children)
- .zip(&tree.children)
- .zip(layout.children())
- .find_map(|(((key, child), state), child_layout)| {
- (key == &drag.key).then_some((key, child, state, child_layout, drag))
- })
- });
-
- for (((key, child), child_tree), child_layout) in self
- .keys
- .iter()
- .zip(&self.children)
- .zip(&tree.children)
- .zip(layout.children())
- {
- if drag_key.is_some_and(|drag_key| drag_key == key) {
- continue;
- }
-
- let child_layout = child_layout.with_virtual_offset(layout.virtual_offset());
- let child_bounds = child_layout.bounds();
- let base_local = Point::new(child_bounds.x - bounds.x, child_bounds.y - bounds.y);
- let target_local =
- state.current_slot_position(key, base_local, self.animation_duration);
- let translation =
- Vector::new(target_local.x - base_local.x, target_local.y - base_local.y);
- let translated_bounds = translate_rect(child_bounds, translation);
-
- if translated_bounds.intersects(viewport) {
- renderer.with_translation(translation, |renderer| {
- child.as_widget().draw(
- child_tree,
- renderer,
- theme,
- style,
- child_layout,
- cursor,
- viewport,
- );
- });
- }
- }
-
- if let Some((_key, child, child_tree, child_layout, drag)) = drag_item {
- let child_layout = child_layout.with_virtual_offset(layout.virtual_offset());
- let child_bounds = child_layout.bounds();
- let base_local = Point::new(child_bounds.x - bounds.x, child_bounds.y - bounds.y);
- let drag_local = Point::new(
- drag.cursor_local.x - drag.pointer_offset.x,
- drag.cursor_local.y - drag.pointer_offset.y - self.drag_lift,
- );
- let translation = Vector::new(drag_local.x - base_local.x, drag_local.y - base_local.y);
-
- #[cfg(feature = "wgpu")]
- {
- let translated_bounds = translate_rect(child_bounds, translation);
- draw_drag_backdrop(renderer, theme, translated_bounds);
- }
-
- renderer.with_translation(translation, |renderer| {
- child.as_widget().draw(
- child_tree,
- renderer,
- theme,
- style,
- child_layout,
- cursor,
- viewport,
- );
- });
- }
- }
-
- fn overlay<'b>(
- &'b mut self,
- tree: &'b mut Tree,
- layout: Layout<'b>,
- renderer: &Renderer,
- viewport: &Rectangle,
- translation: Vector,
- ) -> Option> {
- overlay::from_children(
- &mut self.children,
- tree,
- layout,
- renderer,
- viewport,
- translation,
- )
- }
-
- fn drag_destinations(
- &self,
- state: &Tree,
- layout: Layout<'_>,
- renderer: &Renderer,
- dnd_rectangles: &mut iced_core::clipboard::DndDestinationRectangles,
- ) {
- for ((item, child_layout), child_state) in self
- .children
- .iter()
- .zip(layout.children())
- .zip(state.children.iter())
- {
- item.as_widget().drag_destinations(
- child_state,
- child_layout.with_virtual_offset(layout.virtual_offset()),
- renderer,
- dnd_rectangles,
- );
- }
- }
-}
-
-impl<'a, Key, Message> From> for Element<'a, Message>
-where
- Key: Clone + Eq + Hash + 'static,
- Message: 'a,
-{
- fn from(row: ReorderableFlexRow<'a, Key, Message>) -> Self {
- Element::new(row)
- }
-}
-
-/// Create a horizontal flex row with drag-to-reorder behavior.
-pub fn reorderable_flex_row<'a, Key, Message>(
- on_reorder: impl Fn(Vec) -> Message + 'a,
-) -> ReorderableFlexRow<'a, Key, Message>
-where
- Key: Clone + Eq + Hash + 'static,
-{
- ReorderableFlexRow::new(on_reorder)
-}
-
-fn compute_wrapped_slots(
- ordered_keys: &[Key],
- locked_by_key: &HashMap,
- size_by_key: &HashMap