Merge branch 'master' into jk/templates-v3

This commit is contained in:
Jonathan Kelley committed 2022-11-22 16:11:12 -08:00
commit 112c954e00
10 files changed
+101 -25

No files matched your search

+6
View File
@@ -3,6 +3,8 @@ use crate::events::{decode_event, EventMessage};
use dioxus_core::*;
use futures_channel::mpsc::UnboundedReceiver;
use futures_util::StreamExt;
#[cfg(target_os = "ios")]
use objc::runtime::Object;
use std::{
collections::HashMap,
sync::Arc,
@@ -20,6 +22,8 @@ pub(super) struct DesktopController {
pub(super) pending_edits: Arc<Mutex<Vec<String>>>,
pub(super) quit_app_on_close: bool,
pub(super) is_ready: Arc<AtomicBool>,
#[cfg(target_os = "ios")]
pub(super) views: Vec<*mut Object>,
}
impl DesktopController {
@@ -88,6 +92,8 @@ impl DesktopController {
webviews: HashMap::new(),
is_ready: Arc::new(AtomicBool::new(false)),
quit_app_on_close: true,
#[cfg(target_os = "ios")]
views: vec![],
}
}