chore(appearance): disable wrapping for style text

Also updates all workspace members to Rust 2024, removes `once_cell` and updates dependencies.
This commit is contained in:
Vukašin Vojinović 2025-07-31 14:43:37 +02:00 committed by Michael Murphy
parent f536038489
commit a0f7b31d89
14 changed files with 284 additions and 341 deletions

520
Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -8,7 +8,7 @@ rust-version = "1.85.0"
[workspace.dependencies] [workspace.dependencies]
cosmic-randr = { git = "https://github.com/pop-os/cosmic-randr" } cosmic-randr = { git = "https://github.com/pop-os/cosmic-randr" }
tokio = { version = "1.43.0", features = ["macros"] } tokio = { version = "1.47.0", features = ["macros"] }
[workspace.dependencies.libcosmic] [workspace.dependencies.libcosmic]
features = ["multi-window", "winit", "tokio"] features = ["multi-window", "winit", "tokio"]

View file

@ -8,13 +8,13 @@ license = "GPL-3.0-only"
accounts-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } accounts-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
anyhow = "1.0" anyhow = "1.0"
as-result = "0.2.1" as-result = "0.2.1"
ashpd = { version = "0.9", default-features = false, features = [ ashpd = { version = "0.11", default-features = false, features = [
"tokio", "tokio",
], optional = true } ], optional = true }
async-channel = "2.3.1" async-channel = "2.5.0"
chrono = "0.4.40" chrono = "0.4.41"
clap = { version = "4.5.32", features = ["derive"] } clap = { version = "4.5.42", features = ["derive"] }
color-eyre = "0.6.3" color-eyre = "0.6.5"
cosmic-bg-config.workspace = true cosmic-bg-config.workspace = true
cosmic-comp-config = { workspace = true, optional = true } cosmic-comp-config = { workspace = true, optional = true }
cosmic-config.workspace = true cosmic-config.workspace = true
@ -31,15 +31,15 @@ cosmic-settings-system = { path = "../pages/system", optional = true }
cosmic-settings-wallpaper = { path = "../pages/wallpapers" } cosmic-settings-wallpaper = { path = "../pages/wallpapers" }
cosmic-settings-daemon-config = { git = "https://github.com/pop-os/cosmic-settings-daemon", optional = true } cosmic-settings-daemon-config = { git = "https://github.com/pop-os/cosmic-settings-daemon", optional = true }
derivative = "2.2.0" derivative = "2.2.0"
derive_setters = "0.1.6" derive_setters = "0.1.8"
dirs = "5.0.1" dirs = "6.0.0"
downcast-rs = "1.2.1" downcast-rs = "2.0.1"
eyre = "0.6.12" eyre = "0.6.12"
freedesktop-desktop-entry = "0.7.9" freedesktop-desktop-entry = "0.7.13"
futures = "0.3.31" futures = "0.3.31"
hostname-validator = "1.1.1" hostname-validator = "1.1.1"
hostname1-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } hostname1-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
i18n-embed-fl = "0.9.3" i18n-embed-fl = "0.10.0"
image = { version = "0.25", default-features = false, features = [ image = { version = "0.25", default-features = false, features = [
"jpeg", "jpeg",
"png", "png",
@ -47,23 +47,22 @@ image = { version = "0.25", default-features = false, features = [
"webp", "webp",
"hdr", "hdr",
] } ] }
indexmap = "2.8.0" indexmap = "2.10.0"
itertools = "0.13.0" itertools = "0.14.0"
itoa = "1.0.15" itoa = "1.0.15"
libcosmic.workspace = true libcosmic.workspace = true
locale1 = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } locale1 = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
mime-apps = { package = "cosmic-mime-apps", git = "https://github.com/pop-os/cosmic-mime-apps", optional = true } mime-apps = { package = "cosmic-mime-apps", git = "https://github.com/pop-os/cosmic-mime-apps", optional = true }
notify = "6.1.1" notify = "6.1.1"
once_cell = "1.21.1"
regex = "1.11.1" regex = "1.11.1"
ron = "0.9.0" ron = "0.10.1"
rust-embed = "8.6.0" rust-embed = "8.7.2"
sctk = { workspace = true, optional = true } sctk = { workspace = true, optional = true }
secure-string = "0.3.0" secure-string = "0.3.0"
serde = { version = "1.0.219", features = ["derive"] } serde = { version = "1.0.219", features = ["derive"] }
slab = "0.4.9" slab = "0.4.10"
slotmap = "1.0.7" slotmap = "1.0.7"
static_init = "1.0.3" static_init = "1.0.4"
sunrise = "2.1.0" sunrise = "2.1.0"
tachyonix = "0.3.1" tachyonix = "0.3.1"
timedate-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } timedate-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
@ -75,14 +74,14 @@ upower_dbus = { git = "https://github.com/pop-os/dbus-settings-bindings", option
bluez-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } bluez-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
url = "2.5.4" url = "2.5.4"
xkb-data = "0.2.1" xkb-data = "0.2.1"
zbus = { version = "5.7.1", default-features = false, features = [ zbus = { version = "5.9.0", default-features = false, features = [
"tokio", "tokio",
], optional = true } ], optional = true }
zbus_polkit = { version = "5.0.0", optional = true } zbus_polkit = { version = "5.0.0", optional = true }
fontdb = "0.23.0" fontdb = "0.23.0"
fixed_decimal = "0.5.6" fixed_decimal = "0.5.6"
mime = "0.3.17" mime = "0.3.17"
rustix = { version = "1.0.3", features = ["process"] } rustix = { version = "1.0.8", features = ["process"] }
gettext-rs = { version = "0.7.2", features = [ gettext-rs = { version = "0.7.2", features = [
"gettext-system", "gettext-system",
], optional = true } ], optional = true }
@ -96,7 +95,7 @@ version = "1.5.0"
features = ["experimental", "compiled_data", "icu_datetime_experimental"] features = ["experimental", "compiled_data", "icu_datetime_experimental"]
[dependencies.i18n-embed] [dependencies.i18n-embed]
version = "0.15.3" version = "0.16.0"
features = ["fluent-system", "desktop-requester"] features = ["fluent-system", "desktop-requester"]
# Contains region-handling logic for Linux # Contains region-handling logic for Linux

