summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib.rs3
-rw-r--r--src/settings.rs8
2 files changed, 11 insertions, 0 deletions
diff --git a/src/lib.rs b/src/lib.rs
index cb6e86d4..f9f3952c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -168,6 +168,9 @@ use iced_winit::runtime;
pub use iced_futures::futures;
+#[cfg(feature = "highlighter")]
+pub use iced_highlighter as highlighter;
+
mod error;
mod sandbox;
diff --git a/src/settings.rs b/src/settings.rs
index c5e28e86..42df31e4 100644
--- a/src/settings.rs
+++ b/src/settings.rs
@@ -2,6 +2,8 @@
use crate::window;
use crate::{Font, Pixels};
+use std::borrow::Cow;
+
/// The settings of an application.
#[derive(Debug, Clone)]
pub struct Settings<Flags> {
@@ -21,6 +23,9 @@ pub struct Settings<Flags> {
/// [`Application`]: crate::Application
pub flags: Flags,
+ /// The fonts to load on boot.
+ pub fonts: Vec<Cow<'static, [u8]>>,
+
/// The default [`Font`] to be used.
///
/// By default, it uses [`Family::SansSerif`](crate::font::Family::SansSerif).
@@ -62,6 +67,7 @@ impl<Flags> Settings<Flags> {
flags,
id: default_settings.id,
window: default_settings.window,
+ fonts: default_settings.fonts,
default_font: default_settings.default_font,
default_text_size: default_settings.default_text_size,
antialiasing: default_settings.antialiasing,
@@ -79,6 +85,7 @@ where
id: None,
window: window::Settings::default(),
flags: Default::default(),
+ fonts: Vec::new(),
default_font: Font::default(),
default_text_size: Pixels(16.0),
antialiasing: false,
@@ -93,6 +100,7 @@ impl<Flags> From<Settings<Flags>> for iced_winit::Settings<Flags> {
id: settings.id,
window: settings.window.into(),
flags: settings.flags,
+ fonts: settings.fonts,
exit_on_close_request: settings.exit_on_close_request,
}
}