leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Use globals instead of thread-locals

Browse source 
Better support for multi-threaded applications,
especially cosmic-comp rendering in parallel on
multiple threads, each potentially accessing
global configurations such as the active theme,
icon_theme and more...
This commit is contained in:
Victoria Brekenfeld 2024-08-02 20:00:16 +02:00 • committed by Michael Murphy
parent f655710d55
commit b40839638a
16 changed files with 183 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/theme/mod.rs
View file

@ -15,8 +15,7 @@ use cosmic_theme::Component;
use cosmic_theme::LayeredTheme;
use iced_futures::Subscription;
use std::cell::RefCell;
use std::sync::Arc;
use std::sync::{Arc, Mutex};
#[cfg(feature = "dbus-config")]
use cosmic_config::dbus;
@ -46,18 +45,21 @@ lazy_static::lazy_static! {
};
}
thread_local! {
pub(crate) static THEME: RefCell<Theme> = RefCell::new(Theme { theme_type: ThemeType::Dark, layer: cosmic_theme::Layer::Background });
}
pub(crate) static THEME: Mutex<Theme> = Mutex::new(Theme {
theme_type: ThemeType::Dark,
layer: cosmic_theme::Layer::Background,
});
/// Currently-defined theme.
#[allow(clippy::missing_panics_doc)]
pub fn active() -> Theme {
THEME.with(|theme| theme.borrow().clone())
THEME.lock().unwrap().clone()
}
/// Currently-defined theme type.
#[allow(clippy::missing_panics_doc)]
pub fn active_type() -> ThemeType {
THEME.with(|theme| theme.borrow().theme_type.clone())
THEME.lock().unwrap().theme_type.clone()
}
/// Whether the active theme has a dark preference.