Merge pull request #41 from ilya-epifanov/fonts_and_optional_window_messages

Fonts and optional window messages

Author: Billy Messenger

Cargo.toml

@@ -19,6 +19,9 @@ categories = ["gui"]
 debug = ["iced_runtime/debug"]
 # Enable the wgu renderer
 wgpu = ["iced_renderer/wgpu"]
+image = ["iced_widget/image"]
+svg = ["iced_widget/svg"]
+canvas = ["iced_widget/canvas"]
 
 [dependencies]
 baseview = { git = "https://github.com/RustAudio/baseview.git", rev = "fdb43ea" }

examples/custom_styles.rs

@@ -24,6 +24,7 @@ fn main() {
             always_redraw: true,
         },
         flags: (),
+        fonts: Default::default(),
     };
 
     open_blocking::<MyProgram>(settings);

examples/hello_world.rs

@@ -23,6 +23,7 @@ fn main() {
             always_redraw: true,
         },
         flags: (),
+        fonts: Default::default(),
     };
 
     open_blocking::<MyProgram>(settings);

examples/window_subs.rs

@@ -12,7 +12,7 @@ use iced_baseview::{
     Application, Settings,
 };
 use iced_runtime::window::Action;
-use std::time::{Duration, Instant};
+use std::{sync::Arc, time::{Duration, Instant}};
 
 static COUNT_INTERVAL: Duration = Duration::from_millis(1000);
 
@@ -28,6 +28,7 @@ fn main() {
             always_redraw: true,
         },
         flags: (),
+        fonts: Default::default(),
     };
 
     open_blocking::<MyProgram>(settings);
@@ -62,8 +63,8 @@ impl Application for MyProgram {
     }
 
     fn subscription(&self, window_subs: &mut WindowSubs<Message>) -> Subscription<Message> {
-        window_subs.on_frame = Some(|| Message::OnFrame);
-        window_subs.on_window_will_close = Some(|| Message::WillClose);
+        window_subs.on_frame = Some(Arc::new(|| Some(Message::OnFrame)));
+        window_subs.on_window_will_close = Some(Arc::new(|| Some(Message::WillClose)));
         Subscription::none()
     }
 

src/application.rs

@@ -167,13 +167,19 @@ where
     };
 
     let compositor_settings = A::renderer_settings();
-    let (mut compositor, renderer) = C::new(compositor_settings, Some(window))?;
+    let (mut compositor, mut renderer) = C::new(compositor_settings, Some(window))?;
     let surface = compositor.create_surface(
         window,
         viewport.physical_width(),
         viewport.physical_height(),
     );
 
+    for font in settings.fonts {
+        use crate::core::text::Renderer;
+
+        renderer.load_font(font);
+    }
+
     let (window_queue, window_queue_rx) = WindowQueue::new();
     let event_status = Rc::new(RefCell::new(baseview::EventStatus::Ignored));
 
@@ -281,7 +287,9 @@ async fn run_instance<A, E, C>(
         match event {
             RuntimeEvent::MainEventsCleared => {
                 if let Some(message) = &window_subs.on_frame {
-                    messages.push(message());
+                    if let Some(message) = message() {
+                        messages.push(message);
+                    }
                 }
 
                 if !did_process_event
@@ -518,7 +526,9 @@ async fn run_instance<A, E, C>(
                 if let Some(message) = &window_subs.on_window_will_close {
                     // Send message to user before exiting the loop.
 
-                    messages.push(message());
+                    if let Some(message) = message() {
+                        messages.push(message);
+                    }
                     let mut cache = ManuallyDrop::into_inner(user_interface).into_cache();
 
                     update(

src/settings.rs

@@ -1,5 +1,5 @@
 //! Configure your application.
-use std::fmt::Debug;
+use std::{borrow::Cow, fmt::Debug};
 
 use baseview::WindowOpenOptions;
 
@@ -20,6 +20,9 @@ pub struct Settings<Flags> {
 
     /// iced_baseview settings
     pub iced_baseview: IcedBaseviewSettings,
+
+    /// The fonts to load on boot.
+    pub fonts: Vec<Cow<'static, [u8]>>,
 }
 
 /// Any settings specific to `iced_baseview`.

src/window.rs

@@ -1,4 +1,4 @@
-use std::{cell::RefCell, pin::Pin, rc::Rc};
+use std::{cell::RefCell, pin::Pin, rc::Rc, sync::Arc};
 
 use baseview::{Event, EventStatus, Window, WindowHandler, WindowOpenOptions};
 use iced_runtime::futures::futures::{
@@ -284,9 +284,9 @@ impl WindowQueue {
 #[allow(missing_debug_implementations)]
 pub struct WindowSubs<Message> {
     /// The message to send right before each rendering frame.
-    pub on_frame: Option<fn() -> Message>,
+    pub on_frame: Option<Arc<dyn Fn() -> Option<Message>>>,
     /// The message to send when the window is about to close.
-    pub on_window_will_close: Option<fn() -> Message>,
+    pub on_window_will_close: Option<Arc<dyn Fn() -> Option<Message>>>,
 }
 
 impl<Message> Default for WindowSubs<Message> {