Add main widow before calling build closure (baseview)

Author: geom3trik

crates/vizia_baseview/src/application.rs

@@ -1,7 +1,5 @@
 use crate::window::ViziaWindow;
-use crate::Renderer;
 use baseview::{WindowHandle, WindowScalePolicy};
-use femtovg::Canvas;
 use raw_window_handle::HasRawWindowHandle;
 
 use crate::proxy::queue_get;
@@ -163,26 +161,15 @@ pub(crate) struct ApplicationRunner {
 }
 
 impl ApplicationRunner {
-    pub fn new(
-        mut context: Context,
-        win_desc: WindowDescription,
-        scale_policy: WindowScalePolicy,
-        renderer: Renderer,
-    ) -> Self {
-        let mut cx = BackendContext::new(&mut context);
-
+    pub fn new(context: Context, scale_policy: WindowScalePolicy) -> Self {
         let event_manager = EventManager::new();
 
-        let canvas = Canvas::new(renderer).expect("Cannot create canvas");
-
         // Assume scale for now until there is an event with a new one.
         let scale_factor = match scale_policy {
             WindowScalePolicy::ScaleFactor(scale) => scale,
             WindowScalePolicy::SystemScaleFactor => 1.0,
         };
 
-        cx.add_main_window(&win_desc, canvas, scale_factor as f32);
-
         ApplicationRunner {
             event_manager,
             context,

crates/vizia_baseview/src/window.rs

@@ -24,15 +24,30 @@ impl ViziaWindow {
         builder: Option<Box<dyn FnOnce(&mut Context) + Send>>,
         on_idle: Option<Box<dyn Fn(&mut Context) + Send>>,
     ) -> ViziaWindow {
+        let context = window.gl_context().expect("Window was created without OpenGL support");
+        let renderer = load_renderer(window);
+
+        unsafe { context.make_current() };
+
+        let canvas = Canvas::new(renderer).expect("Cannot create canvas");
+
+        // Assume scale for now until there is an event with a new one.
+        let scale_factor = match scale_policy {
+            WindowScalePolicy::ScaleFactor(scale) => scale,
+            WindowScalePolicy::SystemScaleFactor => 1.0,
+        };
+
+        BackendContext::new(&mut cx).add_main_window(&win_desc, canvas, scale_factor as f32);
+
+        cx.remove_user_themes();
         if let Some(builder) = builder {
             (builder)(&mut cx);
         }
 
-        let context = window.gl_context().expect("Window was created without OpenGL support");
-        let renderer = load_renderer(window);
+        let mut backend_cx = BackendContext::new(&mut cx);
+        backend_cx.synchronize_fonts();
 
-        unsafe { context.make_current() };
-        let application = ApplicationRunner::new(cx, win_desc, scale_policy, renderer);
+        let application = ApplicationRunner::new(cx, scale_policy);
         unsafe { context.make_not_current() };
 
         ViziaWindow { application, on_idle }