View file

@ -5,14 +5,14 @@ use i18n_embed::{
DefaultLocalizer, LanguageLoader, Localizer, DefaultLocalizer, LanguageLoader, Localizer,
fluent::{FluentLanguageLoader, fluent_language_loader}, fluent::{FluentLanguageLoader, fluent_language_loader},
}; };
use once_cell::sync::Lazy;
use rust_embed::RustEmbed; use rust_embed::RustEmbed;
use std::sync::LazyLock;
#[derive(RustEmbed)] #[derive(RustEmbed)]
#[folder = "../i18n/"] #[folder = "../i18n/"]
struct Localizations; struct Localizations;
pub static LANGUAGE_LOADER: Lazy<FluentLanguageLoader> = Lazy::new(|| { pub static LANGUAGE_LOADER: LazyLock<FluentLanguageLoader> = LazyLock::new(|| {
let loader: FluentLanguageLoader = fluent_language_loader!(); let loader: FluentLanguageLoader = fluent_language_loader!();
loader loader

View file

@ -2,7 +2,6 @@ use cosmic::app::{ContextDrawer, context_drawer};
use cosmic::config::CosmicTk; use cosmic::config::CosmicTk;
use cosmic::cosmic_config::{Config, ConfigSet}; use cosmic::cosmic_config::{Config, ConfigSet};
use cosmic::cosmic_theme::Spacing; use cosmic::cosmic_theme::Spacing;
use cosmic::cosmic_theme::palette::{FromColor, Hsv, Srgb};
use cosmic::iced_core::{Color, Length}; use cosmic::iced_core::{Color, Length};
use cosmic::widget::{ use cosmic::widget::{
ColorPickerModel, color_picker::ColorPickerUpdate, container, flex_row, settings, text, ColorPickerModel, color_picker::ColorPickerUpdate, container, flex_row, settings, text,

View file

@ -15,9 +15,7 @@ use cosmic::app::ContextDrawer;
use cosmic::config::CosmicTk; use cosmic::config::CosmicTk;
use cosmic::cosmic_config::{Config, ConfigSet, CosmicConfigEntry}; use cosmic::cosmic_config::{Config, ConfigSet, CosmicConfigEntry};
use cosmic::cosmic_theme::palette::{FromColor, Hsv, Srgb}; use cosmic::cosmic_theme::palette::{FromColor, Hsv, Srgb};
use cosmic::cosmic_theme::{ use cosmic::cosmic_theme::{CornerRadii, Density, Theme, ThemeBuilder};
CornerRadii, DARK_THEME_BUILDER_ID, Density, LIGHT_THEME_BUILDER_ID, Theme, ThemeBuilder,
};
#[cfg(feature = "xdg-portal")] #[cfg(feature = "xdg-portal")]
use cosmic::dialog::file_chooser::{self, FileFilter}; use cosmic::dialog::file_chooser::{self, FileFilter};
use cosmic::iced_core::{Alignment, Length}; use cosmic::iced_core::{Alignment, Length};

View file

@ -1,4 +1,4 @@
use cosmic::iced_core::{Alignment, Length}; use cosmic::iced_core::{Alignment, Length, text::Wrapping};
use cosmic::widget::icon::{from_name, icon}; use cosmic::widget::icon::{from_name, icon};
use cosmic::widget::{button, container, settings, text}; use cosmic::widget::{button, container, settings, text};
use cosmic::{Apply, Element}; use cosmic::{Apply, Element};
@ -72,7 +72,7 @@ pub fn section() -> Section<crate::pages::Message> {
.apply(container) .apply(container)
.width(Length::Fixed(191.0)) .width(Length::Fixed(191.0))
.class(style_container()), .class(style_container()),
text::body(&descriptions[round]) text::body(&descriptions[round]).wrapping(Wrapping::None)
] ]
.spacing(8) .spacing(8)
.width(Length::FillPortion(1)) .width(Length::FillPortion(1))
@ -97,7 +97,7 @@ pub fn section() -> Section<crate::pages::Message> {
.apply(container) .apply(container)
.width(Length::Fixed(191.0)) .width(Length::Fixed(191.0))
.class(style_container()), .class(style_container()),
text::body(&descriptions[slightly_round]) text::body(&descriptions[slightly_round]).wrapping(Wrapping::None)
] ]
.spacing(8) .spacing(8)
.width(Length::FillPortion(1)) .width(Length::FillPortion(1))
@ -123,7 +123,7 @@ pub fn section() -> Section<crate::pages::Message> {
.apply(container) .apply(container)
.width(Length::Fixed(191.0)) .width(Length::Fixed(191.0))
.class(style_container()), .class(style_container()),
text::body(&descriptions[square]) text::body(&descriptions[square]).wrapping(Wrapping::None)
] ]
.spacing(8) .spacing(8)
.align_x(Alignment::Center) .align_x(Alignment::Center)

View file

@ -25,10 +25,9 @@ use cosmic::{
}, },
theme, theme,
}; };
use once_cell::sync::Lazy;
use std::path::PathBuf; use std::path::{Path, PathBuf};
use std::{borrow::Cow, fmt::Debug, mem, path::Path}; use std::{borrow::Cow, fmt::Debug, mem, sync::LazyLock};
use crate::{app, pages}; use crate::{app, pages};
use cosmic_panel_config::CosmicPanelConfig; use cosmic_panel_config::CosmicPanelConfig;
@ -49,7 +48,7 @@ const MIME_TYPE: &str = "text/uri-list";
// radius is 8.0 // radius is 8.0
const DRAG_START_DISTANCE_SQUARED: f32 = 64.0; const DRAG_START_DISTANCE_SQUARED: f32 = 64.0;
pub static APPLET_DND_ICON_ID: Lazy<window::Id> = Lazy::new(window::Id::unique); pub static APPLET_DND_ICON_ID: LazyLock<window::Id> = LazyLock::new(window::Id::unique);
pub struct Page { pub struct Page {
pub(crate) entity: page::Entity, pub(crate) entity: page::Entity,

View file

@ -214,7 +214,7 @@ pub(crate) fn style<
PanelSize::M => 2, PanelSize::M => 2,
PanelSize::L => 3, PanelSize::L => 3,
PanelSize::XL => 4, PanelSize::XL => 4,
PanelSize::Custom(s) => 2, PanelSize::Custom(_) => 2,
}, },
|v| { |v| {
if v == 0 { if v == 0 {

View file

@ -16,17 +16,17 @@ use cosmic_randr_shell::{
AdaptiveSyncAvailability, AdaptiveSyncState, List, Output, OutputKey, Transform, AdaptiveSyncAvailability, AdaptiveSyncState, List, Output, OutputKey, Transform,
}; };
use cosmic_settings_page::{self as page, Section, section}; use cosmic_settings_page::{self as page, Section, section};
use once_cell::sync::Lazy;
use slab::Slab; use slab::Slab;
use slotmap::{Key, SecondaryMap, SlotMap}; use slotmap::{Key, SecondaryMap, SlotMap};
use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::atomic::{AtomicBool, Ordering};
use std::{collections::BTreeMap, process::ExitStatus, sync::Arc}; use std::sync::{Arc, LazyLock};
use std::{collections::BTreeMap, process::ExitStatus};
use tokio::sync::oneshot; use tokio::sync::oneshot;
static DPI_SCALES: &[u32] = &[50, 75, 100, 125, 150, 175, 200, 225, 250, 275, 300]; static DPI_SCALES: &[u32] = &[50, 75, 100, 125, 150, 175, 200, 225, 250, 275, 300];
static DPI_SCALE_LABELS: Lazy<Vec<String>> = static DPI_SCALE_LABELS: LazyLock<Vec<String>> =
Lazy::new(|| DPI_SCALES.iter().map(|scale| format!("{scale}%")).collect()); LazyLock::new(|| DPI_SCALES.iter().map(|scale| format!("{scale}%")).collect());
/// Display color depth options /// Display color depth options
#[allow(dead_code)] #[allow(dead_code)]

View file

@ -4,11 +4,11 @@ version = "0.1.0"
edition = "2024" edition = "2024"
[dependencies] [dependencies]
derive_setters = "0.1.6" derive_setters = "0.1.8"
regex = "1.11.1" regex = "1.11.1"
slotmap = "1.0.7" slotmap = "1.0.7"
libcosmic = { workspace = true } libcosmic = { workspace = true }
downcast-rs = "1.2.1" downcast-rs = "2.0.1"
tokio.workspace = true tokio.workspace = true
url = "2.5.4" url = "2.5.4"
slab = "0.4.9" slab = "0.4.10"

View file

@ -1,7 +1,7 @@
[package] [package]
name = "cosmic-settings-system" name = "cosmic-settings-system"
version = "0.1.0" version = "0.1.0"
edition = "2021" edition = "2024"
license = "GPL-3.0-only" license = "GPL-3.0-only"
rust-version.workspace = true rust-version.workspace = true
@ -11,9 +11,9 @@ rust-version.workspace = true
byte-unit = "5.1.6" byte-unit = "5.1.6"
const_format = "0.2.34" const_format = "0.2.34"
concat-in-place = "1.1.0" concat-in-place = "1.1.0"
sysinfo = "0.31.4" sysinfo = "0.36.1"
memchr = "2.7.4" memchr = "2.7.5"
[dependencies.bumpalo] [dependencies.bumpalo]
version = "3.17.0" version = "3.19.0"
features = ["collections"] features = ["collections"]

View file

@ -1,7 +1,7 @@
[package] [package]
name = "cosmic-settings-wallpaper" name = "cosmic-settings-wallpaper"
version = "0.1.0" version = "0.1.0"
edition = "2021" edition = "2024"
rust-version.workspace = true rust-version.workspace = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@ -10,7 +10,7 @@ rust-version.workspace = true
cosmic-bg-config = { workspace = true } cosmic-bg-config = { workspace = true }
cosmic-config = { workspace = true } cosmic-config = { workspace = true }
cosmic-randr-shell = { workspace = true } cosmic-randr-shell = { workspace = true }
dirs = "5.0.1" dirs = "6.0.0"
eyre = "0.6.12" eyre = "0.6.12"
# Upstream version 5.0.0 has compilation error on Redox's toolchain # Upstream version 5.0.0 has compilation error on Redox's toolchain
fast_image_resize = { git = "https://github.com/jackpot51/fast_image_resize.git", features = [ fast_image_resize = { git = "https://github.com/jackpot51/fast_image_resize.git", features = [
@ -19,9 +19,9 @@ fast_image_resize = { git = "https://github.com/jackpot51/fast_image_resize.git"
freedesktop-icons = { package = "cosmic-freedesktop-icons", git = "https://github.com/pop-os/freedesktop-icons" } freedesktop-icons = { package = "cosmic-freedesktop-icons", git = "https://github.com/pop-os/freedesktop-icons" }
futures-lite = "2.6.0" futures-lite = "2.6.0"
futures-util = "0.3.31" futures-util = "0.3.31"
image = "0.25.5" image = "0.25.6"
infer = "0.16.0" infer = "0.19.0"
jxl-oxide = "0.11.3" jxl-oxide = "0.12.2"
tokio = { version = "1.44.1", features = ["sync"] } tokio = { version = "1.47.0", features = ["sync"] }
tracing = "0.1.41" tracing = "0.1.41"
walkdir = "=2.5.0" walkdir = "=2.5.0"

View file

@ -1,5 +1,5 @@
pub use cosmic_bg_config::{Color, Config, Entry, Gradient, ScalingMode, Source}; pub use cosmic_bg_config::{Color, Config, Entry, Gradient, ScalingMode, Source};
use eyre::{eyre, OptionExt}; use eyre::{OptionExt, eyre};
use fast_image_resize::SrcCropping; use fast_image_resize::SrcCropping;
use futures_lite::Stream; use futures_lite::Stream;
use futures_util::StreamExt; use futures_util::StreamExt;
@ -9,7 +9,7 @@ use jxl_oxide::{EnumColourEncoding, JxlImage, PixelFormat};
use std::os::unix::ffi::OsStrExt; use std::os::unix::ffi::OsStrExt;
use std::{ use std::{
borrow::Cow, borrow::Cow,
collections::{hash_map::DefaultHasher, HashMap}, collections::{HashMap, hash_map::DefaultHasher},
hash::{Hash, Hasher}, hash::{Hash, Hasher},
io::Read, io::Read,
path::{Path, PathBuf}, path::{Path, PathBuf},