diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5a5258f3..7897eb01 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,20 +6,26 @@ on:
- master
pull_request:
+
jobs:
format:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-22.04
steps:
- name: Checkout sources
- uses: actions/checkout@v6
+ uses: actions/checkout@v3
- name: Rust toolchain
- uses: actions-rust-lang/setup-rust-toolchain@v1
+ uses: dtolnay/rust-toolchain@stable
with:
- toolchain: nightly
components: rustfmt
- rustflags: ""
+ - name: Cargo cache
+ uses: actions/cache@v3
+ with:
+ path: |
+ ~/.cargo/registry
+ ~/.cargo/git
+ key: ${{ runner.os }}-cargo-rust_stable-${{ hashFiles('**/Cargo.toml') }}
- name: Format
- run: cargo +nightly fmt -- --check
+ run: cargo fmt -- --check
tests:
needs:
@@ -28,28 +34,38 @@ jobs:
fail-fast: false
matrix:
test_args:
- - --no-default-features --features "" # for cosmic-comp, don't remove!
- - --no-default-features --features "winit_debug"
- - --no-default-features --features "winit_tokio"
- - --no-default-features --features "winit"
- - --no-default-features --features "winit_wgpu"
- - --no-default-features --features "wayland"
- - --no-default-features --features "applet"
- - --no-default-features --features "desktop,smol"
- - --no-default-features --features "desktop,tokio"
- - -p cosmic-theme
- runs-on: ubuntu-latest
+ - --no-default-features --features "" # for cosmic-comp, don't remove!
+ - --no-default-features --features "winit_debug"
+ - --no-default-features --features "winit_tokio"
+ - --no-default-features --features "winit"
+ - --no-default-features --features "winit_wgpu"
+ - --no-default-features --features "wayland"
+ - --no-default-features --features "applet"
+ - --no-default-features --features "desktop,smol"
+ - --no-default-features --features "desktop,tokio"
+ - -p cosmic-theme
+ runs-on: ubuntu-22.04
steps:
- name: Checkout sources
- uses: actions/checkout@v6
+ uses: actions/checkout@v3
with:
submodules: recursive
+ - name: Get date for registry cache
+ id: date
+ run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
+ - name: Cargo registry cache
+ uses: actions/cache@v3
+ with:
+ path: |
+ ~/.cargo/registry/index
+ ~/.cargo/registry/cache
+ ~/.cargo/git
+ key: ${{ runner.os }}-cargo-registry-${{ steps.date.outputs.date }}
+ restore-keys: ${{ runner.os }}-cargo-registry-
- name: System dependencies
run: sudo apt-get update; sudo apt-get install -y libxkbcommon-dev libwayland-dev
- name: Rust toolchain
- uses: actions-rust-lang/setup-rust-toolchain@v1
- with:
- rustflags: ""
+ uses: dtolnay/rust-toolchain@stable
- name: Test features
run: cargo test ${{ matrix.test_args }} -- --test-threads=1
env:
@@ -66,18 +82,28 @@ jobs:
- "open-dialog"
- "context-menu"
- "nav-context"
- runs-on: ubuntu-latest
+ runs-on: ubuntu-22.04
steps:
- name: Checkout sources
- uses: actions/checkout@v6
+ uses: actions/checkout@v3
with:
submodules: recursive
+ - name: Get date for registry cache
+ id: date
+ run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
+ - name: Cargo registry cache
+ uses: actions/cache@v3
+ with:
+ path: |
+ ~/.cargo/registry/index
+ ~/.cargo/registry/cache
+ ~/.cargo/git
+ key: ${{ runner.os }}-cargo-registry-${{ steps.date.outputs.date }}
+ restore-keys: ${{ runner.os }}-cargo-registry-
- name: System dependencies
run: sudo apt-get update; sudo apt-get install -y libxkbcommon-dev libwayland-dev
- name: Rust toolchain
- uses: actions-rust-lang/setup-rust-toolchain@v1
- with:
- rustflags: ""
+ uses: dtolnay/rust-toolchain@stable
- name: Check example
run: cargo check -p "${{ matrix.examples }}"
env:
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index e51c552f..3e3a042e 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -11,26 +11,25 @@ jobs:
steps:
- name: Checkout sources
- uses: actions/checkout@v6
+ uses: actions/checkout@v3
with:
submodules: recursive
- name: Install Rust nightly
- uses: actions-rust-lang/setup-rust-toolchain@v1
+ uses: dtolnay/rust-toolchain@master
with:
- toolchain: nightly-2026-04-27
- rustflags: ""
+ 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 \
--verbose --features tokio,winit,wayland,desktop,single-instance,applet,xdg-portal,multi-window
- name: Deploy documentation
- uses: peaceiris/actions-gh-pages@v4
+ uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./target/doc
diff --git a/.zed/settings.json b/.zed/settings.json
deleted file mode 100644
index 2cc7b98d..00000000
--- 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 07b73c19..d73da2dc 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",
@@ -74,7 +72,6 @@ serde-keycode = ["iced_core/serde"]
single-instance = ["zbus/blocking-api", "ron"]
# smol async runtime
smol = ["dep:smol", "iced/smol", "zbus?/async-io", "rfd?/async-std"]
-# Tokio async runtime
tokio = [
"dep:tokio",
"ashpd?/tokio",
@@ -84,25 +81,20 @@ 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.
-# COSMIC 1.5/1.6 renamed the iced `cctk` features to `wayland`; the local
-# `winit` feature stays empty in this fork, so iced/winit is listed explicitly
-# instead of going through it.
-wayland = [
+# Wayland window support
+iced-wayland = [
"ashpd?/wayland",
"autosize",
- "multi-window",
- "surface-message",
- "winit",
- "iced/winit",
"iced/wayland",
"iced_winit/wayland",
- "iced_runtime/wayland",
- "iced_wgpu/wayland",
- "dep:iced_winit",
+ "surface-message",
+]
+wayland = [
+ "iced-wayland",
+ "iced_runtime/cctk",
+ "iced_winit/cctk",
+ "iced_wgpu/cctk",
+ "iced/cctk",
"dep:cctk",
]
surface-message = []
@@ -110,11 +102,11 @@ surface-message = []
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"]
@@ -127,15 +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 = { 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",
@@ -155,38 +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 }
-enumflags2 = "0.7.12"
# Enable DBus feature on Linux targets
-[target.'cfg(all(unix, not(any(target_os = "redox", target_family = "wasm", target_os = "android", target_vendor = "apple"))))'.dependencies]
-cctk = { path = "../cosmic-protocols/client-toolkit", package = "cosmic-client-toolkit", optional = true }
-ashpd = { version = "0.12.3", default-features = false, optional = true }
+[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 }
@@ -232,83 +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"
-
-[workspace.package]
-edition = "2024"
-
-[build-dependencies]
-build_helpers = { path = "./iced/build_helpers" }
diff --git a/README.md b/README.md
index 698316db..23da97bc 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/build.rs b/build.rs
index 722d2c57..4ce0aa9e 100644
--- a/build.rs
+++ b/build.rs
@@ -8,7 +8,6 @@ fn main() {
{
generate_bundled_icons();
}
- build_helpers::cfg_aliases_setup();
}
fn generate_bundled_icons() {
diff --git a/cosmic-config-derive/src/lib.rs b/cosmic-config-derive/src/lib.rs
index b49cf447..cc19a91e 100644
--- a/cosmic-config-derive/src/lib.rs
+++ b/cosmic-config-derive/src/lib.rs
@@ -1,32 +1,17 @@
use proc_macro::TokenStream;
use quote::quote;
-use syn;
+use syn::{self};
-#[proc_macro_derive(CosmicConfigEntry, attributes(version, id, cosmic_config_entry))]
+#[proc_macro_derive(CosmicConfigEntry, attributes(version, id))]
pub fn cosmic_config_entry_derive(input: TokenStream) -> TokenStream {
+ // Construct a representation of Rust code as a syntax tree
+ // that we can manipulate
let ast = syn::parse(input).unwrap();
+
+ // Build the trait implementation
impl_cosmic_config_entry_macro(&ast)
}
-fn get_cosmic_config_attrs(field: &syn::Field) -> Result, syn::Error> {
- let mut with = None;
-
- for attr in &field.attrs {
- if !attr.path().is_ident("cosmic_config_entry") {
- continue;
- }
- attr.parse_nested_meta(|meta| {
- if meta.path.is_ident("with") {
- let value = meta.value()?;
- with = Some(value.parse()?);
- }
- Ok(())
- })?;
- }
-
- Ok(with)
-}
-
fn impl_cosmic_config_entry_macro(ast: &syn::DeriveInput) -> TokenStream {
let attributes = &ast.attrs;
let version = attributes
@@ -63,54 +48,19 @@ fn impl_cosmic_config_entry_macro(ast: &syn::DeriveInput) -> TokenStream {
let write_each_config_field = fields.iter().map(|field| {
let field_name = &field.ident;
- let with = match get_cosmic_config_attrs(field) {
- Ok(attrs) => attrs,
- Err(e) => {
- return e.to_compile_error();
- }
- };
-
- if let Some(with) = with {
- quote! {
- {
- let conv = self.#field_name.clone().into();
- cosmic_config::ConfigSet::set::<#with>(&tx, stringify!(#field_name), conv)?;
- }
- }
- } else {
- quote! {
- cosmic_config::ConfigSet::set(&tx, stringify!(#field_name), &self.#field_name)?;
- }
+ quote! {
+ cosmic_config::ConfigSet::set(&tx, stringify!(#field_name), &self.#field_name)?;
}
});
let get_each_config_field = fields.iter().map(|field| {
let field_name = &field.ident;
let field_type = &field.ty;
- let with = match get_cosmic_config_attrs(field) {
- Ok(attrs) => attrs,
- Err(e) => {
- return e.to_compile_error();
- }
- };
-
- if let Some(with) = with {
- quote! {
- match cosmic_config::ConfigGet::get::<#with>(config, stringify!(#field_name)) {
- Ok(value) => {
- default.#field_name = value.into();
- }
- Err(why) if matches!(why, cosmic_config::Error::NoConfigDirectory) => (),
- Err(e) => errors.push(e),
- }
- }
- } else {
- quote! {
- match cosmic_config::ConfigGet::get::<#field_type>(config, stringify!(#field_name)) {
- Ok(#field_name) => default.#field_name = #field_name,
- Err(why) if matches!(why, cosmic_config::Error::NoConfigDirectory) => (),
- Err(e) => errors.push(e),
- }
+ quote! {
+ match cosmic_config::ConfigGet::get::<#field_type>(config, stringify!(#field_name)) {
+ Ok(#field_name) => default.#field_name = #field_name,
+ Err(why) if matches!(why, cosmic_config::Error::NoConfigDirectory) => (),
+ Err(e) => errors.push(e),
}
}
});
@@ -118,39 +68,17 @@ fn impl_cosmic_config_entry_macro(ast: &syn::DeriveInput) -> TokenStream {
let update_each_config_field = fields.iter().map(|field| {
let field_name = &field.ident;
let field_type = &field.ty;
- let with = match get_cosmic_config_attrs(field) {
- Ok(attrs) => attrs,
- Err(e) => {
- return e.to_compile_error();
- }
- };
-
- if let Some(with) = with {
- quote! {
- stringify!(#field_name) => {
- match cosmic_config::ConfigGet::get::<#with>(config, stringify!(#field_name)) {
- Ok(value) => {
- let value = value.into();
- if self.#field_name != value {
- keys.push(stringify!(#field_name));
- }
- self.#field_name = value;
- },
- Err(e) => errors.push(e),
- }
- }
- }
- } else {
- quote! {
- stringify!(#field_name) => {
- match cosmic_config::ConfigGet::get::<#field_type>(config, stringify!(#field_name)) {
- Ok(value) => {
- if self.#field_name != value {
- keys.push(stringify!(#field_name));
- }
- self.#field_name = value;
- },
- Err(e) => errors.push(e),
+ quote! {
+ stringify!(#field_name) => {
+ match cosmic_config::ConfigGet::get::<#field_type>(config, stringify!(#field_name)) {
+ Ok(value) => {
+ if self.#field_name != value {
+ keys.push(stringify!(#field_name));
+ }
+ self.#field_name = value;
+ },
+ Err(e) => {
+ errors.push(e);
}
}
}
diff --git a/cosmic-config/Cargo.toml b/cosmic-config/Cargo.toml
index a81d13fd..0a7653e0 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 76c03ad5..da7bcb68 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?;
@@ -67,8 +68,6 @@ struct Wrapper(
impl std::hash::Hash for Wrapper {
fn hash(&self, state: &mut H) {
self.0.hash(state);
- self.2.hash(state);
- self.3.hash(state);
}
}
diff --git a/cosmic-config/src/lib.rs b/cosmic-config/src/lib.rs
index 1396b5cb..c8eda064 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")]
@@ -175,7 +162,6 @@ pub trait ConfigSet {
pub struct Config {
system_path: Option,
user_path: Option,
- previous: Option>,
}
/// Check that the name is relative and doesn't contain . or ..
@@ -194,13 +180,9 @@ fn sanitize_name(name: &str) -> Result<&Path, Error> {
impl Config {
/// Get a system config for the given name and config version
pub fn system(name: &str, version: u64) -> Result {
- Self::system_inner(name, version, true)
- }
-
- fn system_inner(name: &str, version: u64, look_for_previous: bool) -> Result {
let path = sanitize_name(name)?.join(format!("v{version}"));
#[cfg(unix)]
- let system_path = xdg::BaseDirectories::with_prefix("cosmic").find_data_file(&path);
+ let system_path = xdg::BaseDirectories::with_prefix("cosmic").find_data_file(path);
#[cfg(windows)]
let system_path =
@@ -210,13 +192,6 @@ impl Config {
Ok(Self {
system_path,
user_path: None,
- previous: if version > 1 && look_for_previous {
- Self::system_inner(name, version - 1, false)
- .ok()
- .map(Box::new)
- } else {
- None
- },
})
}
@@ -224,10 +199,6 @@ impl Config {
// Use folder at XDG config/name for config storage, return Config if successful
//TODO: fallbacks for flatpak (HOST_XDG_CONFIG_HOME, xdg-desktop settings proxy)
pub fn new(name: &str, version: u64) -> Result {
- Self::new_inner(name, version, true)
- }
-
- fn new_inner(name: &str, version: u64, look_for_previous: bool) -> Result {
// Look for [name]/v[version]
let path = sanitize_name(name)?.join(format!("v{}", version));
@@ -252,29 +223,15 @@ impl Config {
Ok(Self {
system_path,
user_path: Some(user_path),
- previous: if version > 1 && look_for_previous {
- Self::new_inner(name, version - 1, false).ok().map(Box::new)
- } else {
- None
- },
})
}
/// Get config for the given application name and config version and custom path.
pub fn with_custom_path(name: &str, version: u64, custom_path: PathBuf) -> Result {
- Self::with_custom_path_inner(name, version, custom_path, true)
- }
-
- fn with_custom_path_inner(
- name: &str,
- version: u64,
- custom_path: PathBuf,
- look_for_previous: bool,
- ) -> Result {
// Look for [name]/v[version]
let path = sanitize_name(name)?.join(format!("v{version}"));
- let mut user_path = custom_path.clone();
+ let mut user_path = custom_path;
user_path.push("cosmic");
user_path.push(path);
// Create new configuration directory if not found.
@@ -284,13 +241,6 @@ impl Config {
Ok(Self {
system_path: None,
user_path: Some(user_path),
- previous: if version > 1 && look_for_previous {
- Self::with_custom_path_inner(name, version - 1, custom_path.clone(), false)
- .ok()
- .map(Box::new)
- } else {
- None
- },
})
}
@@ -300,10 +250,6 @@ impl Config {
// Use folder at XDG config/name for config storage, return Config if successful
//TODO: fallbacks for flatpak (HOST_XDG_CONFIG_HOME, xdg-desktop settings proxy)
pub fn new_state(name: &str, version: u64) -> Result {
- Self::new_state_inner(name, version, true)
- }
-
- fn new_state_inner(name: &str, version: u64, look_for_previous: bool) -> Result {
// Look for [name]/v[version]
let path = sanitize_name(name)?.join(format!("v{}", version));
@@ -317,47 +263,6 @@ impl Config {
Ok(Self {
system_path: None,
user_path: Some(user_path),
- previous: if version > 1 && look_for_previous {
- Self::new_state_inner(name, version - 1, false)
- .ok()
- .map(Box::new)
- } else {
- None
- },
- })
- }
-
- /// Get data for the given application name and config version.
- /// pub fn new_state(name: &str, version: u64) -> Result {
- pub fn new_data(name: &str, version: u64) -> Result {
- Self::new_data_inner(name, version, true)
- }
-
- pub fn new_data_inner(
- name: &str,
- version: u64,
- look_for_previous: bool,
- ) -> 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),
- previous: if version > 1 && look_for_previous {
- Self::new_data_inner(name, version - 1, false)
- .ok()
- .map(Box::new)
- } else {
- None
- },
})
}
@@ -468,13 +373,7 @@ impl ConfigGet for Config {
Ok(ron::from_str(&data)?)
}
- _ => {
- if let Some(previous) = self.previous.as_ref() {
- previous.get_local(key)
- } else {
- Err(Error::NotFound)
- }
- }
+ _ => Err(Error::NotFound),
}
}
diff --git a/cosmic-config/src/subscription.rs b/cosmic-config/src/subscription.rs
index f0387877..d16b9b65 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 2907441f..7e408d8d 100644
--- a/cosmic-theme/Cargo.toml
+++ b/cosmic-theme/Cargo.toml
@@ -15,14 +15,13 @@ export = ["serde_json"]
no-default = []
[dependencies]
-palette = { workspace = true, features = ["serializing"] }
-hex_color = { version = "3", features = ["serde"] }
+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",
@@ -30,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/color.rs b/cosmic-theme/src/model/color.rs
deleted file mode 100644
index fb4c2202..00000000
--- a/cosmic-theme/src/model/color.rs
+++ /dev/null
@@ -1,173 +0,0 @@
-//! Color representation and serde helpers for the Cosmic theme
-
-use hex_color::HexColor;
-use palette::{Srgb, Srgba};
-use serde::{Deserialize, Serialize};
-
-/// A color in the Cosmic theme for serialization and deserialization
-#[derive(Debug, Copy, Clone, PartialEq, Deserialize, Serialize)]
-#[serde(untagged)]
-pub enum ColorRepr {
- /// A color represented as a hex string
- #[serde(with = "hex_color::rgba")]
- Hex(HexColor),
- /// A color represented as an RGBA value
- Rgba(Srgba),
- /// A color represented as an RGB value
- Rgb(Srgb),
-}
-
-/// An optional color in the Cosmic theme for serialization and deserialization
-#[repr(transparent)]
-#[derive(Debug, Copy, Clone, PartialEq, Deserialize, Serialize)]
-#[serde(transparent)]
-pub struct ColorReprOption(Option);
-
-impl From for ColorRepr {
- fn from(color: Srgb) -> Self {
- let rgb_u8: Srgb = color.into_format();
- ColorRepr::Hex(HexColor {
- r: rgb_u8.red,
- g: rgb_u8.green,
- b: rgb_u8.blue,
- a: 255,
- })
- }
-}
-
-impl From for ColorRepr {
- fn from(color: Srgba) -> Self {
- let rgba_u8: Srgba = color.into_format();
- ColorRepr::Hex(HexColor {
- r: rgba_u8.red,
- g: rgba_u8.green,
- b: rgba_u8.blue,
- a: rgba_u8.alpha,
- })
- }
-}
-
-impl From for Srgb {
- fn from(value: ColorRepr) -> Self {
- match value {
- ColorRepr::Hex(hex) => Srgb::::new(hex.r, hex.g, hex.b).into_format(),
- ColorRepr::Rgb(rgb) => rgb,
- ColorRepr::Rgba(rgba) => Srgb::new(rgba.red, rgba.green, rgba.blue),
- }
- }
-}
-
-impl From for Srgba {
- fn from(value: ColorRepr) -> Self {
- match value {
- ColorRepr::Hex(hex) => Srgba::::new(hex.r, hex.g, hex.b, hex.a).into_format(),
- ColorRepr::Rgb(rgb) => Srgba::new(rgb.red, rgb.green, rgb.blue, 1.0),
- ColorRepr::Rgba(rgba) => rgba,
- }
- }
-}
-
-impl From for Option {
- fn from(value: ColorReprOption) -> Self {
- value.0.map(std::convert::Into::into)
- }
-}
-
-impl From for Option {
- fn from(value: ColorReprOption) -> Self {
- value.0.map(std::convert::Into::into)
- }
-}
-
-impl From> for ColorReprOption {
- fn from(value: Option) -> Self {
- ColorReprOption(value.map(std::convert::Into::into))
- }
-}
-
-impl From> for ColorReprOption {
- fn from(value: Option) -> Self {
- ColorReprOption(value.map(std::convert::Into::into))
- }
-}
-
-/// A trait for converting between a color type and its representation for serialization and deserialization
-pub trait ConvColorRepr: Sized {
- /// Convert from a color representation to the color type
- fn from_repr(repr: ColorRepr) -> Self;
- /// Convert from the color type to its representation for serialization
- fn to_repr(&self) -> ColorRepr;
-}
-
-impl ConvColorRepr for Srgba {
- fn from_repr(repr: ColorRepr) -> Self {
- repr.into()
- }
-
- fn to_repr(&self) -> ColorRepr {
- (*self).into()
- }
-}
-
-impl ConvColorRepr for Srgb {
- fn from_repr(repr: ColorRepr) -> Self {
- repr.into()
- }
-
- fn to_repr(&self) -> ColorRepr {
- (*self).into()
- }
-}
-
-/// Serde helpers for serializing and deserializing colors in the Cosmic theme
-pub mod color_serde {
- use super::*;
- use serde::{Deserialize, Deserializer, Serializer};
-
- /// Serialize a color to a hex string
- pub fn serialize(color: &T, serializer: S) -> Result
- where
- T: ConvColorRepr,
- S: Serializer,
- {
- let repr = color.to_repr();
- repr.serialize(serializer)
- }
-
- /// Deserialize a color from a hex string or RGB/RGBA
- pub fn deserialize<'de, T, D>(deserializer: D) -> Result
- where
- T: ConvColorRepr,
- D: Deserializer<'de>,
- {
- let repr = ColorRepr::deserialize(deserializer)?;
- Ok(T::from_repr(repr))
- }
-
- /// Serde helpers for serializing and deserializing optional colors in the Cosmic theme
- pub mod option {
- use super::*;
-
- /// Serialize an optional color
- pub fn serialize(value: &Option, serializer: S) -> Result
- where
- T: ConvColorRepr,
- S: Serializer,
- {
- match value {
- Some(v) => Some(v.to_repr()).serialize(serializer),
- None => serializer.serialize_none(),
- }
- }
-
- /// Deserialize an optional color
- pub fn deserialize<'de, T, D>(deserializer: D) -> Result, D::Error>
- where
- T: ConvColorRepr,
- D: Deserializer<'de>,
- {
- let opt = Option::::deserialize(deserializer)?;
- Ok(opt.map(T::from_repr))
- }
- }
-}
diff --git a/cosmic-theme/src/model/corner.rs b/cosmic-theme/src/model/corner.rs
index f2fa95ec..ecd18c0b 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/cosmic_palette.rs b/cosmic-theme/src/model/cosmic_palette.rs
index 4360f8f4..3852742b 100644
--- a/cosmic-theme/src/model/cosmic_palette.rs
+++ b/cosmic-theme/src/model/cosmic_palette.rs
@@ -1,4 +1,3 @@
-use crate::color::color_serde;
use palette::Srgba;
use serde::{Deserialize, Serialize};
use std::sync::LazyLock;
@@ -96,107 +95,75 @@ pub struct CosmicPaletteInner {
/// Utility Colors
/// Colors used for various points of emphasis in the UI.
- #[serde(with = "color_serde")]
pub bright_red: Srgba,
/// Colors used for various points of emphasis in the UI.
- #[serde(with = "color_serde")]
pub bright_green: Srgba,
/// Colors used for various points of emphasis in the UI.
- #[serde(with = "color_serde")]
pub bright_orange: Srgba,
/// Surface Grays
/// Colors used for three levels of surfaces in the UI.
- #[serde(with = "color_serde")]
pub gray_1: Srgba,
/// Colors used for three levels of surfaces in the UI.
- #[serde(with = "color_serde")]
pub gray_2: Srgba,
/// System Neutrals
/// A wider spread of dark colors for more general use.
- #[serde(with = "color_serde")]
pub neutral_0: Srgba,
/// A wider spread of dark colors for more general use.
- #[serde(with = "color_serde")]
pub neutral_1: Srgba,
/// A wider spread of dark colors for more general use.
- #[serde(with = "color_serde")]
pub neutral_2: Srgba,
/// A wider spread of dark colors for more general use.
- #[serde(with = "color_serde")]
pub neutral_3: Srgba,
/// A wider spread of dark colors for more general use.
- #[serde(with = "color_serde")]
pub neutral_4: Srgba,
/// A wider spread of dark colors for more general use.
- #[serde(with = "color_serde")]
pub neutral_5: Srgba,
/// A wider spread of dark colors for more general use.
- #[serde(with = "color_serde")]
pub neutral_6: Srgba,
/// A wider spread of dark colors for more general use.
- #[serde(with = "color_serde")]
pub neutral_7: Srgba,
/// A wider spread of dark colors for more general use.
- #[serde(with = "color_serde")]
pub neutral_8: Srgba,
/// A wider spread of dark colors for more general use.
- #[serde(with = "color_serde")]
pub neutral_9: Srgba,
/// A wider spread of dark colors for more general use.
- #[serde(with = "color_serde")]
pub neutral_10: Srgba,
/// Potential Accent Color Combos
- #[serde(with = "color_serde")]
pub accent_blue: Srgba,
/// Potential Accent Color Combos
- #[serde(with = "color_serde")]
pub accent_indigo: Srgba,
/// Potential Accent Color Combos
- #[serde(with = "color_serde")]
pub accent_purple: Srgba,
/// Potential Accent Color Combos
- #[serde(with = "color_serde")]
pub accent_pink: Srgba,
/// Potential Accent Color Combos
- #[serde(with = "color_serde")]
pub accent_red: Srgba,
/// Potential Accent Color Combos
- #[serde(with = "color_serde")]
pub accent_orange: Srgba,
/// Potential Accent Color Combos
- #[serde(with = "color_serde")]
pub accent_yellow: Srgba,
/// Potential Accent Color Combos
- #[serde(with = "color_serde")]
pub accent_green: Srgba,
/// Potential Accent Color Combos
- #[serde(with = "color_serde")]
pub accent_warm_grey: Srgba,
/// Extended Color Palette
/// Colors used for themes, app icons, illustrations, and other brand purposes.
- #[serde(with = "color_serde")]
pub ext_warm_grey: Srgba,
/// Colors used for themes, app icons, illustrations, and other brand purposes.
- #[serde(with = "color_serde")]
pub ext_orange: Srgba,
/// Colors used for themes, app icons, illustrations, and other brand purposes.
- #[serde(with = "color_serde")]
pub ext_yellow: Srgba,
/// Colors used for themes, app icons, illustrations, and other brand purposes.
- #[serde(with = "color_serde")]
pub ext_blue: Srgba,
/// Colors used for themes, app icons, illustrations, and other brand purposes.
- #[serde(with = "color_serde")]
pub ext_purple: Srgba,
/// Colors used for themes, app icons, illustrations, and other brand purposes.
- #[serde(with = "color_serde")]
pub ext_pink: Srgba,
/// Colors used for themes, app icons, illustrations, and other brand purposes.
- #[serde(with = "color_serde")]
pub ext_indigo: Srgba,
}
diff --git a/cosmic-theme/src/model/dark.ron b/cosmic-theme/src/model/dark.ron
index ffec0818..4453b8bf 100644
--- a/cosmic-theme/src/model/dark.ron
+++ b/cosmic-theme/src/model/dark.ron
@@ -1 +1 @@
-Dark((name: "cosmic-dark",bright_red: "#FFA09AFF",bright_green: "#5EDB8CFF",bright_orange: "#FFA37DFF",gray_1: "#1B1B1BFF",gray_2: "#262626FF",neutral_0: "#000000FF",neutral_1: "#030303FF",neutral_2: "#161616FF",neutral_3: "#2E2E2EFF",neutral_4: "#484848FF",neutral_5: "#636363FF",neutral_6: "#808080FF",neutral_7: "#9E9E9EFF",neutral_8: "#BEBEBEFF",neutral_9: "#DEDEDEFF",neutral_10: "#FFFFFFFF",accent_blue: "#63D0DFFF",accent_indigo: "#A1C0EBFF",accent_purple: "#E79CFEFF",accent_pink: "#FF9CB1FF",accent_red: "#FDA1A0FF",accent_orange: "#FFAD00FF",accent_yellow: "#F7E062FF",accent_green: "#92CF9CFF",accent_warm_grey: "#CABAB4FF",ext_warm_grey: "#9B8E8AFF",ext_orange: "#FFAD00FF",ext_yellow: "#FEDB40FF",ext_blue: "#48B9C7FF",ext_purple: "#CF7DFFFF",ext_pink: "#F93A83FF",ext_indigo: "#3E88FFFF",))
+Dark((name:"cosmic-dark",bright_red:(red:1.0,green:0.62745098,blue:0.60392157,alpha:1.0),bright_green:(red:0.36862745,green:0.85882352,blue:0.54901960,alpha:1.0),bright_orange:(red:1.0,green:0.63921569,blue:0.49019608,alpha:1.0),gray_1:(red:0.10588235,green:0.10588235,blue:0.10588235,alpha:1.0),gray_2:(red:0.14901961,green:0.14901961,blue:0.14901961,alpha:1.0),neutral_0:(red:0.0,green:0.0,blue:0.0,alpha:1.0),neutral_1:(red:0.01176471,green:0.01176471,blue:0.01176471,alpha:1.0),neutral_2:(red:0.08627451,green:0.08627451,blue:0.08627451,alpha:1.0),neutral_3:(red:0.18039216,green:0.18039216,blue:0.18039216,alpha:1.0),neutral_4:(red:0.28235294,green:0.28235294,blue:0.28235294,alpha:1.0),neutral_5:(red:0.38823529,green:0.38823529,blue:0.38823529,alpha:1.0),neutral_6:(red:0.50196078,green:0.50196078,blue:0.50196078,alpha:1.0),neutral_7:(red:0.61960784,green:0.61960784,blue:0.61960784,alpha:1.0),neutral_8:(red:0.74509804,green:0.74509804,blue:0.74509804,alpha:1.0),neutral_9:(red:0.87058824,green:0.87058824,blue:0.87058824,alpha:1.0),neutral_10:(red:1.0,green:1.0,blue:1.0,alpha:1.0),accent_blue:(red:0.3882353,green:0.81568627,blue:0.87450981,alpha:1.0),accent_indigo:(red:0.63137255,green:0.75294118,blue:0.92156863,alpha:1.0),accent_purple:(red:0.90588235,green:0.61176471,blue:0.99607843,alpha:1.0),accent_pink:(red:1.0,green:0.61176471,blue:0.69411765,alpha:1.0),accent_red:(red:0.99215686,green:0.63137255,blue:0.62745098,alpha:1.0),accent_orange:(red:1.0,green:0.67843137,blue:0.0,alpha:1.0),accent_yellow:(red:0.96862745,green:0.87843137,blue:0.38431373,alpha:1.0),accent_green:(red:0.57254902,green:0.81176471,blue:0.61176471,alpha:1.0),accent_warm_grey:(red:0.79215686,green:0.72941176,blue:0.70588235,alpha:1.0),ext_warm_grey:(red:0.60784314,green:0.55686275,blue:0.54117647,alpha:1.0),ext_orange:(red:1.0,green:0.67843137,blue:0.0,alpha:1.0),ext_yellow:(red:0.99607843,green:0.85882353,blue:0.25098039,alpha:1.0),ext_blue:(red:0.28235294,green:0.72549020,blue:0.78039216,alpha:1.0),ext_purple:(red:0.81176471,green:0.49019608,blue:1.0,alpha:1.0),ext_pink:(red:0.97647059,green:0.22745098,blue:0.51372549,alpha:1.0),ext_indigo:(red:0.24313725,green:0.53333333,blue:1.0,alpha:1.0)))
diff --git a/cosmic-theme/src/model/density.rs b/cosmic-theme/src/model/density.rs
new file mode 100644
index 00000000..7655361c
--- /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/derivation.rs b/cosmic-theme/src/model/derivation.rs
index 796ddab3..dce653e5 100644
--- a/cosmic-theme/src/model/derivation.rs
+++ b/cosmic-theme/src/model/derivation.rs
@@ -1,4 +1,3 @@
-use crate::color::color_serde;
use palette::{Srgba, WithAlpha};
use serde::{Deserialize, Serialize};
@@ -9,18 +8,14 @@ use crate::composite::over;
#[must_use]
pub struct Container {
/// the color of the container
- #[serde(with = "color_serde")]
pub base: Srgba,
/// the color of components in the container
pub component: Component,
/// the color of dividers in the container
- #[serde(with = "color_serde")]
pub divider: Srgba,
/// the color of text in the container
- #[serde(with = "color_serde")]
pub on: Srgba,
/// the color of @small_widget_container
- #[serde(with = "color_serde")]
pub small_widget: Srgba,
}
@@ -50,42 +45,30 @@ impl Container {
#[must_use]
pub struct Component {
/// The base color of the widget
- #[serde(with = "color_serde")]
pub base: Srgba,
/// The color of the widget when it is hovered
- #[serde(with = "color_serde")]
pub hover: Srgba,
/// the color of the widget when it is pressed
- #[serde(with = "color_serde")]
pub pressed: Srgba,
/// the color of the widget when it is selected
- #[serde(with = "color_serde")]
pub selected: Srgba,
/// the color of the widget when it is selected
- #[serde(with = "color_serde")]
pub selected_text: Srgba,
/// the color of the widget when it is focused
- #[serde(with = "color_serde")]
pub focus: Srgba,
/// the color of dividers for this widget
- #[serde(with = "color_serde")]
pub divider: Srgba,
/// the color of text for this widget
- #[serde(with = "color_serde")]
pub on: Srgba,
// the color of text with opacity 80 for this widget
// pub text_opacity_80: Srgba,
/// the color of the widget when it is disabled
- #[serde(with = "color_serde")]
pub disabled: Srgba,
/// the color of text in the widget when it is disabled
- #[serde(with = "color_serde")]
pub on_disabled: Srgba,
/// the color of the border for the widget
- #[serde(with = "color_serde")]
pub border: Srgba,
/// the color of the border for the widget when it is disabled
- #[serde(with = "color_serde")]
pub disabled_border: Srgba,
}
diff --git a/cosmic-theme/src/model/light.ron b/cosmic-theme/src/model/light.ron
index c9fcc6ce..29b3ad65 100644
--- a/cosmic-theme/src/model/light.ron
+++ b/cosmic-theme/src/model/light.ron
@@ -1 +1 @@
-Light((name: "cosmic-light",bright_red: "#890418FF",bright_green: "#00572CFF",bright_orange: "#792C00FF",gray_1: "#D7D7D7FF",gray_2: "#E4E4E4FF",neutral_0: "#FFFFFFFF",neutral_1: "#DEDEDEFF",neutral_2: "#BEBEBEFF",neutral_3: "#9E9E9EFF",neutral_4: "#808080FF",neutral_5: "#636363FF",neutral_6: "#484848FF",neutral_7: "#2E2E2EFF",neutral_8: "#161616FF",neutral_9: "#030303FF",neutral_10: "#000000FF",accent_blue: "#00525AFF",accent_indigo: "#2E496DFF",accent_purple: "#68217CFF",accent_pink: "#86043AFF",accent_red: "#78292EFF",accent_orange: "#624000FF",accent_yellow: "#534800FF",accent_green: "#185529FF",accent_warm_grey: "#554742FF",ext_warm_grey: "#9B8E8AFF",ext_orange: "#FBB86CFF",ext_yellow: "#F7E062FF",ext_blue: "#6ACAD8FF",ext_purple: "#D58CFFFF",ext_pink: "#FF9CDDFF",ext_indigo: "#95C4FCFF",))
+Light((name:"cosmic-light",bright_red:(red:0.53725490,green:0.01568627,blue:0.09411765,alpha:1.0),bright_green:(red:0.0,green:0.34117647,blue:0.17254901,alpha:1.0),bright_orange:(red:0.47450980,green:0.17254902,blue:0.0,alpha:1.0),gray_1:(red:0.84313725,green:0.84313725,blue:0.84313725,alpha:1.0),gray_2:(red:0.89411765,green:0.89411765,blue:0.89411765,alpha:1.0),neutral_0:(red:1.0,green:1.0,blue:1.0,alpha:1.0),neutral_1:(red:0.87058824,green:0.87058824,blue:0.87058824,alpha:1.0),neutral_2:(red:0.74509804,green:0.74509804,blue:0.74509804,alpha:1.0),neutral_3:(red:0.61960784,green:0.61960784,blue:0.61960784,alpha:1.0),neutral_4:(red:0.50196078,green:0.50196078,blue:0.50196078,alpha:1.0),neutral_5:(red:0.38823529,green:0.38823529,blue:0.38823529,alpha:1.0),neutral_6:(red:0.28235294,green:0.28235294,blue:0.28235294,alpha:1.0),neutral_7:(red:0.18039216,green:0.18039216,blue:0.18039216,alpha:1.0),neutral_8:(red:0.08627451,green:0.08627451,blue:0.08627451,alpha:1.0),neutral_9:(red:0.01176471,green:0.01176471,blue:0.01176471,alpha:1.0),neutral_10:(red:0.0,green:0.0,blue:0.0,alpha:1.0),accent_blue:(red:0.0,green:0.32156863,blue:0.35294118,alpha:1.0),accent_indigo:(red:0.18039216,green:0.28627451,blue:0.42745098,alpha:1.0),accent_purple:(red:0.40784314,green:0.12941176,blue:0.48627451,alpha:1.0),accent_pink:(red:0.52549020,green:0.01568627,blue:0.22745098,alpha:1.0),accent_red:(red:0.47058824,green:0.16078431,blue:0.18039216,alpha:1.0),accent_orange:(red:0.38431373,green:0.25098039,blue:0.0,alpha:1.0),accent_yellow:(red:0.32549020,green:0.28235294,blue:0.0,alpha:1.0),accent_green:(red:0.09411765,green:0.33333333,blue:0.16078431,alpha:1.0),accent_warm_grey:(red:0.33333333,green:0.27843137,blue:0.25882353,alpha:1.0),ext_warm_grey:(red:0.60784314,green:0.55686275,blue:0.54117647,alpha:1.0),ext_orange:(red:0.98431373,green:0.72156863,blue:0.42352941,alpha:1.0),ext_yellow:(red:0.96862745,green:0.87843137,blue:0.38431373,alpha:1.0),ext_blue:(red:0.41568627,green:0.79215686,blue:0.84705882,alpha:1.0),ext_purple:(red:0.83529412,green:0.54901961,blue:1.0,alpha:1.0),ext_pink:(red:1.0,green:0.61176471,blue:0.86666667,alpha:1.0),ext_indigo:(red:0.58431373,green:0.76862745,blue:0.98823529,alpha:1.0)))
diff --git a/cosmic-theme/src/model/mod.rs b/cosmic-theme/src/model/mod.rs
index a7ac613f..f48d1a8d 100644
--- a/cosmic-theme/src/model/mod.rs
+++ b/cosmic-theme/src/model/mod.rs
@@ -1,13 +1,14 @@
pub use corner::*;
pub use cosmic_palette::*;
+pub use density::*;
pub use derivation::*;
pub use mode::*;
pub use spacing::*;
pub use theme::*;
-pub mod color;
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 f02cf510..93b1bf43 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 6fce9b89..5db0f32c 100644
--- a/cosmic-theme/src/model/theme.rs
+++ b/cosmic-theme/src/model/theme.rs
@@ -1,15 +1,13 @@
-use crate::color::color_serde::option as color_serde_option;
-use crate::color::{ColorRepr, ColorReprOption, color_serde};
-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;
@@ -47,24 +45,16 @@ pub enum Layer {
PartialEq,
cosmic_config::cosmic_config_derive::CosmicConfigEntry,
)]
-#[version = 2]
+#[version = 1]
pub struct Theme {
/// name of the theme
pub name: String,
/// background element colors
- pub(crate) background: Container,
+ pub background: Container,
/// primary element colors
- pub(crate) primary: Container,
+ pub primary: Container,
/// secondary element colors
- pub(crate) secondary: Container,
- /// background element colors
- pub(crate) transparent_background: Container,
- /// primary element colors
- pub(crate) transparent_primary: Container,
- /// secondary element colors
- pub(crate) transparent_secondary: Container,
- /// button component styling
- pub button: Component,
+ pub secondary: Container,
/// accent element colors
pub accent: Component,
/// suggested element colors
@@ -85,10 +75,10 @@ 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
+ pub button: Component,
/// palette
pub palette: CosmicPaletteInner,
/// spacing
@@ -105,43 +95,16 @@ pub struct Theme {
pub active_hint: u32,
/// cosmic-comp custom window hint color
pub window_hint: Option,
- #[serde(default)]
/// enables blurred transparency
- pub frosted: BlurStrength,
- #[serde(default)]
- /// frosted windows
- pub frosted_windows: bool,
- #[serde(default)]
- /// frosted system interface
- pub frosted_system_interface: bool,
- #[serde(default)]
- /// frosted panel
- pub frosted_panel: bool,
- #[serde(default)]
- /// frosted applet popups
- pub frosted_applets: bool,
- #[serde(default)]
- /// frosted apps when maximized
- pub frosted_maximized_apps: bool,
- #[serde(default)]
- /// alpha map
- pub alpha_map: AlphaMap,
+ pub is_frosted: bool,
/// shade color for dialogs
- #[serde(with = "color_serde")]
- #[cosmic_config_entry(with = ColorRepr)]
pub shade: Srgba,
/// accent text colors
/// If None, accent base color is the accent text color.
- #[serde(with = "color_serde_option")]
- #[cosmic_config_entry(with = ColorReprOption)]
pub accent_text: Option,
/// control tint color
- #[serde(with = "color_serde_option")]
- #[cosmic_config_entry(with = ColorReprOption)]
pub control_tint: Option,
/// text tint color
- #[serde(with = "color_serde_option")]
- #[cosmic_config_entry(with = ColorReprOption)]
pub text_tint: Option,
}
@@ -207,39 +170,6 @@ impl Theme {
todo!();
}
- #[allow(clippy::doc_markdown)]
- #[inline]
- /// get opaque or transparent background based on whether blur is active
- pub fn background(&self, transparent: bool) -> &Container {
- if transparent {
- &self.transparent_background
- } else {
- &self.background
- }
- }
-
- #[allow(clippy::doc_markdown)]
- #[inline]
- /// get opaque or transparent primary based on whether blur is active
- pub fn primary(&self, transparent: bool) -> &Container {
- if transparent {
- &self.transparent_primary
- } else {
- &self.primary
- }
- }
-
- #[allow(clippy::doc_markdown)]
- #[inline]
- /// get opaque or transparent secondary based on whether blur is active
- pub fn secondary(&self, transparent: bool) -> &Container {
- if transparent {
- &self.transparent_secondary
- } else {
- &self.secondary
- }
- }
-
#[must_use]
#[allow(clippy::doc_markdown)]
#[inline]
@@ -809,7 +739,7 @@ impl Theme {
if color_scheme.trim().contains("default") || color_scheme.trim().contains("light") {
return Self::light_default();
}
- }
+ };
Self::dark_default()
}
@@ -818,10 +748,10 @@ impl Theme {
pub fn preferred_theme() -> Self {
let current_desktop = std::env::var("XDG_CURRENT_DESKTOP");
- if let Ok(desktop) = current_desktop
- && desktop.trim().to_lowercase().contains("gnome")
- {
- return Self::gtk_prefer_colorscheme();
+ if let Ok(desktop) = current_desktop {
+ if desktop.trim().to_lowercase().contains("gnome") {
+ return Self::gtk_prefer_colorscheme();
+ }
}
Self::dark_default()
@@ -844,7 +774,7 @@ impl From for Theme {
cosmic_config::cosmic_config_derive::CosmicConfigEntry,
PartialEq,
)]
-#[version = 2]
+#[version = 1]
pub struct ThemeBuilder {
/// override the palette for the builder
pub palette: CosmicPalette,
@@ -853,70 +783,31 @@ pub struct ThemeBuilder {
/// override corner radii for the builder
pub corner_radii: CornerRadii,
/// override neutral_tint for the builder
- #[serde(with = "color_serde_option")]
- #[cosmic_config_entry(with = ColorReprOption)]
pub neutral_tint: Option,
/// override bg_color for the builder
- #[serde(with = "color_serde_option")]
- #[cosmic_config_entry(with = ColorReprOption)]
pub bg_color: Option,
/// override the primary container bg color for the builder
- #[serde(with = "color_serde_option")]
- #[cosmic_config_entry(with = ColorReprOption)]
pub primary_container_bg: Option,
/// override the secontary container bg color for the builder
- #[serde(with = "color_serde_option")]
- #[cosmic_config_entry(with = ColorReprOption)]
pub secondary_container_bg: Option,
/// override the text tint for the builder
- #[serde(with = "color_serde_option")]
- #[cosmic_config_entry(with = ColorReprOption)]
pub text_tint: Option,
/// override the accent color for the builder
- #[serde(with = "color_serde_option")]
- #[cosmic_config_entry(with = ColorReprOption)]
pub accent: Option,
/// override the success color for the builder
- #[serde(with = "color_serde_option")]
- #[cosmic_config_entry(with = ColorReprOption)]
pub success: Option,
/// override the warning color for the builder
- #[serde(with = "color_serde_option")]
- #[cosmic_config_entry(with = ColorReprOption)]
pub warning: Option,
/// override the destructive color for the builder
- #[serde(with = "color_serde_option")]
- #[cosmic_config_entry(with = ColorReprOption)]
pub destructive: Option,
- #[serde(default)]
/// enabled blurred transparency
- pub frosted: BlurStrength,
+ pub is_frosted: bool, // TODO handle
/// cosmic-comp window gaps size (outer, inner)
pub gaps: (u32, u32),
/// cosmic-comp active hint window outline width
pub active_hint: u32,
/// cosmic-comp custom window hint color
- #[serde(with = "color_serde_option")]
- #[cosmic_config_entry(with = ColorReprOption)]
pub window_hint: Option,
- #[serde(default)]
- /// frosted windows
- pub frosted_windows: bool,
- #[serde(default)]
- /// frosted system interface
- pub frosted_system_interface: bool,
- #[serde(default)]
- /// frosted panel
- pub frosted_panel: bool,
- #[serde(default)]
- /// frosted applet popups
- pub frosted_applets: bool,
- #[serde(default)]
- /// frosted apps when maximized
- pub frosted_maximized_apps: bool,
- #[serde(default)]
- /// alpha map
- pub alpha_map: AlphaMap,
}
impl Default for ThemeBuilder {
@@ -934,17 +825,11 @@ impl Default for ThemeBuilder {
success: Default::default(),
warning: Default::default(),
destructive: Default::default(),
- frosted: BlurStrength::default(),
+ is_frosted: false,
// cosmic-comp theme settings
gaps: (0, 8),
active_hint: 3,
window_hint: None,
- frosted_windows: false,
- frosted_system_interface: false,
- frosted_panel: false,
- frosted_applets: false,
- frosted_maximized_apps: false,
- alpha_map: AlphaMap::default(),
}
}
}
@@ -1068,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 {
@@ -1092,23 +971,9 @@ impl ThemeBuilder {
gaps,
active_hint,
window_hint,
- frosted,
- frosted_windows,
- frosted_system_interface,
- frosted_panel,
- frosted_applets,
- frosted_maximized_apps,
- alpha_map,
+ is_frosted,
} = self;
- let container_alpha = alpha_map.blurred_alpha(frosted);
- let actual_alpha =
- if (frosted_windows || frosted_system_interface || frosted_panel || frosted_applets) {
- container_alpha
- } else {
- 1.0
- };
-
let is_dark = palette.is_dark();
let is_high_contrast = palette.is_high_contrast();
@@ -1163,10 +1028,6 @@ impl ThemeBuilder {
let step_array = steps(bg, NonZeroUsize::new(100).unwrap());
let bg_index = color_index(bg, step_array.len());
- let mut transparent_bg = bg;
- transparent_bg.alpha = container_alpha;
- let transparent_bg_steps_array = steps(transparent_bg, NonZeroUsize::new(100).unwrap());
-
let mut component_hovered_overlay = if bg_index < 91 {
control_steps_array[10]
} else {
@@ -1191,26 +1052,10 @@ impl ThemeBuilder {
&step_array,
&control_steps_array[8],
text_steps_array.as_deref(),
- actual_alpha,
- );
-
- let transparent_bg_component = get_surface_color(
- bg_index,
- 8,
- &transparent_bg_steps_array,
- is_dark,
- &p_ref.neutral_2,
- );
- let on_transparent_bg_component = get_text(
- color_index(transparent_bg_component, transparent_bg_steps_array.len()),
- &step_array,
- &control_steps_array[8],
- text_steps_array.as_deref(),
- actual_alpha,
);
let primary = {
- let mut container_bg = if let Some(primary_container_bg_color) = primary_container_bg {
+ let container_bg = if let Some(primary_container_bg_color) = primary_container_bg {
primary_container_bg_color
} else {
get_surface_color(bg_index, 5, &step_array, is_dark, &control_steps_array[1])
@@ -1240,7 +1085,6 @@ impl ThemeBuilder {
&step_array,
&control_steps_array[8],
text_steps_array.as_deref(),
- container_alpha,
),
component_hovered_overlay,
component_pressed_overlay,
@@ -1253,53 +1097,6 @@ impl ThemeBuilder {
&step_array,
&control_steps_array[8],
text_steps_array.as_deref(),
- container_alpha,
- ),
- get_small_widget_color(base_index, 5, &neutral_steps, &control_steps_array[6]),
- is_high_contrast,
- )
- };
- let transparent_primary = {
- let mut container_bg = if let Some(primary_container_bg_color) = primary_container_bg {
- primary_container_bg_color
- } else {
- get_surface_color(bg_index, 5, &step_array, is_dark, &control_steps_array[1])
- };
- container_bg.alpha = (container_alpha + if is_dark { 0.3 } else { 0.25 }).min(1.0);
-
- let t_step_array = steps(container_bg, NonZeroUsize::new(100).unwrap());
- let base_index: usize = color_index(container_bg, t_step_array.len());
- let component_base = get_surface_color(
- base_index,
- 6,
- &t_step_array,
- is_dark,
- &control_steps_array[3],
- );
-
- Container::new(
- Component::component(
- component_base,
- accent,
- get_text(
- color_index(component_base, t_step_array.len()),
- &step_array,
- &control_steps_array[8],
- text_steps_array.as_deref(),
- actual_alpha,
- ),
- Srgba::new(0., 0., 0., 0.0),
- Srgba::new(0., 0., 0., 0.0),
- is_high_contrast,
- control_steps_array[8],
- ),
- container_bg,
- get_text(
- base_index,
- &step_array,
- &control_steps_array[8],
- text_steps_array.as_deref(),
- actual_alpha,
),
get_small_widget_color(base_index, 5, &neutral_steps, &control_steps_array[6]),
is_high_contrast,
@@ -1373,7 +1170,6 @@ impl ThemeBuilder {
&step_array,
&control_steps_array[8],
text_steps_array.as_deref(),
- actual_alpha,
),
get_small_widget_color(bg_index, 5, &neutral_steps, &control_steps_array[6]),
is_high_contrast,
@@ -1386,15 +1182,10 @@ impl ThemeBuilder {
get_surface_color(bg_index, 10, &step_array, is_dark, &control_steps_array[2])
};
- let t_step_array = steps(container_bg, NonZeroUsize::new(100).unwrap());
- let base_index = color_index(container_bg, t_step_array.len());
- let secondary_component = get_surface_color(
- base_index,
- 3,
- &t_step_array,
- is_dark,
- &control_steps_array[4],
- );
+ let step_array = steps(container_bg, NonZeroUsize::new(100).unwrap());
+ let base_index = color_index(container_bg, step_array.len());
+ let secondary_component =
+ get_surface_color(base_index, 3, &step_array, is_dark, &control_steps_array[4]);
component_hovered_overlay = if base_index < 91 {
control_steps_array[10]
@@ -1411,11 +1202,10 @@ impl ThemeBuilder {
secondary_component,
accent,
get_text(
- color_index(secondary_component, t_step_array.len()),
+ color_index(secondary_component, step_array.len()),
&step_array,
&control_steps_array[8],
text_steps_array.as_deref(),
- actual_alpha,
),
component_hovered_overlay,
component_pressed_overlay,
@@ -1428,7 +1218,6 @@ impl ThemeBuilder {
&step_array,
&control_steps_array[8],
text_steps_array.as_deref(),
- actual_alpha,
),
get_small_widget_color(base_index, 5, &neutral_steps, &control_steps_array[6]),
is_high_contrast,
@@ -1441,24 +1230,14 @@ impl ThemeBuilder {
button_hovered_overlay,
button_pressed_overlay,
),
- accent_button: {
- let step_array = steps(control_steps_array[5], NonZeroUsize::new(100).unwrap());
-
- Component::colored_button(
- accent,
- control_steps_array[1],
- get_text(
- color_index(accent, step_array.len()),
- &step_array,
- &step_array[0],
- text_steps_array.as_deref(),
- 1., // accent is opaque anyway
- ),
- accent,
- button_hovered_overlay,
- button_pressed_overlay,
- )
- },
+ accent_button: Component::colored_button(
+ accent,
+ control_steps_array[1],
+ control_steps_array[0],
+ accent,
+ button_hovered_overlay,
+ button_pressed_overlay,
+ ),
button: Component::component(
button_bg,
accent,
@@ -1506,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],
@@ -1562,80 +1332,10 @@ impl ThemeBuilder {
gaps,
active_hint,
window_hint,
- frosted,
+ is_frosted,
accent_text,
control_tint: neutral_tint,
text_tint,
- frosted_windows,
- frosted_system_interface,
- frosted_panel,
- frosted_applets,
- frosted_maximized_apps,
- alpha_map,
- transparent_background: Container::new(
- Component::component(
- transparent_bg_component,
- accent,
- on_transparent_bg_component,
- component_hovered_overlay,
- component_pressed_overlay,
- is_high_contrast,
- control_steps_array[8],
- ),
- transparent_bg,
- get_text(
- bg_index,
- &step_array,
- &control_steps_array[8],
- text_steps_array.as_deref(),
- actual_alpha,
- ),
- get_small_widget_color(bg_index, 5, &neutral_steps, &control_steps_array[6]),
- is_high_contrast,
- ),
- transparent_primary,
- transparent_secondary: {
- let mut container_bg = if let Some(secondary_container_bg) = secondary_container_bg
- {
- secondary_container_bg
- } else {
- get_surface_color(bg_index, 10, &step_array, is_dark, &control_steps_array[2])
- };
- container_bg.alpha = (container_alpha + if is_dark { 0.6 } else { 0.5 }).min(1.0);
-
- let step_array = steps(container_bg, NonZeroUsize::new(100).unwrap());
- let base_index = color_index(container_bg, step_array.len());
- let secondary_component =
- get_surface_color(base_index, 3, &step_array, is_dark, &control_steps_array[4]);
-
- Container::new(
- Component::component(
- secondary_component,
- accent,
- get_text(
- color_index(secondary_component, step_array.len()),
- &step_array,
- &control_steps_array[8],
- text_steps_array.as_deref(),
- actual_alpha,
- ),
- component_hovered_overlay,
- component_pressed_overlay,
- is_high_contrast,
- control_steps_array[8],
- ),
- container_bg,
- get_text(
- base_index,
- &step_array,
- &control_steps_array[8],
- text_steps_array.as_deref(),
- actual_alpha,
- ),
- get_small_widget_color(base_index, 5, &neutral_steps, &control_steps_array[6]),
- is_high_contrast,
- )
- },
};
theme.spacing = spacing;
theme.corner_radii = corner_radii;
@@ -1654,181 +1354,3 @@ impl ThemeBuilder {
Config::new(LIGHT_THEME_BUILDER_ID, Self::VERSION)
}
}
-
-/// Actual blur radius is decided by cosmic-comp,
-/// but this represents the strength of the blur effect.
-#[allow(missing_docs)]
-#[repr(u8)]
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq)]
-pub enum BlurStrength {
- ExtremelyLow,
- ExtremelyLow2,
- VeryLow,
- VeryLow2,
- Low,
- Low2,
- Medium,
- Medium2,
- High,
- High2,
- VeryHigh,
- VeryHigh2,
- ExtremelyHigh,
- ExtremelyHigh2,
-}
-
-impl Default for BlurStrength {
- fn default() -> Self {
- Self::Medium
- }
-}
-
-impl TryFrom for BlurStrength {
- type Error = ();
-
- fn try_from(value: u8) -> Result {
- match value {
- 0 => Ok(BlurStrength::ExtremelyLow),
- 1 => Ok(BlurStrength::ExtremelyLow2),
- 2 => Ok(BlurStrength::VeryLow),
- 3 => Ok(BlurStrength::VeryLow2),
- 4 => Ok(BlurStrength::Low),
- 5 => Ok(BlurStrength::Low2),
- 6 => Ok(BlurStrength::Medium),
- 7 => Ok(BlurStrength::Medium2),
- 8 => Ok(BlurStrength::High),
- 9 => Ok(BlurStrength::High2),
- 10 => Ok(BlurStrength::VeryHigh),
- 11 => Ok(BlurStrength::VeryHigh2),
- 12 => Ok(BlurStrength::ExtremelyHigh),
- 13 => Ok(BlurStrength::ExtremelyHigh2),
- _ => Err(()),
- }
- }
-}
-
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq)]
-pub struct AlphaMap {
- pub extremely_low: f32,
- pub extremely_low_2: f32,
- pub very_low: f32,
- pub very_low_2: f32,
- pub low: f32,
- pub low_2: f32,
- pub medium: f32,
- pub medium_2: f32,
- pub high: f32,
- pub high_2: f32,
- pub very_high: f32,
- pub very_high_2: f32,
- pub extremely_high: f32,
- pub extremely_high_2: f32,
-}
-
-impl AlphaMap {
- pub fn blurred_alpha(&self, blur: BlurStrength) -> f32 {
- match blur {
- BlurStrength::ExtremelyLow => self.extremely_low,
- BlurStrength::ExtremelyLow2 => self.extremely_low_2,
- BlurStrength::VeryLow => self.very_low,
- BlurStrength::VeryLow2 => self.very_low_2,
- BlurStrength::Low => self.low,
- BlurStrength::Low2 => self.low_2,
- BlurStrength::Medium => self.medium,
- BlurStrength::Medium2 => self.medium_2,
- BlurStrength::High => self.high,
- BlurStrength::High2 => self.high_2,
- BlurStrength::VeryHigh => self.very_high,
- BlurStrength::VeryHigh2 => self.very_high_2,
- BlurStrength::ExtremelyHigh => self.extremely_high,
- BlurStrength::ExtremelyHigh2 => self.extremely_high_2,
- }
- }
-
- pub fn offset(self, offset: f32) -> Self {
- let Self {
- mut extremely_low,
- mut extremely_low_2,
- mut very_low,
- mut very_low_2,
- mut low,
- mut low_2,
- mut medium,
- mut medium_2,
- mut high,
- mut high_2,
- mut very_high,
- mut very_high_2,
- mut extremely_high,
- mut extremely_high_2,
- } = self;
- extremely_low += offset;
- extremely_low_2 += offset;
- very_low += offset;
- very_low_2 += offset;
- low += offset;
- low_2 += offset;
- medium += offset;
- medium_2 += offset;
- high += offset;
- high_2 += offset;
- very_high += offset;
- very_high_2 += offset;
- extremely_high += offset;
- extremely_high_2 += offset;
- Self {
- extremely_low,
- extremely_low_2,
- very_low,
- very_low_2,
- low,
- low_2,
- medium,
- medium_2,
- high,
- high_2,
- very_high,
- very_high_2,
- extremely_high,
- extremely_high_2,
- }
- }
-
- pub fn guess_offset(&self) -> f32 {
- let Self {
- extremely_low,
- extremely_high_2,
- ..
- } = self;
- let default_low = Self::default().extremely_low;
- let default_high = Self::default().extremely_high_2;
- if *extremely_low > default_low {
- 0.5 * (*extremely_low - default_low) / (1.0 - default_low) + 0.5
- } else if *extremely_high_2 < default_high {
- 0.5 - (0.5 * (default_high - *extremely_high_2) / default_high)
- } else {
- 0.5
- }
- }
-}
-
-impl Default for AlphaMap {
- fn default() -> Self {
- Self {
- extremely_low: 0.90,
- extremely_low_2: 0.87692,
- very_low: 0.85385,
- very_low_2: 0.83076,
- low: 0.80769,
- low_2: 0.78461,
- medium: 0.76154,
- medium_2: 0.73846,
- high: 0.71538,
- high_2: 0.69231,
- very_high: 0.66023,
- very_high_2: 0.64615,
- extremely_high: 0.62308,
- extremely_high_2: 0.6,
- }
- }
-}
diff --git a/cosmic-theme/src/output/gtk4_output.rs b/cosmic-theme/src/output/gtk4_output.rs
index bbb4f246..40eba5b4 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 93824111..19f7bc5b 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;
@@ -34,8 +33,10 @@ impl Theme {
/// Apply COSMIC theme exports for GTK and Qt applications.
pub fn apply_exports(&self) -> Result<(), OutputError> {
let gtk_res = Theme::apply_gtk(self.is_dark);
+ let qt_res = Theme::apply_qt(self.is_dark);
let qt56ct_res = Theme::apply_qt56ct(self.is_dark);
gtk_res?;
+ qt_res?;
qt56ct_res?;
Ok(())
}
@@ -44,8 +45,10 @@ impl Theme {
/// Write COSMIC theme exports for GTK and Qt applications.
pub fn write_exports(&self) -> Result<(), OutputError> {
let gtk_res = self.write_gtk4();
+ let qt_res = self.write_qt();
let qt56ct_res = self.write_qt56ct();
gtk_res?;
+ qt_res?;
qt56ct_res?;
Ok(())
}
diff --git a/cosmic-theme/src/output/qt56ct_output.rs b/cosmic-theme/src/output/qt56ct_output.rs
index 16df211f..43a45470 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 92dfad9f..d42d553b 100644
--- a/cosmic-theme/src/output/qt_output.rs
+++ b/cosmic-theme/src/output/qt_output.rs
@@ -1,21 +1,281 @@
use crate::Theme;
use configparser::ini::Ini;
-use std::path::PathBuf;
-use std::{fs, io};
+use cosmic_config::CosmicConfigEntry;
+use palette::{Mix, Srgba, blend::Compose};
+use std::{
+ fs::{self, File},
+ io::{self, Write},
+ path::{Path, PathBuf},
+};
-use super::OutputError;
+use super::{OutputError, qt_settings_ini_style};
impl Theme {
- /// Reset the applied qt colors:
- /// - Remove relevant keys from the `~/.config/kdeglobals` file
- /// - Delete `~/.local/share/color-schemes/CosmicDark.colors` and `CosmicLight.colors`
+ /// Produces a color scheme ini file for Qt.
+ ///
+ /// Some high-level documentation for this file can be found at:
+ /// - https://api.kde.org/kcolorscheme.html
+ /// - https://web.archive.org/web/20250402234329/https://docs.kde.org/stable5/en/plasma-workspace/kcontrol/colors/
+ #[must_use]
+ #[cold]
+ pub fn as_kcolorscheme(&self) -> String {
+ // Usually, disabled elements will have strongly reduced contrast and are often notably darker or lighter
+ let disabled_color_effects = IniColorEffects {
+ color: self.button.disabled,
+ color_amount: 0.0,
+ color_effect: ColorEffect::Desaturate,
+ contrast_amount: 0.65,
+ contrast_effect: ColorEffect::Fade,
+ intensity_amount: 0.1,
+ intensity_effect: IntensityEffect::Lighten,
+ };
+ // Usually, inactive elements will have reduced contrast (text fades slightly into the background) and may have slightly reduced intensity
+ let inactive_color_effects = IniColorEffects {
+ color: self.palette.gray_1,
+ color_amount: 0.025,
+ color_effect: ColorEffect::Tint,
+ contrast_amount: 0.1,
+ contrast_effect: ColorEffect::Tint,
+ intensity_amount: 0.0,
+ intensity_effect: IntensityEffect::Shade,
+ };
+
+ let bg = self.background.base;
+ // the background container
+ let window_colors = IniColors {
+ background_alternate: bg.mix(self.accent.base, 0.05),
+ background_normal: bg,
+ decoration_focus: self.accent_text_color(),
+ decoration_hover: self.accent_text_color(),
+ foreground_active: self.accent_text_color(),
+ foreground_inactive: self.background.on.mix(bg, 0.1),
+ foreground_link: self.link_button.on,
+ foreground_negative: self.destructive_text_color(),
+ foreground_neutral: self.warning_text_color(),
+ foreground_normal: self.background.on,
+ foreground_positive: self.success_text_color(),
+ foreground_visited: self.accent_text_color(),
+ };
+ // components inside the background container
+ let view_colors = IniColors {
+ background_alternate: self.background.component.base.mix(self.accent.base, 0.05),
+ background_normal: self.background.component.base,
+ ..window_colors
+ };
+
+ // selected text and items
+ let selection_colors = {
+ // selection colors are swapped to fix menu bar contrast
+ let selected = self.background.component.selected_text;
+ let selected_text = self.background.component.selected;
+ IniColors {
+ background_alternate: selected.mix(bg, 0.5),
+ background_normal: selected,
+ decoration_focus: selected,
+ decoration_hover: selected,
+ foreground_active: selected_text,
+ foreground_inactive: selected_text.mix(selected, 0.5),
+ foreground_link: self.link_button.base,
+ foreground_negative: self.destructive_color(),
+ foreground_neutral: self.warning_color(),
+ foreground_normal: selected_text,
+ foreground_positive: self.success_color(),
+ foreground_visited: self.accent_color(),
+ }
+ };
+
+ let button_colors = IniColors {
+ background_alternate: self.accent_button.base,
+ background_normal: self.button.base,
+ ..view_colors
+ };
+
+ // Complementary: Areas of applications with an alternative color scheme; usually with a dark background for light color schemes.
+ let complementary_colors = {
+ let dark = if self.is_dark {
+ self.clone()
+ } else if cfg!(test) {
+ // For reproducible results in tests, use the default dark theme
+ Theme::dark_default()
+ } else {
+ Theme::dark_config()
+ .ok()
+ .as_ref()
+ .and_then(|conf| Theme::get_entry(conf).ok())
+ .unwrap_or_else(|| self.clone())
+ };
+ IniColors {
+ background_alternate: dark.accent.base,
+ background_normal: dark.background.base,
+ decoration_focus: dark.accent_text_color(),
+ decoration_hover: dark.accent_text_color(),
+ foreground_active: dark.accent_text_color(),
+ foreground_inactive: dark.background.on.mix(dark.background.base, 0.1),
+ foreground_link: dark.link_button.on,
+ foreground_negative: dark.destructive_text_color(),
+ foreground_neutral: dark.warning_text_color(),
+ foreground_normal: dark.background.on,
+ foreground_positive: dark.success_text_color(),
+ foreground_visited: dark.accent_text_color(),
+ }
+ };
+
+ // headers in cosmic don't have a background
+ let header_colors = &window_colors;
+ let header_colors_inactive = &window_colors;
+ // tool tips, "What's This" tips, and similar elements
+ let tooltip_colors = &view_colors;
+
+ let general_color_scheme = if self.is_dark {
+ "CosmicDark"
+ } else {
+ "CosmicLight"
+ };
+ let general_name = if self.is_dark {
+ "COSMIC Dark"
+ } else {
+ "COSMIC Light"
+ };
+ // COSMIC icons are stuck in light mode, so use breeze icons instead
+ let icons_theme = if self.is_dark {
+ "breeze-dark"
+ } else {
+ "breeze"
+ };
+
+ format!(
+ r#"# GENERATED BY COSMIC
+
+[ColorEffects:Disabled]
+{}
+
+[ColorEffects:Inactive]
+ChangeSelectionColor=false
+Enable=false
+{}
+
+[Colors:Button]
+{}
+
+[Colors:Complementary]
+{}
+
+[Colors:Header]
+{}
+
+[Colors:Header][Inactive]
+{}
+
+[Colors:Selection]
+{}
+
+[Colors:Tooltip]
+{}
+
+[Colors:View]
+{}
+
+[Colors:Window]
+{}
+
+[General]
+ColorScheme={general_color_scheme}
+Name={general_name}
+shadeSortColumn=true
+
+[Icons]
+Theme={icons_theme}
+
+[KDE]
+contrast=4
+widgetStyle=qt6ct-style
+
+[WM]
+{}
+"#,
+ format_ini_color_effects(&disabled_color_effects, bg),
+ format_ini_color_effects(&inactive_color_effects, bg),
+ format_ini_colors(&button_colors, bg),
+ format_ini_colors(&complementary_colors, bg),
+ format_ini_colors(&header_colors, bg),
+ format_ini_colors(&header_colors_inactive, bg),
+ format_ini_colors(&selection_colors, bg),
+ format_ini_colors(&tooltip_colors, bg),
+ format_ini_colors(&view_colors, bg),
+ format_ini_colors(&window_colors, bg),
+ format_ini_wm_colors(&window_colors, self.is_dark),
+ )
+ }
+
+ /// Write the color scheme to the appropriate directory.
+ /// Should be written in `~/.local/share/color-schemes/`.
+ ///
+ /// See the docs: https://develop.kde.org/docs/plasma/#color-scheme
+ ///
+ /// # Errors
+ ///
+ /// Returns an `OutputError` if there is an error writing the colors file.
+ #[cold]
+ pub fn write_qt(&self) -> Result<(), OutputError> {
+ let kcolorscheme = self.as_kcolorscheme();
+ let file_path = Self::get_kcolorscheme_path(self.is_dark)?;
+ let tmp_file_path = file_path.with_extension("colors.new");
+
+ // Write to tmp_file_path first, then move it to file_path
+ let mut tmp_file = File::create(&tmp_file_path).map_err(OutputError::Io)?;
+ let res = tmp_file
+ .write_all(kcolorscheme.as_bytes())
+ .and_then(|_| tmp_file.flush())
+ .and_then(|_| std::fs::rename(&tmp_file_path, file_path));
+ if let Err(e) = res {
+ _ = std::fs::remove_file(&tmp_file_path);
+ return Err(OutputError::Io(e));
+ }
+
+ Ok(())
+ }
+
+ /// Apply the color scheme by copying its values to `~/.config/kdeglobals`.
+ ///
+ /// See the docs: https://develop.kde.org/docs/plasma/#color-scheme
+ ///
+ /// # Errors
+ ///
+ /// Returns an `OutputError` if there is an error applying the color scheme.
+ #[cold]
+ pub fn apply_qt(is_dark: bool) -> Result<(), OutputError> {
+ let Some(config_dir) = dirs::config_dir() else {
+ return Err(OutputError::MissingConfigDir);
+ };
+ let kdeglobals_file = config_dir.join("kdeglobals");
+ let mut kdeglobals_ini = Self::read_ini(&kdeglobals_file)?;
+
+ let src_file = Self::get_kcolorscheme_path(is_dark)?;
+ let src_ini = Self::read_ini(&src_file)?;
+
+ Self::backup_non_cosmic_kdeglobals(&kdeglobals_ini, &kdeglobals_file)
+ .map_err(OutputError::Io)?;
+
+ for (section, key_value) in src_ini.get_map_ref() {
+ for (key, value) in key_value {
+ kdeglobals_ini.set(section, key, value.clone());
+ }
+ }
+
+ kdeglobals_ini
+ .pretty_write(kdeglobals_file, &qt_settings_ini_style())
+ .map_err(OutputError::Io)?;
+ Ok(())
+ }
+
+ /// Reset the applied qt colors by removing color scheme values from the
+ /// `~/.config/kdeglobals` file.
///
/// This does not restore the backed up kdeglobals file.
///
/// # Errors
///
- /// Returns an `OutputError` if there is an error resetting the kdeglobals
- /// file or deleting the color schemes.
+ /// Returns an `OutputError` if there is an error resetting the CSS file.
#[cold]
pub fn reset_qt() -> Result<(), OutputError> {
let Some(config_dir) = dirs::config_dir() else {
@@ -32,29 +292,19 @@ impl Theme {
return Ok(());
}
- let light_scheme = Self::get_kcolorscheme_path(false)?;
- let dark_scheme = Self::get_kcolorscheme_path(true)?;
- if light_scheme.exists() {
- let src_ini = Self::read_ini(&light_scheme)?;
+ let is_dark = false; // doesn't matter since we're only reading keys
+ let src_file = Self::get_kcolorscheme_path(is_dark)?;
+ let src_ini = Self::read_ini(&src_file)?;
- // Remove color scheme keys from kdeglobals
- for (section, key_value) in src_ini.get_map_ref() {
- for key in key_value.keys() {
- kdeglobals_ini.remove_key(section, key);
- }
+ for (section, key_value) in src_ini.get_map_ref() {
+ for (key, _) in key_value {
+ kdeglobals_ini.remove_key(section, key);
}
-
- kdeglobals_ini
- .write(kdeglobals_file)
- .map_err(OutputError::Io)?;
}
- // Delete now-unused kcolorscheme files
- let delete_light_res = fs::remove_file(&light_scheme).map_err(OutputError::Io);
- let delete_dark_res = fs::remove_file(&dark_scheme).map_err(OutputError::Io);
- delete_light_res?;
- delete_dark_res?;
-
+ kdeglobals_ini
+ .write(kdeglobals_file)
+ .map_err(OutputError::Io)?;
Ok(())
}
@@ -63,7 +313,6 @@ impl Theme {
let Some(mut data_dir) = dirs::data_dir() else {
return Err(OutputError::MissingDataDir);
};
- data_dir.push("color-schemes");
let file_name = if is_dark {
"CosmicDark.colors"
@@ -71,6 +320,11 @@ impl Theme {
"CosmicLight.colors"
};
+ data_dir.push("color-schemes");
+ if !data_dir.exists() {
+ std::fs::create_dir_all(&data_dir).map_err(OutputError::Io)?;
+ }
+
Ok(data_dir.join(file_name))
}
@@ -85,6 +339,15 @@ impl Theme {
Ok(ini)
}
+ #[cold]
+ fn backup_non_cosmic_kdeglobals(ini: &Ini, path: &Path) -> io::Result<()> {
+ if !Self::is_cosmic_kdeglobals(&ini)?.unwrap_or(true) {
+ let backup_path = path.with_extension("bak");
+ fs::copy(path, &backup_path)?;
+ }
+ Ok(())
+ }
+
#[cold]
fn is_cosmic_kdeglobals(ini: &Ini) -> io::Result> {
let color_scheme = ini.get("General", "ColorScheme");
@@ -98,43 +361,208 @@ impl Theme {
}
}
+/// Formats a color in the form `r,g,b` e.g. `255,255,255`.
+/// If the color has transparency, it is mixed with bg first.
+fn to_rgb(c: Srgba, bg: Srgba) -> String {
+ let c_u8: Srgba = c.over(bg).into_format();
+ format!("{},{},{}", c_u8.red, c_u8.green, c_u8.blue)
+}
+
+fn format_ini_color_effects(color_effects: &IniColorEffects, bg: Srgba) -> String {
+ format!(
+ r#"Color={}
+ColorAmount={}
+ColorEffect={}
+ContrastAmount={}
+ContrastEffect={}
+IntensityAmount={}
+IntensityEffect={}"#,
+ to_rgb(color_effects.color, bg),
+ color_effects.color_amount,
+ color_effects.color_effect.as_u8(),
+ color_effects.contrast_amount,
+ color_effects.contrast_effect.as_u8(),
+ color_effects.intensity_amount,
+ color_effects.intensity_effect.as_u8(),
+ )
+}
+
+fn format_ini_colors(colors: &IniColors, bg: Srgba) -> String {
+ format!(
+ r#"BackgroundAlternate={}
+BackgroundNormal={}
+DecorationFocus={}
+DecorationHover={}
+ForegroundActive={}
+ForegroundInactive={}
+ForegroundLink={}
+ForegroundNegative={}
+ForegroundNeutral={}
+ForegroundNormal={}
+ForegroundPositive={}
+ForegroundVisited={}"#,
+ to_rgb(colors.background_alternate, bg),
+ to_rgb(colors.background_normal, bg),
+ to_rgb(colors.decoration_focus, bg),
+ to_rgb(colors.decoration_hover, bg),
+ to_rgb(colors.foreground_active, bg),
+ to_rgb(colors.foreground_inactive, bg),
+ to_rgb(colors.foreground_link, bg),
+ to_rgb(colors.foreground_negative, bg),
+ to_rgb(colors.foreground_neutral, bg),
+ to_rgb(colors.foreground_normal, bg),
+ to_rgb(colors.foreground_positive, bg),
+ to_rgb(colors.foreground_visited, bg),
+ )
+}
+
+/// Sets the colors for the titlebars of active and inactive windows.
+fn format_ini_wm_colors(view_colors: &IniColors, is_dark: bool) -> String {
+ let bg = view_colors.background_normal;
+ let fg = view_colors.foreground_active;
+ let blend = if is_dark { fg } else { bg };
+
+ format!(
+ r#"activeBackground={}
+activeBlend={}
+activeForeground={}
+inactiveBackground={}
+inactiveBlend={}
+inactiveForeground={}"#,
+ to_rgb(bg, bg),
+ to_rgb(blend, bg),
+ to_rgb(fg, bg),
+ to_rgb(bg, bg),
+ to_rgb(blend, bg),
+ to_rgb(fg, bg),
+ )
+}
+
+struct IniColorEffects {
+ color: Srgba,
+ color_amount: f32,
+ color_effect: ColorEffect,
+ contrast_amount: f32,
+ /// Applied to the text, using the background as the reference color.
+ contrast_effect: ColorEffect,
+ intensity_amount: f32,
+ intensity_effect: IntensityEffect,
+}
+/// Each color set is made up of a number of roles which are available in all other sets.
+/// In addition, except for Inactive Text, there is a corresponding background role for each of the text roles. Currently (except for Normal and Alternate Background), these colors are not chosen here but are automatically determined based on Normal Background and the corresponding Text color.
+struct IniColors {
+ /// used when there is a need to subtly change the background to aid in item association. This might be used e.g. as the background of a heading, but is mostly used for alternating rows in lists, especially multi-column lists, to aid in visually tracking rows.
+ background_alternate: Srgba,
+ /// Normal background
+ background_normal: Srgba,
+ /// Used for drawing lines or shading UI elements to indicate the item which has active input focus.
+ /// Typically the same as foreground_active.
+ decoration_focus: Srgba,
+ /// Used for drawing lines or shading UI elements for mouse-over effects, e.g. the "illumination" effects for buttons.
+ /// Typically the same as foreground_active.
+ decoration_hover: Srgba,
+ /// used to indicate an active element or attract attention, e.g. alerts, notifications; also for hovered hyperlinks
+ foreground_active: Srgba,
+ /// used for text which should be unobtrusive, e.g. comments, "subtitles", unimportant information, etc.
+ foreground_inactive: Srgba,
+ /// used for hyperlinks or to otherwise indicate "something which may be visited", or to show relationships
+ foreground_link: Srgba,
+ /// used for errors, failure notices, notifications that an action may be dangerous (e.g. unsafe web page or security context), etc.
+ foreground_negative: Srgba,
+ /// used to draw attention when another role is not appropriate; e.g. warnings, to indicate secure/encrypted content, etc.
+ foreground_neutral: Srgba,
+ /// Normal foreground
+ foreground_normal: Srgba,
+ /// used for success notices, to indicate trusted content, etc.
+ foreground_positive: Srgba,
+ /// used for "something (e.g. a hyperlink) that has been visited", or to indicate something that is "old".
+ foreground_visited: Srgba,
+}
+
+/// Intensity allows the overall color to be lightened or darkened.
+#[allow(dead_code)]
+enum IntensityEffect {
+ /// Makes everything lighter or darker in a controlled manner.
+ ///
+ /// intensity_amount increases or decreases the overall intensity (i.e. perceived brightness) by an absolute amount.
+ Shade,
+ /// Changes the intensity to a percentage of the initial value.
+ Darken,
+ /// Conceptually the opposite of darken; lighten can be thought of as working with "distance from white", where darken works with "distance from black".
+ Lighten,
+}
+
+impl IntensityEffect {
+ pub fn as_u8(&self) -> u8 {
+ match self {
+ Self::Shade => 0,
+ Self::Darken => 1,
+ Self::Lighten => 2,
+ }
+ }
+}
+
+/// This also changes the overall color like [IntensityEffect],
+/// but is not limited to intensity.
+#[allow(dead_code)]
+enum ColorEffect {
+ /// changes the relative chroma
+ ///
+ /// This is available for "ColorEffect" but not "ContrastEffect".
+ Desaturate,
+ /// smoothly blends the original color into a reference color
+ Fade,
+ /// similar to Fade, except that the color (hue and chroma) changes more quickly while the intensity changes more slowly as the amount is increased
+ Tint,
+}
+
+impl ColorEffect {
+ pub fn as_u8(&self) -> u8 {
+ match self {
+ Self::Desaturate => 0,
+ Self::Fade => 1,
+ Self::Tint => 2,
+ }
+ }
+}
+
#[cfg(test)]
mod tests {
use super::*;
#[test]
- fn test_is_cosmic_kdeglobals_dark() -> io::Result<()> {
- let mut ini = Ini::new_cs();
- ini.setstr("General", "ColorScheme", Some("CosmicDark"));
- let is_cosmic = Theme::is_cosmic_kdeglobals(&ini)?;
- assert_eq!(is_cosmic, Some(true));
- Ok(())
+ fn test_opaque_color_to_rgb() {
+ let color = Srgba::new(30.0 / 255.0, 50.0 / 255.0, 70.0 / 255.0, 1.0);
+ let bg = Srgba::new(1.0, 1.0, 1.0, 1.0);
+ let result = to_rgb(color, bg);
+ assert_eq!(result, "30,50,70");
}
#[test]
- fn test_is_cosmic_kdeglobals_light() -> io::Result<()> {
- let mut ini = Ini::new_cs();
- ini.setstr("General", "ColorScheme", Some("CosmicLight"));
- let is_cosmic = Theme::is_cosmic_kdeglobals(&ini)?;
- assert_eq!(is_cosmic, Some(true));
- Ok(())
+ fn test_transparent_color_to_rgb() {
+ let color = Srgba::new(0.0, 0.0, 0.0, 0.0);
+ let bg = Srgba::new(1.0, 1.0, 1.0, 1.0);
+ let result = to_rgb(color, bg);
+ assert_eq!(result, "255,255,255");
}
#[test]
- fn test_is_cosmic_kdeglobals_breeze() -> io::Result<()> {
- let mut ini = Ini::new_cs();
- ini.setstr("General", "ColorScheme", Some("BreezeDark"));
- let is_cosmic = Theme::is_cosmic_kdeglobals(&ini)?;
- assert_eq!(is_cosmic, Some(false));
- Ok(())
+ fn test_translucent_color_to_rgb() {
+ let color = Srgba::new(0.0, 0.0, 0.0, 0.9);
+ let bg = Srgba::new(1.0, 1.0, 1.0, 1.0);
+ let result = to_rgb(color, bg);
+ assert_eq!(result, "26,26,26");
}
#[test]
- fn test_is_cosmic_kdeglobals_blank() -> io::Result<()> {
- let mut ini = Ini::new_cs();
- ini.setstr("General", "ColorScheme", None);
- let is_cosmic = Theme::is_cosmic_kdeglobals(&ini)?;
- assert_eq!(is_cosmic, None);
- Ok(())
+ fn test_light_default_kcolorscheme() {
+ let light_default_kcolorscheme = Theme::light_default().as_kcolorscheme();
+ insta::assert_snapshot!(light_default_kcolorscheme);
+ }
+
+ #[test]
+ fn test_dark_default_kcolorscheme() {
+ let dark_default_kcolorscheme = Theme::dark_default().as_kcolorscheme();
+ insta::assert_snapshot!(dark_default_kcolorscheme);
}
}
diff --git a/cosmic-theme/src/output/snapshots/cosmic_theme__output__qt_output__tests__dark_default_kcolorscheme.snap b/cosmic-theme/src/output/snapshots/cosmic_theme__output__qt_output__tests__dark_default_kcolorscheme.snap
new file mode 100644
index 00000000..c50f95dc
--- /dev/null
+++ b/cosmic-theme/src/output/snapshots/cosmic_theme__output__qt_output__tests__dark_default_kcolorscheme.snap
@@ -0,0 +1,157 @@
+---
+source: cosmic-theme/src/output/qt_output.rs
+expression: dark_default_kcolorscheme
+---
+# GENERATED BY COSMIC
+
+[ColorEffects:Disabled]
+Color=43,43,43
+ColorAmount=0
+ColorEffect=0
+ContrastAmount=0.65
+ContrastEffect=1
+IntensityAmount=0.1
+IntensityEffect=2
+
+[ColorEffects:Inactive]
+ChangeSelectionColor=false
+Enable=false
+Color=27,27,27
+ColorAmount=0.025
+ColorEffect=2
+ContrastAmount=0.1
+ContrastEffect=2
+IntensityAmount=0
+IntensityEffect=0
+
+[Colors:Button]
+BackgroundAlternate=99,208,223
+BackgroundNormal=60,60,60
+DecorationFocus=99,208,223
+DecorationHover=99,208,223
+ForegroundActive=99,208,223
+ForegroundInactive=211,211,211
+ForegroundLink=99,208,223
+ForegroundNegative=255,160,154
+ForegroundNeutral=255,163,125
+ForegroundNormal=231,231,231
+ForegroundPositive=94,219,140
+ForegroundVisited=99,208,223
+
+[Colors:Complementary]
+BackgroundAlternate=99,208,223
+BackgroundNormal=27,27,27
+DecorationFocus=99,208,223
+DecorationHover=99,208,223
+ForegroundActive=99,208,223
+ForegroundInactive=211,211,211
+ForegroundLink=99,208,223
+ForegroundNegative=255,160,154
+ForegroundNeutral=255,163,125
+ForegroundNormal=231,231,231
+ForegroundPositive=94,219,140
+ForegroundVisited=99,208,223
+
+[Colors:Header]
+BackgroundAlternate=31,36,37
+BackgroundNormal=27,27,27
+DecorationFocus=99,208,223
+DecorationHover=99,208,223
+ForegroundActive=99,208,223
+ForegroundInactive=211,211,211
+ForegroundLink=99,208,223
+ForegroundNegative=255,160,154
+ForegroundNeutral=255,163,125
+ForegroundNormal=231,231,231
+ForegroundPositive=94,219,140
+ForegroundVisited=99,208,223
+
+[Colors:Header][Inactive]
+BackgroundAlternate=31,36,37
+BackgroundNormal=27,27,27
+DecorationFocus=99,208,223
+DecorationHover=99,208,223
+ForegroundActive=99,208,223
+ForegroundInactive=211,211,211
+ForegroundLink=99,208,223
+ForegroundNegative=255,160,154
+ForegroundNeutral=255,163,125
+ForegroundNormal=231,231,231
+ForegroundPositive=94,219,140
+ForegroundVisited=99,208,223
+
+[Colors:Selection]
+BackgroundAlternate=63,118,125
+BackgroundNormal=99,208,223
+DecorationFocus=99,208,223
+DecorationHover=99,208,223
+ForegroundActive=67,67,67
+ForegroundInactive=83,138,145
+ForegroundLink=27,27,27
+ForegroundNegative=255,160,154
+ForegroundNeutral=255,163,125
+ForegroundNormal=67,67,67
+ForegroundPositive=94,219,140
+ForegroundVisited=99,208,223
+
+[Colors:Tooltip]
+BackgroundAlternate=49,55,55
+BackgroundNormal=46,46,46
+DecorationFocus=99,208,223
+DecorationHover=99,208,223
+ForegroundActive=99,208,223
+ForegroundInactive=211,211,211
+ForegroundLink=99,208,223
+ForegroundNegative=255,160,154
+ForegroundNeutral=255,163,125
+ForegroundNormal=231,231,231
+ForegroundPositive=94,219,140
+ForegroundVisited=99,208,223
+
+[Colors:View]
+BackgroundAlternate=49,55,55
+BackgroundNormal=46,46,46
+DecorationFocus=99,208,223
+DecorationHover=99,208,223
+ForegroundActive=99,208,223
+ForegroundInactive=211,211,211
+ForegroundLink=99,208,223
+ForegroundNegative=255,160,154
+ForegroundNeutral=255,163,125
+ForegroundNormal=231,231,231
+ForegroundPositive=94,219,140
+ForegroundVisited=99,208,223
+
+[Colors:Window]
+BackgroundAlternate=31,36,37
+BackgroundNormal=27,27,27
+DecorationFocus=99,208,223
+DecorationHover=99,208,223
+ForegroundActive=99,208,223
+ForegroundInactive=211,211,211
+ForegroundLink=99,208,223
+ForegroundNegative=255,160,154
+ForegroundNeutral=255,163,125
+ForegroundNormal=231,231,231
+ForegroundPositive=94,219,140
+ForegroundVisited=99,208,223
+
+[General]
+ColorScheme=CosmicDark
+Name=COSMIC Dark
+shadeSortColumn=true
+
+[Icons]
+Theme=breeze-dark
+
+[KDE]
+contrast=4
+widgetStyle=qt6ct-style
+
+[WM]
+activeBackground=27,27,27
+activeBlend=99,208,223
+activeForeground=99,208,223
+inactiveBackground=27,27,27
+inactiveBlend=99,208,223
+inactiveForeground=99,208,223
diff --git a/cosmic-theme/src/output/snapshots/cosmic_theme__output__qt_output__tests__light_default_kcolorscheme.snap b/cosmic-theme/src/output/snapshots/cosmic_theme__output__qt_output__tests__light_default_kcolorscheme.snap
new file mode 100644
index 00000000..ae2bcb66
--- /dev/null
+++ b/cosmic-theme/src/output/snapshots/cosmic_theme__output__qt_output__tests__light_default_kcolorscheme.snap
@@ -0,0 +1,157 @@
+---
+source: cosmic-theme/src/output/qt_output.rs
+expression: light_default_kcolorscheme
+---
+# GENERATED BY COSMIC
+
+[ColorEffects:Disabled]
+Color=194,194,194
+ColorAmount=0
+ColorEffect=0
+ContrastAmount=0.65
+ContrastEffect=1
+IntensityAmount=0.1
+IntensityEffect=2
+
+[ColorEffects:Inactive]
+ChangeSelectionColor=false
+Enable=false
+Color=215,215,215
+ColorAmount=0.025
+ColorEffect=2
+ContrastAmount=0.1
+ContrastEffect=2
+IntensityAmount=0
+IntensityEffect=0
+
+[Colors:Button]
+BackgroundAlternate=0,82,90
+BackgroundNormal=173,173,173
+DecorationFocus=0,82,90
+DecorationHover=0,82,90
+ForegroundActive=0,82,90
+ForegroundInactive=38,38,38
+ForegroundLink=0,82,90
+ForegroundNegative=137,4,24
+ForegroundNeutral=121,44,0
+ForegroundNormal=18,18,18
+ForegroundPositive=0,87,44
+ForegroundVisited=0,82,90
+
+[Colors:Complementary]
+BackgroundAlternate=99,208,223
+BackgroundNormal=27,27,27
+DecorationFocus=99,208,223
+DecorationHover=99,208,223
+ForegroundActive=99,208,223
+ForegroundInactive=211,211,211
+ForegroundLink=99,208,223
+ForegroundNegative=255,160,154
+ForegroundNeutral=255,163,125
+ForegroundNormal=231,231,231
+ForegroundPositive=94,219,140
+ForegroundVisited=99,208,223
+
+[Colors:Header]
+BackgroundAlternate=204,208,209
+BackgroundNormal=215,215,215
+DecorationFocus=0,82,90
+DecorationHover=0,82,90
+ForegroundActive=0,82,90
+ForegroundInactive=38,38,38
+ForegroundLink=0,82,90
+ForegroundNegative=137,4,24
+ForegroundNeutral=121,44,0
+ForegroundNormal=18,18,18
+ForegroundPositive=0,87,44
+ForegroundVisited=0,82,90
+
+[Colors:Header][Inactive]
+BackgroundAlternate=204,208,209
+BackgroundNormal=215,215,215
+DecorationFocus=0,82,90
+DecorationHover=0,82,90
+ForegroundActive=0,82,90
+ForegroundInactive=38,38,38
+ForegroundLink=0,82,90
+ForegroundNegative=137,4,24
+ForegroundNeutral=121,44,0
+ForegroundNormal=18,18,18
+ForegroundPositive=0,87,44
+ForegroundVisited=0,82,90
+
+[Colors:Selection]
+BackgroundAlternate=108,149,152
+BackgroundNormal=0,82,90
+DecorationFocus=0,82,90
+DecorationHover=0,82,90
+ForegroundActive=246,246,246
+ForegroundInactive=123,164,168
+ForegroundLink=215,215,215
+ForegroundNegative=137,4,24
+ForegroundNeutral=121,44,0
+ForegroundNormal=246,246,246
+ForegroundPositive=0,87,44
+ForegroundVisited=0,82,90
+
+[Colors:Tooltip]
+BackgroundAlternate=233,237,237
+BackgroundNormal=245,245,245
+DecorationFocus=0,82,90
+DecorationHover=0,82,90
+ForegroundActive=0,82,90
+ForegroundInactive=38,38,38
+ForegroundLink=0,82,90
+ForegroundNegative=137,4,24
+ForegroundNeutral=121,44,0
+ForegroundNormal=18,18,18
+ForegroundPositive=0,87,44
+ForegroundVisited=0,82,90
+
+[Colors:View]
+BackgroundAlternate=233,237,237
+BackgroundNormal=245,245,245
+DecorationFocus=0,82,90
+DecorationHover=0,82,90
+ForegroundActive=0,82,90
+ForegroundInactive=38,38,38
+ForegroundLink=0,82,90
+ForegroundNegative=137,4,24
+ForegroundNeutral=121,44,0
+ForegroundNormal=18,18,18
+ForegroundPositive=0,87,44
+ForegroundVisited=0,82,90
+
+[Colors:Window]
+BackgroundAlternate=204,208,209
+BackgroundNormal=215,215,215
+DecorationFocus=0,82,90
+DecorationHover=0,82,90
+ForegroundActive=0,82,90
+ForegroundInactive=38,38,38
+ForegroundLink=0,82,90
+ForegroundNegative=137,4,24
+ForegroundNeutral=121,44,0
+ForegroundNormal=18,18,18
+ForegroundPositive=0,87,44
+ForegroundVisited=0,82,90
+
+[General]
+ColorScheme=CosmicLight
+Name=COSMIC Light
+shadeSortColumn=true
+
+[Icons]
+Theme=breeze
+
+[KDE]
+contrast=4
+widgetStyle=qt6ct-style
+
+[WM]
+activeBackground=215,215,215
+activeBlend=215,215,215
+activeForeground=0,82,90
+inactiveBackground=215,215,215
+inactiveBlend=215,215,215
+inactiveForeground=0,82,90
diff --git a/cosmic-theme/src/output/vs_code.rs b/cosmic-theme/src/output/vs_code.rs
index f49c888f..43c36bb6 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 e595d8f8..6ebf1015 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.
@@ -81,7 +80,6 @@ pub fn get_text(
step_array: &[Srgba],
fallback: &Srgba,
tint_array: Option<&[Srgba]>,
- alpha: f32,
) -> Srgba {
assert!(step_array.len() == 100);
let step_array = if let Some(tint_array) = tint_array {
@@ -91,28 +89,11 @@ pub fn get_text(
step_array
};
- let alpha_extra_steps = if alpha < 1.0 {
- ((1. - alpha) * 100.0).round() as usize
- } else {
- 0
- };
let is_dark = base_index < 60;
- let index = get_index(
- base_index,
- 70 + alpha_extra_steps,
- step_array.len(),
- is_dark,
- )
- .or_else(|| {
- get_index(
- base_index,
- 50 + alpha_extra_steps,
- step_array.len(),
- is_dark,
- )
- })
- .unwrap_or(if is_dark { 99 } else { 0 });
+ let index = get_index(base_index, 70, step_array.len(), is_dark)
+ .or_else(|| get_index(base_index, 50, step_array.len(), is_dark))
+ .unwrap_or(if is_dark { 99 } else { 0 });
*step_array.get(index).unwrap_or(fallback)
}
diff --git a/examples/about/Cargo.toml b/examples/about/Cargo.toml
index b27b5134..f980811c 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 d1ea475e..c25a9b9a 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 265fbe7f..13eff684 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 f77bf512..22903eac 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";
@@ -101,7 +100,6 @@ impl cosmic::Application for Window {
Message::Surface(destroy_popup(id))
} else {
Message::Surface(app_popup::(
- |_| Default::default(),
move |state: &mut Window| {
let new_id = Id::unique();
state.popup = Some(new_id);
@@ -124,6 +122,8 @@ impl cosmic::Application for Window {
},
Some(Box::new(move |state: &Window| {
let content_list = list_column()
+ .padding(5)
+ .spacing(0)
.add(settings::item(
"Example row",
cosmic::widget::container(
diff --git a/examples/application/Cargo.toml b/examples/application/Cargo.toml
index b5968461..7a6083e0 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",
@@ -22,5 +22,4 @@ features = [
"surface-message",
"multi-window",
"wgpu",
- "wayland",
]
diff --git a/examples/application/src/main.rs b/examples/application/src/main.rs
index af4200c9..f6e571e0 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, RcElementWrapper};
-use cosmic::{executor, iced, widget, Core};
+use cosmic::widget::nav_bar;
+use cosmic::{executor, iced, prelude::*, widget, Core};
use std::collections::HashMap;
use std::sync::LazyLock;
@@ -43,7 +42,7 @@ pub enum Action {
impl widget::menu::Action for Action {
type Message = Message;
- fn message(&self) -> Self::Message {
+ fn message(&self) -> Message {
match self {
Action::Hi => Message::Hi,
Action::Hi2 => Message::Hi2,
@@ -52,25 +51,6 @@ impl widget::menu::Action for Action {
}
}
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub enum Action2 {
- Hi,
- Hi2,
- Hi3,
-}
-
-impl widget::menu::Action for Action2 {
- type Message = cosmic::Action;
-
- fn message(&self) -> Self::Message {
- cosmic::Action::App(match self {
- Action2::Hi => Message::Hi,
- Action2::Hi2 => Message::Hi2,
- Action2::Hi3 => Message::Hi3,
- })
- }
-}
-
/// Runs application with these settings
#[rustfmt::skip]
fn main() -> Result<(), Box> {
@@ -103,7 +83,6 @@ pub enum Message {
Hi2,
Hi3,
Tick,
- ValueChanged(f32),
}
/// The [`App`] stores application-specific state.
@@ -115,7 +94,6 @@ pub struct App {
hidden: bool,
keybinds: HashMap,
progress: f32,
- progress_slider: f32,
}
/// Implement [`cosmic::Application`] to integrate with COSMIC.
@@ -158,7 +136,6 @@ impl cosmic::Application for App {
hidden: true,
keybinds: HashMap::new(),
progress: 0.0,
- progress_slider: 0.0,
};
let command = app.update_title();
@@ -177,70 +154,6 @@ impl cosmic::Application for App {
self.update_title()
}
- fn nav_context_menu(&self) -> Option>>> {
- Some(menu::nav_context(
- &HashMap::new(),
- vec![
- vec![cosmic::widget::menu::Item::Button(
- "Hi",
- Some(cosmic::widget::icon::from_name("screenshot-window-symbolic").into()),
- Action2::Hi,
- )],
- vec![
- cosmic::widget::menu::Item::Button(
- "Hi 2",
- Some(cosmic::widget::icon::from_name("screenshot-window-symbolic").into()),
- Action2::Hi,
- ),
- cosmic::widget::menu::Item::Button(
- "Hi 22",
- Some(cosmic::widget::icon::from_name("screenshot-window-symbolic").into()),
- Action2::Hi,
- ),
- ],
- vec![
- cosmic::widget::menu::Item::Button(
- "Hi 3",
- Some(cosmic::widget::icon::from_name("screenshot-window-symbolic").into()),
- Action2::Hi,
- ),
- cosmic::widget::menu::Item::Button(
- "Hi 33",
- Some(cosmic::widget::icon::from_name("screenshot-window-symbolic").into()),
- Action2::Hi,
- ),
- cosmic::widget::menu::Item::Button(
- "Hi 333",
- Some(cosmic::widget::icon::from_name("screenshot-window-symbolic").into()),
- Action2::Hi,
- ),
- ],
- vec![
- cosmic::widget::menu::Item::Button(
- "Hi 44",
- Some(cosmic::widget::icon::from_name("screenshot-window-symbolic").into()),
- Action2::Hi,
- ),
- cosmic::widget::menu::Item::Button(
- "Hi 4444",
- Some(cosmic::widget::icon::from_name("screenshot-window-symbolic").into()),
- Action2::Hi,
- ),
- cosmic::widget::menu::Item::Button(
- "Hi 444444",
- Some(cosmic::widget::icon::from_name("screenshot-window-symbolic").into()),
- Action2::Hi,
- ),
- cosmic::widget::menu::Item::Button(
- "Hi 444444444444",
- Some(cosmic::widget::icon::from_name("screenshot-window-symbolic").into()),
- Action2::Hi,
- ),
- ],
- ],
- ))
- }
-
/// Handle application events here.
fn update(&mut self, message: Self::Message) -> cosmic::app::Task {
match message {
@@ -271,9 +184,6 @@ impl cosmic::Application for App {
Message::Tick => {
self.progress = (self.progress + 0.01) % 1.0;
}
- Message::ValueChanged(value) => {
- self.progress_slider = value;
- }
}
Task::none()
}
@@ -290,7 +200,7 @@ impl cosmic::Application for App {
.map_or("No page selected", String::as_str);
let centered = widget::container(
- widget::column::with_capacity(16)
+ widget::column::with_capacity(14)
.push(widget::text::body(page_content))
.push(
widget::text_input::text_input("", &self.input_1)
@@ -331,18 +241,6 @@ impl cosmic::Application for App {
.progress(self.progress)
.width(Length::Fill),
)
- .push(
- widget::slider(0.0..=1.0, self.progress_slider, Message::ValueChanged)
- .step(0.001),
- )
- .push(
- widget::progress_bar::linear::Linear::new()
- .girth(10.0)
- .progress(self.progress_slider)
- .width(Length::Fill)
- .markers([0.25, 0.5, 0.75])
- .segment_spacing(2),
- )
.push(
widget::progress_bar::circular::Circular::new()
.size(50.0)
@@ -365,7 +263,6 @@ impl cosmic::Application for App {
.progress(1.0)
.width(Length::Fill),
)
- .push(widget::button::suggested("asdf").on_press(Message::Ignore))
.spacing(cosmic::theme::spacing().space_s)
.width(Length::Fill)
.height(Length::Shrink)
diff --git a/examples/calendar/Cargo.toml b/examples/calendar/Cargo.toml
index 203f7c17..b7286825 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 dfcc5b99..f6fb5c0d 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 4c1eed60..39c550f4 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 eebf6c31..8c2a3126 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 4168718d..9fce8767 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 2878b46a..1b5892f6 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 20a730b5..0d31fa93 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 a087de9e..46a4e5b8 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 5f498857..ed1bd004 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 8bc521f7..c219a53b 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 047055e5..430b26ea 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 900d0322..da0c3231 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 c38595fa..0b5440f8 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 c6e69d7e..754a0d86 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, selectable_text};
+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 {
@@ -132,14 +134,10 @@ impl cosmic::Application for MultiWindow {
let new_window_button = button::custom(text("New Window")).on_press(Message::NewWindow);
let content = scrollable(
- column![
- input,
- new_window_button,
- selectable_text::title1("I'm selectable...")
- ]
- .spacing(50)
- .width(Length::Fill)
- .align_x(Alignment::Center),
+ column![input, new_window_button]
+ .spacing(50)
+ .width(Length::Fill)
+ .align_x(Alignment::Center),
);
let window_content = container(container(content).center_x(Length::Fixed(200.)))
@@ -150,14 +148,7 @@ impl cosmic::Application for MultiWindow {
if id == self.core.main_window_id().unwrap() {
window_content.into()
} else {
- container(column![
- header_bar()
- .on_close(Message::CloseWindow(id))
- .focused(focused),
- window_content
- ])
- .class(cosmic::theme::Container::WindowBackground)
- .into()
+ column![header_bar().focused(focused), window_content].into()
}
}
diff --git a/examples/nav-context/Cargo.toml b/examples/nav-context/Cargo.toml
index ea2bc2b8..d829df0f 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/nav-context/src/main.rs b/examples/nav-context/src/main.rs
index 875b83ff..1992066f 100644
--- a/examples/nav-context/src/main.rs
+++ b/examples/nav-context/src/main.rs
@@ -7,7 +7,7 @@ use std::collections::HashMap;
use cosmic::app::{Core, Settings, Task};
use cosmic::iced::Size;
-use cosmic::widget::{menu, nav_bar, space};
+use cosmic::widget::{menu, nav_bar};
use cosmic::{executor, iced, ApplicationExt, Element};
#[derive(Clone, Copy)]
@@ -127,20 +127,18 @@ impl cosmic::Application for App {
Some(&self.nav_model)
}
- /// The context menu list.
- fn nav_context_menu(&self) -> Option>>> {
- Some(menu::nav_context(
+ /// The context menu to display for the given nav bar item ID.
+ fn nav_context_menu(
+ &self,
+ id: nav_bar::Id,
+ ) -> Option>>> {
+ Some(menu::items(
&HashMap::new(),
- self.nav_model
- .iter()
- .map(|e| {
- vec![
- menu::Item::Button("Move Up", None, NavMenuAction::MoveUp(e)),
- menu::Item::Button("Move Down", None, NavMenuAction::MoveDown(e)),
- menu::Item::Button("Delete", None, NavMenuAction::Delete(e)),
- ]
- })
- .collect(),
+ vec![
+ menu::Item::Button("Move Up", None, NavMenuAction::MoveUp(id)),
+ menu::Item::Button("Move Down", None, NavMenuAction::MoveDown(id)),
+ menu::Item::Button("Delete", None, NavMenuAction::Delete(id)),
+ ],
))
}
diff --git a/examples/open-dialog/Cargo.toml b/examples/open-dialog/Cargo.toml
index b09b98ca..94049270 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 082c0fd5..a522050b 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 0228291c..47db4dce 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 ae31a395..8eb69ff3 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 325af162..17e630aa 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 8f71e5b4..8ed45928 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 e518b3cc..d2478429 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 69bd2a19..fe6105c2 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/sat/libcosmic.ftl b/i18n/bn/libcosmic.ftl
similarity index 100%
rename from i18n/sat/libcosmic.ftl
rename to i18n/bn/libcosmic.ftl
diff --git a/i18n/ca/libcosmic.ftl b/i18n/ca/libcosmic.ftl
index 0fbc5ca5..e69de29b 100644
--- a/i18n/ca/libcosmic.ftl
+++ b/i18n/ca/libcosmic.ftl
@@ -1,3 +0,0 @@
-license = Llicència
-close = Tancar
-links = Enllaços
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/af/libcosmic_yoda.ftl b/i18n/da/libcosmic.ftl
similarity index 100%
rename from i18n/af/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/bn/libcosmic_yoda.ftl b/i18n/el/libcosmic.ftl
similarity index 100%
rename from i18n/bn/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 f4fe0b31..00000000
--- 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/ca/libcosmic_yoda.ftl b/i18n/en-GB/libcosmic.ftl
similarity index 100%
rename from i18n/ca/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/da/libcosmic_yoda.ftl b/i18n/es-MX/libcosmic.ftl
similarity index 100%
rename from i18n/da/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/en-GB/libcosmic_yoda.ftl b/i18n/eu/libcosmic.ftl
similarity index 100%
rename from i18n/en-GB/libcosmic_yoda.ftl
rename to i18n/eu/libcosmic.ftl
diff --git a/i18n/es-MX/libcosmic_yoda.ftl b/i18n/fa/libcosmic.ftl
similarity index 100%
rename from i18n/es-MX/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/eu/libcosmic_yoda.ftl b/i18n/fy/libcosmic.ftl
similarity index 100%
rename from i18n/eu/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/fa/libcosmic_yoda.ftl b/i18n/gd/libcosmic.ftl
similarity index 100%
rename from i18n/fa/libcosmic_yoda.ftl
rename to i18n/gd/libcosmic.ftl
diff --git a/i18n/gl/libcosmic.ftl b/i18n/gl/libcosmic.ftl
deleted file mode 100644
index 94bc4909..00000000
--- a/i18n/gl/libcosmic.ftl
+++ /dev/null
@@ -1,34 +0,0 @@
-close = Pechar
-license = Licenza
-links = Enderezos
-developers = Desenvolvedores
-designers = Deseñadores
-artists = Artistas
-translators = Traductores
-documenters = Documentadores
-january = Xaneiro { $year }
-february = Febreiro { $year }
-march = Marzo { $year }
-april = Abril { $year }
-may = Maio { $year }
-june = Xuño { $year }
-july = Xullo { $year }
-august = Agosto { $year }
-september = Setembro { $year }
-october = Outubro { $year }
-november = Novembro { $year }
-december = Decembro { $year }
-monday = Luns
-mon = Lun
-tuesday = Martes
-tue = Mar
-wednesday = Mércores
-wed = Mér
-thursday = Xoves
-thu = Xov
-friday = Venres
-fri = Ven
-saturday = Sábado
-sat = Sáb
-sunday = Domingo
-sun = Dom
diff --git a/i18n/fy/libcosmic_yoda.ftl b/i18n/gu/libcosmic.ftl
similarity index 100%
rename from i18n/fy/libcosmic_yoda.ftl
rename to i18n/gu/libcosmic.ftl
diff --git a/i18n/gd/libcosmic_yoda.ftl b/i18n/he/libcosmic.ftl
similarity index 100%
rename from i18n/gd/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/gu/libcosmic_yoda.ftl b/i18n/hr/libcosmic.ftl
similarity index 100%
rename from i18n/gu/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/he/libcosmic_yoda.ftl b/i18n/ie/libcosmic.ftl
similarity index 100%
rename from i18n/he/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/hr/libcosmic_yoda.ftl b/i18n/jv/libcosmic.ftl
similarity index 100%
rename from i18n/hr/libcosmic_yoda.ftl
rename to i18n/jv/libcosmic.ftl
diff --git a/i18n/ie/libcosmic_yoda.ftl b/i18n/ka/libcosmic.ftl
similarity index 100%
rename from i18n/ie/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/jv/libcosmic_yoda.ftl b/i18n/kmr/libcosmic.ftl
similarity index 100%
rename from i18n/jv/libcosmic_yoda.ftl
rename to i18n/kmr/libcosmic.ftl
diff --git a/i18n/kmr/libcosmic_yoda.ftl b/i18n/kmr/libcosmic_yoda.ftl
deleted file mode 100644
index a771f86d..00000000
--- a/i18n/kmr/libcosmic_yoda.ftl
+++ /dev/null
@@ -1,34 +0,0 @@
-february = Reşemî { $year }
-close = Bigire
-documenters = Pêlbendvan
-november = Mijdar { $year }
-may = Gulan { $year }
-april = Avrêl { $year }
-translators = Wergêr
-artists = Hunermend
-license = Lîsans
-december = Berfanbar { $year }
-links = Girêdan
-march = Adar { $year }
-june = Pûşber { $year }
-august = Tebax { $year }
-developers = Pêşvebir
-july = Tîrmeh { $year }
-september = Îlon { $year }
-designers = Nigarvan
-october = Cotmeh { $year }
-january = Çile { $year }
-monday = Duşem
-mon = Duş
-tuesday = Sêşem
-tue = Sêş
-wednesday = Çarşem
-wed = Çar
-thursday = Pênçşem
-thu = Pên
-friday = Înî
-fri = Înî
-saturday = Şemî
-sat = Şem
-sunday = Yekşem
-sun = Yek
diff --git a/i18n/ka/libcosmic_yoda.ftl b/i18n/kn/libcosmic.ftl
similarity index 100%
rename from i18n/ka/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/kn/libcosmic_yoda.ftl b/i18n/li/libcosmic.ftl
similarity index 100%
rename from i18n/kn/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/li/libcosmic_yoda.ftl b/i18n/ml/libcosmic.ftl
similarity index 100%
rename from i18n/li/libcosmic_yoda.ftl
rename to i18n/ml/libcosmic.ftl
diff --git a/i18n/ml/libcosmic_yoda.ftl b/i18n/ms/libcosmic.ftl
similarity index 100%
rename from i18n/ml/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.ftl b/i18n/oc/libcosmic.ftl
index e1d98649..e69de29b 100644
--- a/i18n/oc/libcosmic.ftl
+++ b/i18n/oc/libcosmic.ftl
@@ -1,14 +0,0 @@
-monday = Diluns
-mon = Dil
-tuesday = Dimars
-tue = Dim
-wednesday = Dimècres
-wed = Dma
-thursday = Dijòus
-thu = Dij
-friday = Divendres
-fri = Div
-saturday = Dissabte
-sat = Dis
-sunday = Dimenge
-sun = Dim
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/ms/libcosmic_yoda.ftl b/i18n/sk/libcosmic.ftl
similarity index 100%
rename from i18n/ms/libcosmic_yoda.ftl
rename to i18n/sk/libcosmic.ftl
diff --git a/i18n/oc/libcosmic_yoda.ftl b/i18n/sl/libcosmic.ftl
similarity index 100%
rename from i18n/oc/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/sk/libcosmic_yoda.ftl b/i18n/sr/libcosmic.ftl
similarity index 100%
rename from i18n/sk/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 e8b88303..00000000
--- 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/sl/libcosmic_yoda.ftl b/i18n/ta/libcosmic.ftl
similarity index 100%
rename from i18n/sl/libcosmic_yoda.ftl
rename to i18n/ta/libcosmic.ftl
diff --git a/i18n/ta/libcosmic_yoda.ftl b/i18n/th/libcosmic.ftl
similarity index 100%
rename from i18n/ta/libcosmic_yoda.ftl
rename to i18n/th/libcosmic.ftl
diff --git a/i18n/th/libcosmic_yoda.ftl b/i18n/ti/libcosmic.ftl
similarity index 100%
rename from i18n/th/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/ti/libcosmic_yoda.ftl b/i18n/uz/libcosmic.ftl
similarity index 100%
rename from i18n/ti/libcosmic_yoda.ftl
rename to i18n/uz/libcosmic.ftl
diff --git a/i18n/uz/libcosmic_yoda.ftl b/i18n/vi/libcosmic.ftl
similarity index 100%
rename from i18n/uz/libcosmic_yoda.ftl
rename to i18n/vi/libcosmic.ftl
diff --git a/i18n/vi/libcosmic_yoda.ftl b/i18n/yue-Hant/libcosmic.ftl
similarity index 100%
rename from i18n/vi/libcosmic_yoda.ftl
rename to i18n/yue-Hant/libcosmic.ftl
diff --git a/i18n/yue-Hant/libcosmic_yoda.ftl b/i18n/yue-Hant/libcosmic_yoda.ftl
deleted file mode 100644
index e69de29b..00000000
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 c34af044..78caabba 160000
--- a/iced
+++ b/iced
@@ -1 +1 @@
-Subproject commit c34af044311c986e5f8458cf61bab2508aca48fa
+Subproject commit 78caabba7ef91cd1030da6f70b41d266704ffece
diff --git a/justfile b/justfile
index 7d9aecee..4653434e 100644
--- a/justfile
+++ b/justfile
@@ -23,12 +23,6 @@ check-json: (check '--message-format=json')
clean:
cargo clean
-# Generate documentation
-doc:
- env RUSTDOCFLAGS="--cfg docsrs" cargo +nightly-2026-04-27 doc --no-deps --verbose \
- -p cosmic-client-toolkit -p cosmic-protocols -p libcosmic \
- --features tokio,winit,wayland,desktop,single-instance,applet,xdg-portal,multi-window
-
# Also remove .cargo and vendored dependencies
clean-dist: clean
rm -rf .cargo vendor vendor.tar target
diff --git a/rustfmt.toml b/rustfmt.toml
deleted file mode 100644
index c1578aaf..00000000
--- a/rustfmt.toml
+++ /dev/null
@@ -1 +0,0 @@
-imports_granularity = "Module"
diff --git a/src/action.rs b/src/action.rs
index 19e228b8..b7162896 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 873622da..fb982acb 100644
--- a/src/app/action.rs
+++ b/src/app/action.rs
@@ -1,11 +1,11 @@
// 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};
-#[cfg(wayland_platform)]
+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;
@@ -64,18 +64,16 @@ pub enum Action {
Unfocus(iced::window::Id),
/// Windowing system initialized
WindowingSystemInitialized,
- /// Blur support enabled
- BlurEnabled,
/// Updates the window maximized state
WindowMaximized(iced::window::Id, bool),
/// Updates the tracked window geometry.
WindowResize(iced::window::Id, f32, f32),
/// Tracks updates to window state.
- #[cfg(wayland_platform)]
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
WindowState(iced::window::Id, WindowState),
/// Capabilities the window manager supports
- #[cfg(wayland_platform)]
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
WmCapabilities(iced::window::Id, WindowManagerCapabilities),
- #[cfg(xdg_portal)]
+ #[cfg(feature = "xdg-portal")]
DesktopSettings(crate::theme::portal::Desktop),
}
diff --git a/src/app/cosmic.rs b/src/app/cosmic.rs
index 90f6c1a7..030ed041 100644
--- a/src/app/cosmic.rs
+++ b/src/app/cosmic.rs
@@ -2,27 +2,22 @@
// SPDX-License-Identifier: MPL-2.0
use std::borrow::Borrow;
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
use std::sync::Arc;
use super::{Action, Application, ApplicationExt, Subscription};
-#[cfg(wayland_platform)]
-use crate::core::Auto;
-#[cfg(wayland_platform)]
-use crate::surface::action::LiveSettings;
use crate::theme::{THEME, Theme, ThemeType};
use crate::{Core, Element, keyboard_nav};
-#[cfg(wayland_platform)]
+#[cfg(all(feature = "wayland", target_os = "linux"))]
use cctk::sctk::reexports::csd_frame::{WindowManagerCapabilities, WindowState};
use cosmic_theme::ThemeMode;
-#[cfg(wayland_platform)]
-use enumflags2::BitFlags;
-#[cfg(not(any(feature = "multi-window", wayland_platform)))]
+#[cfg(not(any(feature = "multi-window", feature = "wayland", target_os = "linux")))]
use iced::Application as IcedApplication;
-#[cfg(wayland_platform)]
+#[cfg(all(feature = "wayland", target_os = "linux"))]
use iced::event::wayland;
use iced::{Task, theme, window};
use iced_futures::event::listen_with;
+#[cfg(all(feature = "wayland", target_os = "linux"))]
use iced_winit::SurfaceIdWrapper;
use palette::color_difference::EuclideanDistance;
@@ -88,24 +83,17 @@ fn init_windowing_system(handle: window::raw_window_handle::WindowHandle) ->
#[derive(Default)]
pub struct Cosmic {
pub app: App,
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
pub surface_views: HashMap<
window::Id,
(
Option,
SurfaceIdWrapper,
- Box Fn(&'a App) -> crate::surface::action::LiveSettings>,
- Option<
- Box<
- dyn for<'a> Fn(&'a App) -> Element<'a, crate::Action>
- + Send
- + Sync
- + 'static,
- >,
- >,
+ Box Fn(&'a App) -> Element<'a, crate::Action>>,
),
>,
+ pub tracked_windows: HashSet,
pub opened_surfaces: HashMap,
- blur_enabled: bool,
}
impl Cosmic
@@ -123,21 +111,14 @@ where
let id = core.main_window_id().unwrap_or(window::Id::RESERVED);
let (model, command) = T::init(core, flags);
- let existing_theme = THEME.lock().unwrap();
- let blur = existing_theme.transparent;
- drop(existing_theme);
- let mut cmds = vec![
- iced_runtime::window::run_with_handle(id, init_windowing_system),
- command,
- ];
-
- if blur {
- cmds.push(crate::task::message(crate::action::cosmic(
- Action::BlurEnabled,
- )));
- }
- (Self::new(model), Task::batch(cmds))
+ (
+ Self::new(model),
+ Task::batch([
+ command,
+ iced_runtime::window::run_with_handle(id, init_windowing_system),
+ ]),
+ )
}
#[cfg(not(feature = "multi-window"))]
@@ -157,8 +138,8 @@ where
) -> iced::Task> {
#[cfg(feature = "surface-message")]
match _surface_message {
- #[cfg(wayland_platform)]
- crate::surface::Action::AppSubsurface(settings, live_settings, view) => {
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
+ crate::surface::Action::AppSubsurface(settings, view) => {
let Some(settings) = std::sync::Arc::try_unwrap(settings)
.ok()
.and_then(|s| s.downcast:: iced_runtime::platform_specific::wayland::subsurface::SctkSubsurfaceSettings + Send + Sync>>().ok()) else {
@@ -166,9 +147,7 @@ where
return Task::none();
};
- let settings = settings(&mut self.app);
-
- let view = view.and_then(|view| {
+ if let Some(view) = view.and_then(|view| {
match std::sync::Arc::try_unwrap(view).ok()?.downcast:: Fn(&'a T) -> Element<'a, crate::Action>
+ Send
@@ -181,18 +160,22 @@ where
None
}
}
- });
- self.get_subsurface(settings, view.map(|v| *v))
+ }) {
+ let settings = settings(&mut self.app);
+
+ self.get_subsurface(settings, *view)
+ } else {
+ iced_winit::commands::subsurface::get_subsurface(settings(&mut self.app))
+ }
}
- #[cfg(wayland_platform)]
- crate::surface::Action::Subsurface(settings, live_settings, view) => {
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
+ crate::surface::Action::Subsurface(settings, view) => {
let Some(settings) = std::sync::Arc::try_unwrap(settings)
.ok()
.and_then(|s| s.downcast:: iced_runtime::platform_specific::wayland::subsurface::SctkSubsurfaceSettings + Send + Sync>>().ok()) else {
tracing::error!("Invalid settings for subsurface");
return Task::none();
};
- let settings = settings();
if let Some(view) = view.and_then(|view| {
match std::sync::Arc::try_unwrap(view).ok()?.downcast:: {
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
+ crate::surface::Action::AppPopup(settings, view) => {
let Some(settings) = std::sync::Arc::try_unwrap(settings)
.ok()
.and_then(|s| s.downcast:: iced_runtime::platform_specific::wayland::popup::SctkPopupSettings + Send + Sync>>().ok()) else {
tracing::error!("Invalid settings for popup");
return Task::none();
};
- let Some(live_settings) =
- std::sync::Arc::try_unwrap(live_settings)
- .ok()
- .and_then(|s| {
- s.downcast:: LiveSettings + Send + Sync>>()
- .ok()
- })
- else {
- tracing::error!("Invalid live settings for popup");
- return Task::none();
- };
- let view = view.and_then(|view| {
+ if let Some(view) = view.and_then(|view| {
match std::sync::Arc::try_unwrap(view).ok()?.downcast:: Fn(&'a T) -> Element<'a, crate::Action>
+ Send
@@ -243,16 +217,19 @@ where
None
}
}
- });
- let settings = settings(&mut self.app);
+ }) {
+ let settings = settings(&mut self.app);
- self.get_popup(settings, *live_settings, view.map(|v| *v))
+ self.get_popup(settings, *view)
+ } else {
+ iced_winit::commands::popup::get_popup(settings(&mut self.app))
+ }
}
- #[cfg(wayland_platform)]
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
crate::surface::Action::DestroyPopup(id) => {
iced_winit::commands::popup::destroy_popup(id)
}
- #[cfg(wayland_platform)]
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
crate::surface::Action::DestroyTooltipPopup => {
#[cfg(feature = "applet")]
{
@@ -263,11 +240,11 @@ where
Task::none()
}
}
- #[cfg(wayland_platform)]
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
crate::surface::Action::DestroySubsurface(id) => {
iced_winit::commands::subsurface::destroy_subsurface(id)
}
- #[cfg(wayland_platform)]
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
crate::surface::Action::DestroyWindow(id) => iced::window::close(id),
crate::surface::Action::ResponsiveMenuBar {
menu_bar,
@@ -278,8 +255,8 @@ where
core.menu_bars.insert(menu_bar, (limits, size));
iced::Task::none()
}
- #[cfg(wayland_platform)]
- crate::surface::Action::Popup(settings, live_settings, view) => {
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
+ crate::surface::Action::Popup(settings, view) => {
let Some(settings) = std::sync::Arc::try_unwrap(settings)
.ok()
.and_then(|s| s.downcast:: iced_runtime::platform_specific::wayland::popup::SctkPopupSettings + Send + Sync>>().ok()) else {
@@ -287,20 +264,6 @@ where
return Task::none();
};
- let Some(live_settings) =
- std::sync::Arc::try_unwrap(live_settings)
- .ok()
- .and_then(|s| {
- s.downcast:: LiveSettings + Send + Sync>>()
- .ok()
- })
- else {
- tracing::error!("Invalid live settings for popup");
- return Task::none();
- };
- let settings = settings();
- let live_settings = Box::new(move |_: &T| live_settings());
-
if let Some(view) = view.and_then(|view| {
match std::sync::Arc::try_unwrap(view).ok()?.downcast:: Element<'static, crate::Action> + Send + Sync,
@@ -312,13 +275,15 @@ where
}
}
}) {
- self.get_popup(settings, live_settings, Some(Box::new(move |_| view())))
+ let settings = settings();
+
+ self.get_popup(settings, Box::new(move |_| view()))
} else {
- self.get_popup(settings, live_settings, None)
+ iced_winit::commands::popup::get_popup(settings())
}
}
- #[cfg(wayland_platform)]
- crate::surface::Action::AppWindow(id, settings, live_settings, view) => {
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
+ crate::surface::Action::AppWindow(id, settings, view) => {
let Some(settings) = std::sync::Arc::try_unwrap(settings).ok().and_then(|s| {
s.downcast:: iced::window::Settings + Send + Sync>>()
.ok()
@@ -326,19 +291,8 @@ where
tracing::error!("Invalid settings for AppWindow");
return Task::none();
};
- let Some(live_settings) =
- std::sync::Arc::try_unwrap(live_settings)
- .ok()
- .and_then(|s| {
- s.downcast:: LiveSettings + Send + Sync>>()
- .ok()
- })
- else {
- tracing::error!("Invalid live settings for popup");
- return Task::none();
- };
- let view = view.and_then(|view| {
+ if let Some(view) = view.and_then(|view| {
match std::sync::Arc::try_unwrap(view).ok()?.downcast:: Fn(&'a T) -> Element<'a, crate::Action>
+ Send
@@ -350,13 +304,25 @@ where
None
}
}
- });
- let settings = settings(&mut self.app);
+ }) {
+ let settings = settings(&mut self.app);
+ self.tracked_windows.insert(id);
- self.get_window(id, settings, *live_settings, view.map(|v| *v))
+ self.get_window(id, settings, *view)
+ } else {
+ let settings = settings(&mut self.app);
+
+ self.tracked_windows.insert(id);
+ iced_runtime::task::oneshot(|channel| {
+ iced_runtime::Action::Window(iced_runtime::window::Action::Open(
+ id, settings, channel,
+ ))
+ })
+ .discard()
+ }
}
- #[cfg(wayland_platform)]
- crate::surface::Action::Window(id, settings, live_settings, view) => {
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
+ crate::surface::Action::Window(id, settings, view) => {
let Some(settings) = std::sync::Arc::try_unwrap(settings).ok().and_then(|s| {
s.downcast:: iced::window::Settings + Send + Sync>>()
.ok()
@@ -365,18 +331,6 @@ where
return Task::none();
};
- let Some(live_settings) =
- std::sync::Arc::try_unwrap(live_settings)
- .ok()
- .and_then(|s| {
- s.downcast:: LiveSettings + Send + Sync>>()
- .ok()
- })
- else {
- tracing::error!("Invalid live settings for popup");
- return Task::none();
- };
-
if let Some(view) = view.and_then(|view| {
match std::sync::Arc::try_unwrap(view).ok()?.downcast:: Element<'static, crate::Action> + Send + Sync,
@@ -389,16 +343,14 @@ where
}
}) {
let settings = settings();
+ self.tracked_windows.insert(id);
- self.get_window(
- id,
- settings,
- Box::new(move |_| live_settings()),
- Some(Box::new(move |_| view())),
- )
+ self.get_window(id, settings, Box::new(move |_| view()))
} else {
let settings = settings();
+ self.tracked_windows.insert(id);
+
iced_runtime::task::oneshot(|channel| {
iced_runtime::Action::Window(iced_runtime::window::Action::Open(
id, settings, channel,
@@ -412,95 +364,6 @@ where
crate::surface::Action::Task(f) => {
f().map(|sm| crate::Action::Cosmic(Action::Surface(sm)))
}
- #[cfg(wayland_platform)]
- crate::surface::Action::AppLayerShell(settings, live_settings, view) => {
- let Some(settings) = std::sync::Arc::try_unwrap(settings)
- .ok()
- .and_then(|s| s.downcast:: iced_runtime::platform_specific::wayland::layer_surface::SctkLayerSurfaceSettings + Send + Sync>>().ok()) else {
- tracing::error!("Invalid settings for layer surface");
- return Task::none();
- };
- let Some(live_settings) =
- std::sync::Arc::try_unwrap(live_settings)
- .ok()
- .and_then(|s| {
- s.downcast:: LiveSettings + Send + Sync>>()
- .ok()
- })
- else {
- tracing::error!("Invalid live settings for popup");
- return Task::none();
- };
-
- let view = view.and_then(|view| {
- match std::sync::Arc::try_unwrap(view).ok()?.downcast:: Fn(&'a T) -> Element<'a, crate::Action>
- + Send
- + Sync,
- >>() {
- Ok(v) => Some(v),
- Err(err) => {
- tracing::error!("Invalid view for layer surface: {err:?}");
- None
- }
- }
- });
-
- let settings = settings(&mut self.app);
-
- self.get_layer_shell(settings, *live_settings, view.map(|v| *v))
- }
- #[cfg(wayland_platform)]
- crate::surface::Action::LayerShell(settings, live_settings, view) => {
- let Some(settings) = std::sync::Arc::try_unwrap(settings)
- .ok()
- .and_then(|s| s.downcast:: iced_runtime::platform_specific::wayland::layer_surface::SctkLayerSurfaceSettings + Send + Sync>>().ok()) else {
- tracing::error!("Invalid settings for layer surface");
- return Task::none();
- };
-
- let Some(live_settings) =
- std::sync::Arc::try_unwrap(live_settings)
- .ok()
- .and_then(|s| {
- s.downcast:: LiveSettings + Send + Sync>>()
- .ok()
- })
- else {
- tracing::error!("Invalid live settings for popup");
- return Task::none();
- };
- let settings = settings();
- let live_settings = live_settings();
- let live_settings = Box::new(move |_app: &T| live_settings);
-
- if let Some(view) = view.and_then(|view| {
- match std::sync::Arc::try_unwrap(view).ok()?.downcast:: Element<'static, crate::Action> + Send + Sync,
- >>() {
- Ok(v) => Some(v),
- Err(err) => {
- tracing::error!("Invalid view for layer surface: {err:?}");
- None
- }
- }
- }) {
- self.get_layer_shell(settings, live_settings, Some(Box::new(move |_| view())))
- } else {
- self.get_layer_shell(settings, live_settings, None)
- }
- }
- #[cfg(wayland_platform)]
- crate::surface::Action::DestroyLayerShell(id) => {
- iced_winit::commands::layer_surface::destroy_layer_surface(id)
- }
- crate::surface::Action::SyncLiveSettings(id) => {
- if let Some((_, id, live_settings, _)) = self.surface_views.get(&id) {
- let live_settings = live_settings(&self.app);
- return self.apply_live_settings(*id, &live_settings);
- }
- Task::none()
- }
_ => iced::Task::none(),
}
@@ -512,7 +375,7 @@ where
&mut self,
message: crate::Action,
) -> iced::Task> {
- let mut task = match message {
+ let message = match message {
crate::Action::App(message) => self.app.update(message),
crate::Action::Cosmic(message) => self.cosmic_update(message),
crate::Action::None => iced::Task::none(),
@@ -529,33 +392,10 @@ where
}
};
- // Drain any text context-menu popup teardown requests queued by
- // widgets during `app.update()` and destroy them through the normal
- // popup pipeline. Drained before the creation queue so a
- // destroy-then-recreate (a second right-click reusing the same id)
- // keeps its order.
- #[cfg(all(wayland_platform, target_os = "linux"))]
- for id in crate::widget::text_context_menu::take_popup_destroys() {
- task = task.chain(iced_winit::commands::popup::destroy_popup(id));
- }
-
- // Drain any text context-menu popup requests queued by widgets during
- // `app.update()` and create them through the normal popup pipeline.
- #[cfg(all(wayland_platform, target_os = "linux"))]
- for req in crate::widget::text_context_menu::take_popup_requests() {
- let (live_settings, settings, view) =
- crate::widget::text_context_menu::into_popup_view::(req);
- task = task.chain(self.get_popup(
- settings,
- Box::new(move |_| live_settings),
- Some(Box::new(move |_| view())),
- ));
- }
-
#[cfg(all(target_env = "gnu", not(target_os = "windows")))]
crate::malloc::trim(0);
- task
+ message
}
#[cfg(not(feature = "multi-window"))]
@@ -568,19 +408,19 @@ 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 {
+ let theme = THEME.lock().unwrap();
+ crate::style::iced::application::style(theme.borrow())
} else {
let theme = THEME.lock().unwrap();
- if self.app.core().window.is_maximized && !theme.cosmic().frosted_maximized_apps {
- crate::style::iced::application::style(theme.borrow())
- } else {
- theme::Style {
- background_color: iced_core::Color::TRANSPARENT,
- icon_color: theme.cosmic().on_bg_color().into(),
- text_color: theme.cosmic().on_bg_color().into(),
- }
+
+ theme::Style {
+ background_color: iced_core::Color::TRANSPARENT,
+ icon_color: theme.cosmic().on_bg_color().into(),
+ text_color: theme.cosmic().on_bg_color().into(),
}
}
}
@@ -601,7 +441,7 @@ where
}
iced::Event::Window(window::Event::Focused) => return Some(Action::Focus(id)),
iced::Event::Window(window::Event::Unfocused) => return Some(Action::Unfocus(id)),
- #[cfg(wayland_platform)]
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
iced::Event::PlatformSpecific(iced::event::PlatformSpecific::Wayland(event)) => {
match event {
wayland::Event::Popup(wayland::PopupEvent::Done, _, id)
@@ -614,15 +454,12 @@ where
) => {
return Some(Action::SuggestedBounds(b));
}
- #[cfg(wayland_platform)]
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
wayland::Event::Window(iced::event::wayland::WindowEvent::WindowState(
s,
)) => {
return Some(Action::WindowState(id, s));
}
- wayland::Event::BlurEnabled => {
- return Some(Action::BlurEnabled);
- }
_ => (),
}
}
@@ -700,7 +537,7 @@ where
})
.map(crate::Action::Cosmic),
window_events.map(crate::Action::Cosmic),
- #[cfg(xdg_portal)]
+ #[cfg(feature = "xdg-portal")]
crate::theme::portal::desktop_settings()
.map(Action::DesktopSettings)
.map(crate::Action::Cosmic),
@@ -719,14 +556,6 @@ where
subscriptions.push(crate::dbus_activation::subscription::());
}
- // Drives the text context-menu popup queues: a right-click queues a
- // popup but publishes no message, so this re-emits `Action::None` to
- // make `update()` run and drain the queue.
- #[cfg(all(wayland_platform, target_os = "linux"))]
- subscriptions.push(crate::widget::text_context_menu::wake_subscription::<
- T::Message,
- >());
-
Subscription::batch(subscriptions)
}
@@ -742,9 +571,8 @@ where
#[cfg(feature = "multi-window")]
pub fn view(&self, id: window::Id) -> Element<'_, crate::Action> {
- crate::widget::text_context_menu::set_current_window_id(id);
- #[cfg(all(wayland_platform, target_os = "linux"))]
- if let Some((_, _, _, Some(v))) = self.surface_views.get(&id) {
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
+ if let Some((_, _, v)) = self.surface_views.get(&id) {
return v(&self.app);
}
if self
@@ -770,9 +598,6 @@ where
#[cfg(not(feature = "multi-window"))]
pub fn view(&self) -> Element> {
- if let Some(id) = self.app.core().main_window_id() {
- crate::widget::text_context_menu::set_current_window_id(id);
- }
let view = self.app.view_main();
#[cfg(all(target_env = "gnu", not(target_os = "windows")))]
@@ -797,7 +622,7 @@ impl Cosmic {
fn cosmic_update(&mut self, message: Action) -> iced::Task> {
match message {
Action::WindowMaximized(id, maximized) => {
- #[cfg(not(wayland_platform))]
+ #[cfg(not(all(feature = "wayland", target_os = "linux")))]
if self
.app
.core()
@@ -827,7 +652,7 @@ impl Cosmic {
});
}
- #[cfg(wayland_platform)]
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
Action::WindowState(id, state) => {
if self
.app
@@ -847,19 +672,39 @@ impl Cosmic {
self.app.core_mut().window.is_maximized =
state.intersects(WindowState::MAXIMIZED | WindowState::FULLSCREEN);
}
- {
+ if self.app.core().sync_window_border_radii_to_theme() {
+ use iced_runtime::platform_specific::wayland::CornerRadius;
use iced_winit::platform_specific::commands::corner_radius::corner_radius;
let theme = THEME.lock().unwrap();
- let rounded = !self.app.core().window.sharp_corners
- && self.app.core().sync_window_border_radii_to_theme();
-
- let cur_rad = self.app.core().corners(&theme, rounded);
- return Task::batch([corner_radius(id, cur_rad).discard()]);
+ let t = theme.cosmic();
+ let radii = t.radius_s().map(|x| if x < 4.0 { x } else { x + 4.0 });
+ let cur_rad = CornerRadius {
+ top_left: radii[0].round() as u32,
+ top_right: radii[1].round() as u32,
+ bottom_right: radii[2].round() as u32,
+ bottom_left: radii[3].round() as u32,
+ };
+ let rounded = !self.app.core().window.sharp_corners;
+ return Task::batch([corner_radius(
+ id,
+ if rounded {
+ Some(cur_rad)
+ } else {
+ let rad_0 = t.radius_0();
+ Some(CornerRadius {
+ top_left: rad_0[0].round() as u32,
+ top_right: rad_0[1].round() as u32,
+ bottom_right: rad_0[2].round() as u32,
+ bottom_left: rad_0[3].round() as u32,
+ })
+ },
+ )
+ .discard()]);
}
}
- #[cfg(wayland_platform)]
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
Action::WmCapabilities(id, capabilities) => {
if self
.app
@@ -928,56 +773,18 @@ impl Cosmic {
if a.distance_squared(*t_inner.accent_color()) > 0.00001 {
theme = Theme::system(Arc::new(t_inner.with_accent(a)));
}
- }
- }
-
- let new_blur = self.blur_enabled && self.app.core().frosted(theme.cosmic());
-
- theme.transparent = new_blur;
- let mut guard = THEME.lock().unwrap();
- guard.set_theme(theme.theme_type.clone());
- guard.transparent = new_blur;
- drop(guard);
-
- #[cfg(wayland_platform)]
- {
- let core = self.app.core();
- let mut cmds = Vec::with_capacity(1 + self.surface_views.len());
- let blur = if new_blur {
- iced::window::enable_blur
- } else {
- iced::window::disable_blur
};
- if core.blur(&theme, None) {
- cmds.push(blur(
- self.app
- .core()
- .main_window_id()
- .unwrap_or(window::Id::RESERVED),
- ));
- }
- for (id, wrapper, ..) in &self.surface_views {
- let overriden = wrapper.2(&self.app);
- if core.blur(&theme, Some(wrapper.1)) && overriden.blur.unwrap_or(true) {
- cmds.push(blur(*id));
- } else if overriden.blur.is_some_and(|b| !b) {
- cmds.push(iced::window::disable_blur(*id));
- }
- }
- return Task::batch(cmds);
}
+
+ THEME.lock().unwrap().set_theme(theme.theme_type);
}
- Action::SystemThemeChange(keys, mut theme) => {
- let cur_is_dark = self.app.core().system_theme_mode.is_dark;
+ Action::SystemThemeChange(keys, theme) => {
+ let cur_is_dark = THEME.lock().unwrap().theme_type.is_dark();
// Ignore updates if the current theme mode does not match.
if cur_is_dark != theme.cosmic().is_dark {
return iced::Task::none();
}
- // update transparent
- let new_blur = self.blur_enabled && self.app.core().frosted(theme.cosmic());
- theme.transparent = new_blur;
-
let cmd = self.app.system_theme_update(&keys, theme.cosmic());
// Record the last-known system theme in event that the current theme is custom.
self.app.core_mut().system_theme = theme.clone();
@@ -1001,70 +808,91 @@ impl Cosmic {
} else {
theme
};
- new_theme.transparent = new_blur;
new_theme.theme_type.prefer_dark(prefer_dark);
cosmic_theme.set_theme(new_theme.theme_type);
- cosmic_theme.transparent = new_blur;
-
- #[cfg(wayland_platform)]
- {
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
+ if self.app.core().sync_window_border_radii_to_theme() {
+ use iced_runtime::platform_specific::wayland::CornerRadius;
use iced_winit::platform_specific::commands::corner_radius::corner_radius;
- let rounded = self.app.core().sync_window_border_radii_to_theme()
- && !self.app.core().window.sharp_corners;
+ let t = cosmic_theme.cosmic();
- let cur_rad = self.app.core().corners(&cosmic_theme, rounded);
+ let radii = t.radius_s().map(|x| if x < 4.0 { x } else { x + 4.0 });
+ let cur_rad = CornerRadius {
+ top_left: radii[0].round() as u32,
+ top_right: radii[1].round() as u32,
+ bottom_right: radii[2].round() as u32,
+ bottom_left: radii[3].round() as u32,
+ };
+ let rounded = !self.app.core().window.sharp_corners;
// Update radius for the main window
let main_window_id = self
.app
.core()
.main_window_id()
.unwrap_or(window::Id::RESERVED);
- let mut cmds = vec![corner_radius(main_window_id, cur_rad).discard()];
+ let mut cmds = vec![
+ corner_radius(
+ main_window_id,
+ if rounded {
+ Some(cur_rad)
+ } else {
+ let rad_0 = t.radius_0();
+ Some(CornerRadius {
+ top_left: rad_0[0].round() as u32,
+ top_right: rad_0[1].round() as u32,
+ bottom_right: rad_0[2].round() as u32,
+ bottom_left: rad_0[3].round() as u32,
+ })
+ },
+ )
+ .discard(),
+ ];
// Update radius for each tracked view with the window surface type
- for (id, (_, surface_type, live_settings, _)) in &self.surface_views {
- let overriden = live_settings(&self.app);
- let cur_rad = if let Some(c) = overriden.corners {
- Some(c)
- } else {
- corners(
- *surface_type,
- rounded,
- &cosmic_theme,
- self.app.core().auto_corner_radius,
+ for (id, (_, surface_type, _)) in self.surface_views.iter() {
+ if let SurfaceIdWrapper::Window(_) = surface_type {
+ cmds.push(
+ corner_radius(
+ *id,
+ if rounded {
+ Some(cur_rad)
+ } else {
+ let rad_0 = t.radius_0();
+ Some(CornerRadius {
+ top_left: rad_0[0].round() as u32,
+ top_right: rad_0[1].round() as u32,
+ bottom_right: rad_0[2].round() as u32,
+ bottom_left: rad_0[3].round() as u32,
+ })
+ },
+ )
+ .discard(),
+ );
+ }
+ }
+ // Update radius for all tracked windows
+ for id in self.tracked_windows.iter() {
+ cmds.push(
+ corner_radius(
+ *id,
+ if rounded {
+ Some(cur_rad)
+ } else {
+ let rad_0 = t.radius_0();
+ Some(CornerRadius {
+ top_left: rad_0[0].round() as u32,
+ top_right: rad_0[1].round() as u32,
+ bottom_right: rad_0[2].round() as u32,
+ bottom_left: rad_0[3].round() as u32,
+ })
+ },
)
- };
- if cur_rad.is_none() {
- continue;
- }
- cmds.push(corner_radius(*id, cur_rad).discard());
+ .discard(),
+ );
}
- let blur = if new_blur {
- iced::window::enable_blur
- } else {
- iced::window::disable_blur
- };
-
- cmds.push(blur(
- self.app
- .core()
- .main_window_id()
- .unwrap_or(window::Id::RESERVED),
- ));
-
- for (id, wrapper, ..) in &self.surface_views {
- let overriden = wrapper.2(&self.app);
- if self.app.core().blur(&cosmic_theme, Some(wrapper.1))
- && overriden.blur.unwrap_or(true)
- {
- cmds.push(blur(*id));
- } else if overriden.blur.is_some_and(|b| !b) {
- cmds.push(iced::window::disable_blur(*id));
- }
- }
return Task::batch(cmds);
}
}
@@ -1093,7 +921,6 @@ impl Cosmic {
} {
return iced::Task::none();
}
-
let mut cmds = vec![self.app.system_theme_mode_update(&keys, &mode)];
let core = self.app.core_mut();
@@ -1122,8 +949,6 @@ impl Cosmic {
} else {
new_theme
};
- let new_blur = self.blur_enabled && core.frosted(new_theme.cosmic());
- new_theme.transparent = new_blur;
core.system_theme = new_theme.clone();
{
@@ -1132,14 +957,21 @@ impl Cosmic {
// Only apply update if the theme is set to load a system theme
if let ThemeType::System { .. } = cosmic_theme.theme_type {
cosmic_theme.set_theme(new_theme.theme_type);
- cosmic_theme.transparent = new_blur;
- #[cfg(wayland_platform)]
- {
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
+ if self.app.core().sync_window_border_radii_to_theme() {
+ use iced_runtime::platform_specific::wayland::CornerRadius;
use iced_winit::platform_specific::commands::corner_radius::corner_radius;
- let rounded = self.app.core().sync_window_border_radii_to_theme()
- && !self.app.core().window.sharp_corners;
- let cur_rad = self.app.core().corners(&cosmic_theme, rounded);
+ let t = cosmic_theme.cosmic();
+
+ let radii = t.radius_s().map(|x| if x < 4.0 { x } else { x + 4.0 });
+ let cur_rad = CornerRadius {
+ top_left: radii[0].round() as u32,
+ top_right: radii[1].round() as u32,
+ bottom_right: radii[2].round() as u32,
+ bottom_left: radii[3].round() as u32,
+ };
+ let rounded = !self.app.core().window.sharp_corners;
// Update radius for the main window
let main_window_id = self
@@ -1147,52 +979,64 @@ impl Cosmic {
.core()
.main_window_id()
.unwrap_or(window::Id::RESERVED);
- let mut cmds =
- vec![corner_radius(main_window_id, cur_rad).discard()];
+ let mut cmds = vec![
+ corner_radius(
+ main_window_id,
+ if rounded {
+ Some(cur_rad)
+ } else {
+ let rad_0 = t.radius_0();
+ Some(CornerRadius {
+ top_left: rad_0[0].round() as u32,
+ top_right: rad_0[1].round() as u32,
+ bottom_right: rad_0[2].round() as u32,
+ bottom_left: rad_0[3].round() as u32,
+ })
+ },
+ )
+ .discard(),
+ ];
// Update radius for each tracked view with the window surface type
- for (id, (_, surface_type, live_settings, _)) in &self.surface_views
- {
- let overriden = live_settings(&self.app);
- let cur_rad = if let Some(c) = overriden.corners {
- Some(c)
- } else {
- corners(
- *surface_type,
- rounded,
- &cosmic_theme,
- self.app.core().auto_corner_radius,
+ for (id, (_, surface_type, _)) in self.surface_views.iter() {
+ if let SurfaceIdWrapper::Window(_) = surface_type {
+ cmds.push(
+ corner_radius(
+ *id,
+ if rounded {
+ Some(cur_rad)
+ } else {
+ let rad_0 = t.radius_0();
+ Some(CornerRadius {
+ top_left: rad_0[0].round() as u32,
+ top_right: rad_0[1].round() as u32,
+ bottom_right: rad_0[2].round() as u32,
+ bottom_left: rad_0[3].round() as u32,
+ })
+ },
+ )
+ .discard(),
+ );
+ }
+ }
+ // Update radius for all tracked windows
+ for id in self.tracked_windows.iter() {
+ cmds.push(
+ corner_radius(
+ *id,
+ if rounded {
+ Some(cur_rad)
+ } else {
+ let rad_0 = t.radius_0();
+ Some(CornerRadius {
+ top_left: rad_0[0].round() as u32,
+ top_right: rad_0[1].round() as u32,
+ bottom_right: rad_0[2].round() as u32,
+ bottom_left: rad_0[3].round() as u32,
+ })
+ },
)
- };
- if cur_rad.is_none() {
- continue;
- }
- cmds.push(corner_radius(*id, cur_rad).discard());
- }
-
- let core = self.app.core();
- let blur = if cosmic_theme.transparent {
- iced::window::enable_blur
- } else {
- iced::window::disable_blur
- };
-
- if core.blur(&cosmic_theme, None) {
- cmds.push(blur(
- self.app
- .core()
- .main_window_id()
- .unwrap_or(window::Id::RESERVED),
- ));
- }
- for (id, wrapper, ..) in &self.surface_views {
- let overriden = wrapper.2(&self.app);
- if core.blur(&cosmic_theme, Some(wrapper.1))
- && overriden.blur.unwrap_or(true)
- {
- cmds.push(blur(*id));
- } else if overriden.blur.is_some_and(|b| !b) {
- cmds.push(iced::window::disable_blur(*id));
- }
+ .discard(),
+ );
}
return Task::batch(cmds);
@@ -1207,7 +1051,7 @@ impl Cosmic {
// Unminimize window before requesting to activate it.
let mut task = iced_runtime::window::minimize(id, false);
- #[cfg(wayland_platform)]
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
{
task = task.chain(
iced_winit::platform_specific::commands::activation::activate(
@@ -1215,10 +1059,10 @@ impl Cosmic {
#[allow(clippy::used_underscore_binding)]
_token,
),
- );
+ )
}
- #[cfg(not(wayland_platform))]
+ #[cfg(not(all(feature = "wayland", target_os = "linux")))]
{
task = task.chain(iced_runtime::window::gain_focus(id));
}
@@ -1235,9 +1079,10 @@ impl Cosmic {
*v == 0
}) {
self.opened_surfaces.remove(&id);
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
self.surface_views.remove(&id);
+ self.tracked_windows.remove(&id);
}
- self.surface_views.shrink_to(self.surface_views.len() * 2);
let mut ret = if let Some(msg) = self.app.on_close_requested(id) {
self.app.update(msg)
@@ -1264,7 +1109,7 @@ impl Cosmic {
return self.app.dbus_connection(conn);
}
- #[cfg(xdg_portal)]
+ #[cfg(feature = "xdg-portal")]
Action::DesktopSettings(crate::theme::portal::Desktop::ColorScheme(s)) => {
use ashpd::desktop::settings::ColorScheme;
if match THEME.lock().unwrap().theme_type {
@@ -1291,55 +1136,23 @@ impl Cosmic {
if changed {
core.theme_sub_counter += 1;
- let mut new_theme = if is_dark {
+ let new_theme = if is_dark {
crate::theme::system_dark()
} else {
crate::theme::system_light()
};
- if let ThemeType::System { .. } = new_theme.theme_type {
- let new_blur = self.blur_enabled && core.frosted(new_theme.cosmic());
- new_theme.transparent = new_blur;
- }
core.system_theme = new_theme.clone();
- let core = self.app.core();
{
let mut cosmic_theme = THEME.lock().unwrap();
// Only apply update if the theme is set to load a system theme
if let ThemeType::System { theme: _, .. } = cosmic_theme.theme_type {
- let mut cmds = Vec::with_capacity(1);
- #[cfg(wayland_platform)]
- {
- let blur = if cosmic_theme.transparent {
- iced::window::enable_blur
- } else {
- iced::window::disable_blur
- };
-
- if core.blur(&cosmic_theme, None) {
- cmds.push(blur(
- core.main_window_id().unwrap_or(window::Id::RESERVED),
- ));
- }
-
- for (id, wrapper, ..) in &self.surface_views {
- let overriden = wrapper.2(&self.app);
- if core.blur(&cosmic_theme, Some(wrapper.1))
- && overriden.blur.unwrap_or(true)
- {
- cmds.push(blur(*id));
- } else if overriden.blur.is_some_and(|b| !b) {
- cmds.push(iced::window::disable_blur(*id));
- }
- }
- }
cosmic_theme.set_theme(new_theme.theme_type);
- return Task::batch(cmds);
}
}
}
}
- #[cfg(xdg_portal)]
+ #[cfg(feature = "xdg-portal")]
Action::DesktopSettings(crate::theme::portal::Desktop::Accent(c)) => {
use palette::Srgba;
let c = Srgba::new(c.red() as f32, c.green() as f32, c.blue() as f32, 1.0);
@@ -1368,7 +1181,7 @@ impl Cosmic {
}
}
}
- #[cfg(xdg_portal)]
+ #[cfg(feature = "xdg-portal")]
Action::DesktopSettings(crate::theme::portal::Desktop::Contrast(_)) => {
// TODO when high contrast is integrated in settings and all custom themes
}
@@ -1385,12 +1198,16 @@ impl Cosmic {
}
Action::Focus(f) => {
- #[cfg(wayland_platform)]
+ #[cfg(all(
+ feature = "wayland",
+ feature = "multi-window",
+ feature = "surface-message",
+ target_os = "linux"
+ ))]
if let Some((
parent,
SurfaceIdWrapper::Subsurface(_) | SurfaceIdWrapper::Popup(_),
_,
- _,
)) = self.surface_views.get(&f)
{
// If the parent is already focused, push the new focus
@@ -1407,7 +1224,7 @@ impl Cosmic {
cur = self
.surface_views
.get(&p)
- .and_then(|(parent, _, _, _)| *parent);
+ .and_then(|(parent, _, _)| *parent);
}
parent_chain.reverse();
self.app.core_mut().focused_window = parent_chain;
@@ -1430,122 +1247,45 @@ impl Cosmic {
core.applet.suggested_bounds = b;
}
Action::Opened(id) => {
- #[cfg(wayland_platform)]
- {
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
+ if self.app.core().sync_window_border_radii_to_theme() {
+ use iced_runtime::platform_specific::wayland::CornerRadius;
use iced_winit::platform_specific::commands::corner_radius::corner_radius;
let theme = THEME.lock().unwrap();
-
+ let t = theme.cosmic();
+ let radii = t.radius_s().map(|x| if x < 4.0 { x } else { x + 4.0 });
+ let cur_rad = CornerRadius {
+ top_left: radii[0].round() as u32,
+ top_right: radii[1].round() as u32,
+ bottom_right: radii[2].round() as u32,
+ bottom_left: radii[3].round() as u32,
+ };
// TODO do we need per window sharp corners?
- let rounded = (!self.app.core().window.sharp_corners
- && self.app.core().sync_window_border_radii_to_theme())
- || self
- .surface_views
- .get(&id)
- .is_some_and(|(_, surface_type, _, _)| {
- matches!(
- surface_type,
- SurfaceIdWrapper::Popup(_) | SurfaceIdWrapper::LayerSurface(_)
- )
- });
- let new_blur = self.blur_enabled && self.app.core().frosted(theme.cosmic());
-
- let wrapper = self.surface_views.get(&id).map(|s| s.1);
-
- // this will blur untracked windows as if they were the main window
- let blur_cmd = if self.app.core().blur(&theme, wrapper)
- && self
- .surface_views
- .get(&id)
- .and_then(|s| s.2(&self.app).blur)
- .unwrap_or(true)
- {
- let blur = if new_blur {
- iced::window::enable_blur
- } else {
- iced::window::disable_blur
- };
- let mut cmds = Vec::with_capacity(1 + self.surface_views.len());
- cmds.push(blur(id));
-
- Task::batch(cmds)
- } else {
- Task::none()
- };
-
- let corner_task = if let Some((_, cur_rad)) =
- self.surface_views.get(&id).map(|s| (s.1, &s.2)).and_then(
- |(s, overriden)| {
- let overriden = overriden(&self.app);
- if let Some(c) = overriden.corners {
- Some((s, c))
- } else {
- corners(s, rounded, &theme, self.app.core().auto_corner_radius)
- .map(|c| (s, c))
- }
- },
- ) {
- corner_radius(id, Some(cur_rad)).discard()
- } else if id
- == self
- .app
- .core()
- .main_window_id()
- .unwrap_or(window::Id::RESERVED)
- {
- corner_radius(id, self.app.core().corners(&theme, rounded)).discard()
- } else {
- Task::none()
- };
+ let rounded = !self.app.core().window.sharp_corners;
return Task::batch([
- blur_cmd,
- corner_task,
+ corner_radius(
+ id,
+ if rounded {
+ Some(cur_rad)
+ } else {
+ let rad_0 = t.radius_0();
+ Some(CornerRadius {
+ top_left: rad_0[0].round() as u32,
+ top_right: rad_0[1].round() as u32,
+ bottom_right: rad_0[2].round() as u32,
+ bottom_left: rad_0[3].round() as u32,
+ })
+ },
+ )
+ .discard(),
iced_runtime::window::run_with_handle(id, init_windowing_system),
]);
}
return iced_runtime::window::run_with_handle(id, init_windowing_system);
}
- #[cfg(wayland_platform)]
- Action::BlurEnabled => {
- // TODO do this after blur event confirms support instead of for all wayland windows
- self.blur_enabled = true;
- let mut t = THEME.lock().unwrap();
-
- let new_blur = self.blur_enabled && self.app.core().frosted(t.cosmic());
-
- t.transparent = new_blur;
-
- self.app.core_mut().system_theme.transparent = new_blur;
- {
- let blur = if new_blur {
- iced::window::enable_blur
- } else {
- iced::window::disable_blur
- };
- let mut cmds = Vec::with_capacity(1 + self.surface_views.len());
- if self.app.core().blur(&t, None) {
- cmds.push(blur(
- self.app
- .core()
- .main_window_id()
- .unwrap_or(window::Id::RESERVED),
- ));
- }
- for (id, wrapper, ..) in &self.surface_views {
- let overriden = wrapper.2(&self.app);
- if self.app.core().blur(&t, Some(wrapper.1))
- && overriden.blur.unwrap_or(true)
- {
- cmds.push(blur(*id));
- } else if overriden.blur.is_some_and(|b| !b) {
- cmds.push(iced::window::disable_blur(*id));
- }
- }
- return Task::batch(cmds);
- }
- }
- _ => (),
+ _ => {}
}
iced::Task::none()
@@ -1556,273 +1296,81 @@ impl Cosmic {
pub fn new(app: App) -> Self {
Self {
app,
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
surface_views: HashMap::new(),
+ tracked_windows: HashSet::new(),
opened_surfaces: HashMap::new(),
- blur_enabled: false,
}
}
- #[cfg(feature = "surface-message")]
- /// Apply live setting overrides for a surface
- pub fn apply_live_settings(
- &mut self,
- id_wrapper: SurfaceIdWrapper,
- live_settings: &crate::surface::action::LiveSettings,
- ) -> Task> {
- let id = id_wrapper.inner();
-
- let mut cmds = Vec::with_capacity(2);
- let t = THEME.try_lock().unwrap();
-
- if let Some(blur) = live_settings.blur {
- let blur_cmd = if blur {
- if matches!(id_wrapper, SurfaceIdWrapper::Window(_)) {
- window::enable_blur(id)
- } else {
- #[cfg(wayland_platform)]
- {
- iced_winit::commands::blur::blur(
- id,
- Some(vec![iced::Rectangle::new(
- iced::Point::ORIGIN,
- iced::Size::INFINITE,
- )]),
- )
- .discard()
- }
- #[cfg(not(wayland_platform))]
- {
- iced::window::enable_blur(id)
- }
- }
- } else if matches!(id_wrapper, SurfaceIdWrapper::Window(_)) {
- window::disable_blur(id)
- } else {
- #[cfg(wayland_platform)]
- {
- iced_winit::commands::blur::blur(id, None).discard()
- }
- #[cfg(not(wayland_platform))]
- {
- iced::window::disable_blur(id)
- }
- };
- cmds.push(blur_cmd);
- } else if self.app.core().blur(&t, Some(id_wrapper)) {
- cmds.push(if matches!(id_wrapper, SurfaceIdWrapper::Window(_)) {
- window::enable_blur(id)
- } else {
- #[cfg(wayland_platform)]
- {
- iced_winit::commands::blur::blur(
- id,
- Some(vec![iced::Rectangle::new(
- iced::Point::ORIGIN,
- iced::Size::INFINITE,
- )]),
- )
- .discard()
- }
- #[cfg(not(wayland_platform))]
- {
- iced::window::enable_blur(id)
- }
- });
- }
- #[cfg(wayland_platform)]
- if let Some(corners) = live_settings.corners {
- cmds.push(
- iced_winit::commands::corner_radius::corner_radius(id, Some(corners)).discard(),
- );
- } else {
- let rounded = !self.app.core().window.sharp_corners
- && self.app.core().sync_window_border_radii_to_theme();
- if let Some(cur_rad) =
- corners(id_wrapper, rounded, &t, self.app.core().auto_corner_radius)
- {
- cmds.push(
- iced_winit::commands::corner_radius::corner_radius(id, Some(cur_rad)).discard(),
- );
- }
- }
- #[cfg(wayland_platform)]
- if let (SurfaceIdWrapper::LayerSurface(id), Some(padding)) =
- (id_wrapper, live_settings.padding)
- {
- cmds.push(iced_winit::commands::layer_surface::set_padding(
- id, padding,
- ));
- }
- Task::batch(cmds)
- }
-
- #[cfg(wayland_platform)]
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
/// Create a subsurface
pub fn get_subsurface(
&mut self,
settings: iced_runtime::platform_specific::wayland::subsurface::SctkSubsurfaceSettings,
- view: Option<
- Box Fn(&'a App) -> Element<'a, crate::Action> + Send + Sync>,
+ view: Box<
+ dyn for<'a> Fn(&'a App) -> Element<'a, crate::Action> + Send + Sync,
>,
) -> Task> {
use iced_winit::commands::subsurface::get_subsurface;
*self.opened_surfaces.entry(settings.id).or_insert_with(|| 0) += 1;
- let live_settings_task = self.apply_live_settings(
- SurfaceIdWrapper::Subsurface(settings.id),
- &LiveSettings {
- blur: None,
- corners: None,
- padding: None,
- },
- );
self.surface_views.insert(
settings.id,
(
Some(settings.parent),
SurfaceIdWrapper::Subsurface(settings.id),
- Box::new(|_| LiveSettings::default()),
view,
),
);
- Task::batch([live_settings_task, get_subsurface(settings)])
+ get_subsurface(settings)
}
- #[cfg(wayland_platform)]
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
/// Create a subsurface
pub fn get_popup(
&mut self,
settings: iced_runtime::platform_specific::wayland::popup::SctkPopupSettings,
- live_settings: Box Fn(&'a App) -> LiveSettings + Send + Sync>,
- view: Option<
- Box Fn(&'a App) -> Element<'a, crate::Action> + Send + Sync>,
+ view: Box<
+ dyn for<'a> Fn(&'a App) -> Element<'a, crate::Action> + Send + Sync,
>,
) -> Task> {
use iced_winit::commands::popup::get_popup;
*self.opened_surfaces.entry(settings.id).or_insert_with(|| 0) += 1;
- let live_settings_task = self.apply_live_settings(
- SurfaceIdWrapper::Popup(settings.id),
- &live_settings(&self.app),
- );
self.surface_views.insert(
settings.id,
(
Some(settings.parent),
SurfaceIdWrapper::Popup(settings.id),
- live_settings,
view,
),
);
- live_settings_task.chain(get_popup(settings)).discard()
+ get_popup(settings)
}
- #[cfg(wayland_platform)]
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
/// Create a window surface
pub fn get_window(
&mut self,
id: iced::window::Id,
settings: iced::window::Settings,
- live_settings: Box Fn(&'a App) -> LiveSettings + Send + Sync>,
-
- view: Option<
- Box Fn(&'a App) -> Element<'a, crate::Action> + Send + Sync>,
+ view: Box<
+ dyn for<'a> Fn(&'a App) -> Element<'a, crate::Action> + Send + Sync,
>,
) -> Task> {
use iced_winit::SurfaceIdWrapper;
*self.opened_surfaces.entry(id).or_insert(0) += 1;
- let live_settings_task =
- self.apply_live_settings(SurfaceIdWrapper::Window(id), &live_settings(&self.app));
self.surface_views.insert(
id,
(
None, // TODO parent for window, platform specific option maybe?
SurfaceIdWrapper::Window(id),
- live_settings,
view,
),
);
- Task::batch([
- iced_runtime::task::oneshot(|channel| {
- iced_runtime::Action::Window(iced_runtime::window::Action::Open(
- id, settings, channel,
- ))
- })
- .discard(),
- // We don't control window creation in the same way
- live_settings_task,
- ])
- }
-
- #[cfg(wayland_platform)]
- pub fn get_layer_shell(
- &mut self,
- settings: iced_runtime::platform_specific::wayland::layer_surface::SctkLayerSurfaceSettings,
- live_settings: Box Fn(&'a App) -> LiveSettings + Send + Sync>,
- view: Option<
- Box Fn(&'a App) -> Element<'a, crate::Action> + Send + Sync>,
- >,
- ) -> Task> {
- use iced_winit::SurfaceIdWrapper;
- use iced_winit::platform_specific::commands::layer_surface::get_layer_surface;
- *self.opened_surfaces.entry(settings.id).or_insert(0) += 1;
- let live_settings_task = self.apply_live_settings(
- SurfaceIdWrapper::LayerSurface(settings.id),
- &live_settings(&self.app),
- );
- self.surface_views.insert(
- settings.id,
- (
- None, // TODO parent for layer shell, platform specific option maybe?
- SurfaceIdWrapper::LayerSurface(settings.id),
- live_settings,
- view,
- ),
- );
- Task::batch([live_settings_task, get_layer_surface(settings)])
+ iced_runtime::task::oneshot(|channel| {
+ iced_runtime::Action::Window(iced_runtime::window::Action::Open(id, settings, channel))
+ })
+ .discard()
}
}
-
-#[cfg(wayland_platform)]
-fn corners(
- surface_type: SurfaceIdWrapper,
- rounded: bool,
- theme: &Theme,
- auto_corner_radius: BitFlags,
-) -> Option {
- if !match surface_type {
- SurfaceIdWrapper::Window(_) => auto_corner_radius.contains(Auto::Window),
- SurfaceIdWrapper::LayerSurface(_) => auto_corner_radius.contains(Auto::System),
- SurfaceIdWrapper::Popup(_) => auto_corner_radius.contains(Auto::Popup),
- _ => false,
- } {
- return None;
- }
- let theme = theme.cosmic();
- Some(if let SurfaceIdWrapper::Popup(_) = surface_type {
- let radius_m = theme.radius_m();
- iced_runtime::platform_specific::wayland::CornerRadius {
- top_left: radius_m[0].round() as u32,
- top_right: radius_m[1].round() as u32,
- bottom_right: radius_m[2].round() as u32,
- bottom_left: radius_m[3].round() as u32,
- }
- } else if let SurfaceIdWrapper::Window(_) = surface_type
- && !rounded
- {
- let radius_0 = theme.radius_0();
- iced_runtime::platform_specific::wayland::CornerRadius {
- top_left: radius_0[0].round() as u32,
- top_right: radius_0[1].round() as u32,
- bottom_right: radius_0[2].round() as u32,
- bottom_left: radius_0[3].round() as u32,
- }
- } else {
- let radius_s = theme.radius_s().map(|x| if x < 4.0 { x } else { x + 4.0 });
- iced_runtime::platform_specific::wayland::CornerRadius {
- top_left: radius_s[0].round() as u32,
- top_right: radius_s[1].round() as u32,
- bottom_right: radius_s[2].round() as u32,
- bottom_left: radius_s[3].round() as u32,
- }
- })
-}
diff --git a/src/app/mod.rs b/src/app/mod.rs
index ded57543..f78beac7 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::{Color, 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,
@@ -389,17 +389,10 @@ where
let mut nav =
crate::widget::nav_bar(nav_model, |id| crate::Action::Cosmic(Action::NavBar(id)))
.on_context(|id| crate::Action::Cosmic(Action::NavBarContext(id)))
- .context_menu(self.nav_context_menu());
- #[cfg(wayland_platform)]
- {
- nav = nav
- .window_id_maybe(self.core().main_window_id())
- .on_surface_action(|m| crate::Action::Cosmic(crate::app::Action::Surface(m)))
- }
- let mut nav = nav
- .into_container()
- .width(iced::Length::Shrink)
- .height(iced::Length::Fill);
+ .context_menu(self.nav_context_menu(self.core().nav_bar_context()))
+ .into_container()
+ .width(iced::Length::Shrink)
+ .height(iced::Length::Fill);
if !self.core().is_condensed() {
nav = nav.max_width(280);
@@ -409,7 +402,10 @@ where
}
/// Shows a context menu for the active nav bar item.
- fn nav_context_menu(&self) -> Option>>> {
+ fn nav_context_menu(
+ &self,
+ id: nav_bar::Id,
+ ) -> Option>>> {
None
}
@@ -622,28 +618,27 @@ impl ApplicationExt for App {
let focused = core
.focus_chain()
.iter()
- .any(|i| Some(*i) == core.main_window_id());
+ .any(|i| Some(*i) == self.core().main_window_id());
- let border_padding = core
- .window
- .border_padding
- .unwrap_or(if maximized { 8 } else { 7 });
+ let border_padding = if maximized { 8 } else { 7 };
- let main_content_padding = if content_container {
+ let main_content_padding = if !content_container {
+ [0, 0, 0, 0]
+ } else {
let right_padding = if show_context { 0 } else { border_padding };
let left_padding = if nav_bar_active { 0 } else { border_padding };
[0, right_padding, 0, left_padding]
- } else {
- [0, 0, 0, 0]
};
let content_row = crate::widget::row::with_children({
let mut widgets = Vec::with_capacity(3);
// Insert nav bar onto the left side of the window.
- let has_nav = if let Some(nav) = self.nav_bar() {
- let nav = id_container(nav, iced_core::id::Id::new("COSMIC_nav_bar"));
+ let has_nav = if let Some(nav) = self
+ .nav_bar()
+ .map(|nav| id_container(nav, iced_core::id::Id::new("COSMIC_nav_bar")))
+ {
widgets.push(
container(nav)
.padding([
@@ -778,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))
@@ -830,7 +826,7 @@ impl ApplicationExt for App {
let cosmic = theme.cosmic();
container::Style {
background: Some(iced::Background::Color(
- cosmic.background(theme.transparent).base.into(),
+ cosmic.background.base.into(),
)),
border: iced::Border {
radius: [
@@ -859,7 +855,7 @@ impl ApplicationExt for App {
container::Style {
background: if content_container {
Some(iced::Background::Color(
- theme.cosmic().background(theme.transparent).base.into(),
+ theme.cosmic().background.base.into(),
))
} else {
None
diff --git a/src/app/settings.rs b/src/app/settings.rs
index 0c101741..5c903f09 100644
--- a/src/app/settings.rs
+++ b/src/app/settings.rs
@@ -16,7 +16,7 @@ pub struct Settings {
pub(crate) antialiasing: bool,
/// Autosize the window to fit its contents
- #[cfg(wayland_platform)]
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
pub(crate) autosize: bool,
/// Set the application to not create a main window
@@ -80,7 +80,7 @@ impl Default for Settings {
fn default() -> Self {
Self {
antialiasing: true,
- #[cfg(wayland_platform)]
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
autosize: false,
no_main_window: false,
client_decorations: true,
diff --git a/src/applet/column.rs b/src/applet/column.rs
index 1ec9c731..9657b566 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 37635bf4..48721e1c 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;
@@ -221,7 +227,7 @@ impl Context {
let icon = widget::icon(icon)
.class(if symbolic {
theme::Svg::Custom(Rc::new(|theme| iced_widget::svg::Style {
- color: Some(theme.cosmic().background(theme.transparent).on.into()),
+ color: Some(theme.cosmic().background.on.into()),
}))
} else {
theme::Svg::default()
@@ -372,17 +378,16 @@ impl Context {
Container::::new(content).style(|theme| {
let cosmic = theme.cosmic();
let corners = cosmic.corner_radii;
- let mut bg = cosmic.background(theme.transparent).base;
iced_widget::container::Style {
- text_color: Some(cosmic.background(theme.transparent).on.into()),
- background: Some(Color::from(bg).into()),
+ text_color: Some(cosmic.background.on.into()),
+ background: Some(Color::from(cosmic.background.base).into()),
border: iced::Border {
radius: corners.radius_m.into(),
width: 1.0,
- color: cosmic.background(theme.transparent).divider.into(),
+ color: cosmic.background.divider.into(),
},
shadow: Shadow::default(),
- icon_color: Some(cosmic.background(theme.transparent).on.into()),
+ icon_color: Some(cosmic.background.on.into()),
snap: true,
}
}),
@@ -560,7 +565,6 @@ pub fn run(flags: App::Flags) -> iced::Result {
core.window.show_maximize = false;
core.window.show_minimize = false;
core.window.use_template = false;
- core.app_type = crate::core::AppType::Applet;
window_settings.decorations = false;
window_settings.exit_on_close_request = true;
diff --git a/src/applet/row.rs b/src/applet/row.rs
index 888c68ef..a6745d1c 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 64be0ce2..07c528ea 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 3bbaf573..3db84fc4 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 dd9f6269..1d6f635c 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -1,7 +1,7 @@
// Copyright 2023 System76
// SPDX-License-Identifier: MPL-2.0
-#[cfg(xdg_portal)]
+#[cfg(feature = "xdg-portal")]
use std::os::fd::AsFd;
use iced::window;
@@ -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)
}
@@ -45,7 +47,7 @@ pub fn toggle_maximize(id: window::Id) -> iced::Task> {
iced_runtime::window::toggle_maximize(id)
}
-#[cfg(xdg_portal)]
+#[cfg(feature = "xdg-portal")]
pub fn file_transfer_send(
writeable: bool,
auto_stop: bool,
@@ -61,8 +63,9 @@ pub fn file_transfer_send(
/// Receive the files offered over the xdg share portal using the `key`.
/// Returns a list of file paths.
-#[cfg(xdg_portal)]
+#[cfg(feature = "xdg-portal")]
pub fn file_transfer_receive(key: String) -> iced::Task>> {
+ dbg!(&key);
iced::Task::future(async move {
let file_transfer = ashpd::documents::FileTransfer::new().await?;
file_transfer.retrieve_files(&key).await
diff --git a/src/config/mod.rs b/src/config/mod.rs
index 08a4c0ca..9807961c 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 af992c25..970a5351 100644
--- a/src/core.rs
+++ b/src/core.rs
@@ -6,7 +6,6 @@ use std::collections::HashMap;
use crate::widget::nav_bar;
use cosmic_config::CosmicConfigEntry;
use cosmic_theme::ThemeMode;
-use enumflags2::{self, BitFlags, bitflags};
use iced::{Limits, Size, window};
use iced_core::window::Id;
use palette::Srgba;
@@ -40,23 +39,10 @@ pub struct Window {
pub show_maximize: bool,
pub show_minimize: bool,
pub is_maximized: bool,
- pub border_padding: Option,
height: f32,
width: f32,
}
-#[bitflags]
-#[repr(u8)]
-#[derive(Copy, Clone, Debug, PartialEq)]
-pub enum Auto {
- /// Automatically apply effect to regular windows
- Window,
- /// Automatically apply effect to popups
- Popup,
- /// Automatically apply effect to system interface elements (layer shell surfaces)
- System,
-}
-
/// COSMIC-specific application settings
#[derive(Clone)]
pub struct Core {
@@ -92,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,
@@ -111,21 +99,8 @@ pub struct Core {
pub(crate) menu_bars: HashMap,
- pub(crate) auto_blur: BitFlags,
-
- pub(crate) auto_corner_radius: BitFlags,
-
- pub(crate) app_type: AppType,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum AppType {
- /// A regular application
- Window,
- /// A system application
- System,
- /// An applet
- Applet,
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
+ pub(crate) sync_window_border_radii_to_theme: bool,
}
impl Default for Core {
@@ -170,7 +145,6 @@ impl Default for Core {
is_maximized: false,
height: 0.,
width: 0.,
- border_padding: None,
},
focused_window: Vec::new(),
#[cfg(feature = "applet")]
@@ -181,12 +155,12 @@ 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(),
- auto_blur: Auto::System | Auto::Popup | Auto::Window,
- auto_corner_radius: Auto::System | Auto::Popup | Auto::Window,
- app_type: AppType::Window,
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
+ sync_window_border_radii_to_theme: true,
}
}
}
@@ -458,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();
@@ -465,6 +440,7 @@ impl Core {
crate::command::drag(id)
}
+ #[cfg(feature = "winit")]
pub fn maximize(
&self,
id: Option,
@@ -476,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();
@@ -483,6 +460,7 @@ impl Core {
crate::command::minimize(id)
}
+ #[cfg(feature = "winit")]
pub fn set_title(
&self,
id: Option,
@@ -494,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();
@@ -501,6 +480,7 @@ impl Core {
crate::command::set_windowed(id)
}
+ #[cfg(feature = "winit")]
pub fn toggle_maximize(
&self,
id: Option,
@@ -512,126 +492,14 @@ impl Core {
crate::command::toggle_maximize(id)
}
- #[cfg(wayland_platform)]
+ // TODO should we emit tasks setting the corner radius or unsetting it if this is changed?
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
+ pub fn set_sync_window_border_radii_to_theme(&mut self, sync: bool) {
+ self.sync_window_border_radii_to_theme = sync;
+ }
+
+ #[cfg(all(feature = "wayland", target_os = "linux"))]
pub fn sync_window_border_radii_to_theme(&self) -> bool {
- match self.app_type {
- AppType::Window => self.auto_corner_radius.contains(Auto::Window),
- AppType::System => self.auto_corner_radius.contains(Auto::System),
- AppType::Applet => false,
- }
- }
-
- pub fn set_auto_blur(&mut self, auto_blur: BitFlags) {
- self.auto_blur = auto_blur;
- }
-
- pub fn auto_blur(&self) -> BitFlags {
- self.auto_blur
- }
-
- /// Whether the active theme's frosted (blur) styling should apply to this
- /// app's surfaces.
- #[must_use]
- pub fn frosted(&self, theme: &cosmic_theme::Theme) -> bool {
- if self.auto_blur.is_empty() {
- return false;
- }
- match self.app_type {
- AppType::Window => theme.frosted_windows,
- AppType::System => theme.frosted_system_interface,
- AppType::Applet => theme.frosted_applets,
- }
- }
-
- pub fn set_auto_corner_radius(&mut self, auto_corner_radius: BitFlags) {
- self.auto_corner_radius = auto_corner_radius;
- }
-
- pub fn auto_corner_radius(&self) -> BitFlags {
- self.auto_corner_radius
- }
-
- pub fn set_app_type(&mut self, app_type: AppType) {
- self.app_type = app_type;
- }
-
- pub fn app_type(&self) -> AppType {
- self.app_type
- }
-
- #[must_use]
- pub fn blur(
- &self,
- theme: &Theme,
- surface_id_wrapper: Option,
- ) -> bool {
- use iced_winit::SurfaceIdWrapper;
- let theme = theme.cosmic();
- match surface_id_wrapper {
- Some(SurfaceIdWrapper::LayerSurface(_)) => {
- theme.frosted_system_interface && self.auto_blur.contains(Auto::System)
- }
- Some(SurfaceIdWrapper::Window(_)) => {
- theme.frosted_windows && self.auto_blur.contains(Auto::Window)
- }
- Some(SurfaceIdWrapper::Popup(_)) => {
- self.auto_blur.contains(Auto::Popup)
- && match self.app_type {
- AppType::Window => theme.frosted_windows,
- AppType::System => theme.frosted_system_interface,
- AppType::Applet => theme.frosted_applets,
- }
- }
- None => match self.app_type {
- AppType::Window => theme.frosted_windows && self.auto_blur.contains(Auto::Window),
- AppType::System => {
- theme.frosted_system_interface && self.auto_blur.contains(Auto::System)
- }
- AppType::Applet => false,
- },
- _ => false,
- }
- }
-
- /// Calculate suggested corners for each app type main window
- #[must_use]
- #[cfg(wayland_platform)]
- pub fn corners(
- &self,
- theme: &Theme,
- rounded: bool,
- ) -> Option {
- if !self.sync_window_border_radii_to_theme() {
- return None;
- }
- let theme = theme.cosmic();
- let ret = if let AppType::Applet = self.app_type {
- let radius_l = theme.radius_l();
- iced_runtime::platform_specific::wayland::CornerRadius {
- top_left: radius_l[0].round() as u32,
- top_right: radius_l[1].round() as u32,
- bottom_right: radius_l[2].round() as u32,
- bottom_left: radius_l[3].round() as u32,
- }
- } else if let AppType::Window = self.app_type
- && !rounded
- {
- let radius_0 = theme.radius_0();
- iced_runtime::platform_specific::wayland::CornerRadius {
- top_left: radius_0[0].round() as u32,
- top_right: radius_0[1].round() as u32,
- bottom_right: radius_0[2].round() as u32,
- bottom_left: radius_0[3].round() as u32,
- }
- } else {
- let radius_s = theme.radius_s().map(|x| if x < 4.0 { x } else { x + 4.0 });
- iced_runtime::platform_specific::wayland::CornerRadius {
- top_left: radius_s[0].round() as u32,
- top_right: radius_s[1].round() as u32,
- bottom_right: radius_s[2].round() as u32,
- bottom_left: radius_s[3].round() as u32,
- }
- };
- Some(ret)
+ self.sync_window_border_radii_to_theme
}
}
diff --git a/src/dbus_activation.rs b/src/dbus_activation.rs
index 880db634..99e2f9f0 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