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

Add _with_flags() variants to settings helpers (#85)

Browse source
This commit is contained in:
Ian Douglas Scott 2023-02-20 14:26:31 -08:00 • committed by GitHub
parent 8232e1d249
commit 2dde95ee42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/applet/mod.rs
View file

@ -81,20 +81,26 @@ impl CosmicAppletHelper {
#[must_use] #[must_use]
pub fn window_settings<F: Default>(&self) -> Settings<F> { pub fn window_settings<F: Default>(&self) -> Settings<F> {
let mut settings = crate::settings(); self.window_settings_with_flags(F::default())
}
#[must_use]
pub fn window_settings_with_flags<F>(&self, flags: F) -> Settings<F> {
let (width, height) = self.suggested_size(); let (width, height) = self.suggested_size();
let width = u32::from(width); let width = u32::from(width);
let height = u32::from(height); let height = u32::from(height);
settings.initial_surface = InitialSurface::XdgWindow(SctkWindowSettings { Settings {
iced_settings: iced_native::window::Settings { initial_surface: InitialSurface::XdgWindow(SctkWindowSettings {
size: (width + APPLET_PADDING * 2, height + APPLET_PADDING * 2), iced_settings: iced_native::window::Settings {
min_size: Some((width + APPLET_PADDING * 2, height + APPLET_PADDING * 2)), size: (width + APPLET_PADDING * 2, height + APPLET_PADDING * 2),
max_size: Some((width + APPLET_PADDING * 2, height + APPLET_PADDING * 2)), min_size: Some((width + APPLET_PADDING * 2, height + APPLET_PADDING * 2)),
max_size: Some((width + APPLET_PADDING * 2, height + APPLET_PADDING * 2)),
..Default::default()
},
..Default::default() ..Default::default()
}, }),
..Default::default() ..crate::settings_with_flags(flags)
}); }
settings
} }
#[must_use] #[must_use]

2
src/lib.rs
View file

@ -24,7 +24,7 @@ pub mod widget;
pub use executor::single::Executor as SingleThreadExecutor; pub use executor::single::Executor as SingleThreadExecutor;
pub mod settings; pub mod settings;
pub use settings::settings; pub use settings::{settings, settings_with_flags};
mod ext; mod ext;
pub use ext::ElementExt; pub use ext::ElementExt;

8
src/settings.rs
View file

@ -20,12 +20,18 @@ pub fn set_default_icon_theme(name: impl Into<String>) {
/// Default iced settings for COSMIC applications. /// Default iced settings for COSMIC applications.
#[must_use] #[must_use]
pub fn settings<Flags: Default>() -> iced::Settings<Flags> { pub fn settings<Flags: Default>() -> iced::Settings<Flags> {
settings_with_flags(Flags::default())
}
/// Default iced settings for COSMIC applications.
#[must_use]
pub fn settings_with_flags<Flags>(flags: Flags) -> iced::Settings<Flags> {
iced::Settings { iced::Settings {
default_font: match font::FONT { default_font: match font::FONT {
iced::Font::Default => None, iced::Font::Default => None,
iced::Font::External { bytes, .. } => Some(bytes), iced::Font::External { bytes, .. } => Some(bytes),
}, },
default_text_size: 18, default_text_size: 18,
..iced::Settings::default() ..iced::Settings::with_flags(flags)
} }
} }