Improve macOS/iOS/Web thread safety

Co-authored-by: daxpedda <daxpedda@gmail.com>

src/platform/ios.rs

@@ -78,28 +78,33 @@ pub trait WindowExtIOS {
 impl WindowExtIOS for Window {
     #[inline]
     fn set_scale_factor(&self, scale_factor: f64) {
-        self.window.set_scale_factor(scale_factor)
+        self.window
+            .maybe_queue_on_main(move |w| w.set_scale_factor(scale_factor))
     }
 
     #[inline]
     fn set_valid_orientations(&self, valid_orientations: ValidOrientations) {
-        self.window.set_valid_orientations(valid_orientations)
+        self.window
+            .maybe_queue_on_main(move |w| w.set_valid_orientations(valid_orientations))
     }
 
     #[inline]
     fn set_prefers_home_indicator_hidden(&self, hidden: bool) {
-        self.window.set_prefers_home_indicator_hidden(hidden)
+        self.window
+            .maybe_queue_on_main(move |w| w.set_prefers_home_indicator_hidden(hidden))
     }
 
     #[inline]
     fn set_preferred_screen_edges_deferring_system_gestures(&self, edges: ScreenEdge) {
-        self.window
-            .set_preferred_screen_edges_deferring_system_gestures(edges)
+        self.window.maybe_queue_on_main(move |w| {
+            w.set_preferred_screen_edges_deferring_system_gestures(edges)
+        })
     }
 
     #[inline]
     fn set_prefers_status_bar_hidden(&self, hidden: bool) {
-        self.window.set_prefers_status_bar_hidden(hidden)
+        self.window
+            .maybe_queue_on_main(move |w| w.set_prefers_status_bar_hidden(hidden))
     }
 }
 

src/platform/macos.rs

@@ -84,72 +84,78 @@ pub trait WindowExtMacOS {
 impl WindowExtMacOS for Window {
     #[inline]
     fn simple_fullscreen(&self) -> bool {
-        self.window.simple_fullscreen()
+        self.window.maybe_wait_on_main(|w| w.simple_fullscreen())
     }
 
     #[inline]
     fn set_simple_fullscreen(&self, fullscreen: bool) -> bool {
-        self.window.set_simple_fullscreen(fullscreen)
+        self.window
+            .maybe_wait_on_main(move |w| w.set_simple_fullscreen(fullscreen))
     }
 
     #[inline]
     fn has_shadow(&self) -> bool {
-        self.window.has_shadow()
+        self.window.maybe_wait_on_main(|w| w.has_shadow())
     }
 
     #[inline]
     fn set_has_shadow(&self, has_shadow: bool) {
-        self.window.set_has_shadow(has_shadow)
+        self.window
+            .maybe_queue_on_main(move |w| w.set_has_shadow(has_shadow))
     }
 
     #[inline]
     fn set_tabbing_identifier(&self, identifier: &str) {
-        self.window.set_tabbing_identifier(identifier);
+        self.window
+            .maybe_wait_on_main(|w| w.set_tabbing_identifier(identifier))
     }
 
     #[inline]
     fn tabbing_identifier(&self) -> String {
-        self.window.tabbing_identifier()
+        self.window.maybe_wait_on_main(|w| w.tabbing_identifier())
     }
 
     #[inline]
     fn select_next_tab(&self) {
-        self.window.select_next_tab();
+        self.window.maybe_queue_on_main(|w| w.select_next_tab())
     }
 
     #[inline]
     fn select_previous_tab(&self) {
-        self.window.select_previous_tab();
+        self.window.maybe_queue_on_main(|w| w.select_previous_tab())
     }
 
     #[inline]
     fn select_tab_at_index(&self, index: usize) {
-        self.window.select_tab_at_index(index);
+        self.window
+            .maybe_queue_on_main(move |w| w.select_tab_at_index(index))
     }
 
     #[inline]
     fn num_tabs(&self) -> usize {
-        self.window.num_tabs()
+        self.window.maybe_wait_on_main(|w| w.num_tabs())
     }
 
     #[inline]
     fn is_document_edited(&self) -> bool {
-        self.window.is_document_edited()
+        self.window.maybe_wait_on_main(|w| w.is_document_edited())
     }
 
     #[inline]
     fn set_document_edited(&self, edited: bool) {
-        self.window.set_document_edited(edited)
+        self.window
+            .maybe_queue_on_main(move |w| w.set_document_edited(edited))
     }
 
     #[inline]
     fn set_option_as_alt(&self, option_as_alt: OptionAsAlt) {
-        self.window.set_option_as_alt(option_as_alt)
+        self.window
+            .maybe_queue_on_main(move |w| w.set_option_as_alt(option_as_alt))
     }
 
     #[inline]
     fn option_as_alt(&self) -> OptionAsAlt {
-        self.window.option_as_alt()
+        self.window.maybe_wait_on_main(|w| w.option_as_alt())
     }
 }
 

src/platform/web.rs

@@ -31,7 +31,7 @@ use crate::event::Event;
 use crate::event_loop::ControlFlow;
 use crate::event_loop::EventLoop;
 use crate::event_loop::EventLoopWindowTarget;
-use crate::window::WindowBuilder;
+use crate::window::{Window, WindowBuilder};
 
 use web_sys::HtmlCanvasElement;
 
@@ -40,6 +40,13 @@ pub trait WindowExtWebSys {
     fn canvas(&self) -> Option<HtmlCanvasElement>;
 }
 
+impl WindowExtWebSys for Window {
+    #[inline]
+    fn canvas(&self) -> Option<HtmlCanvasElement> {
+        self.window.canvas()
+    }
+}
+
 pub trait WindowBuilderExtWebSys {
     /// Pass an [`HtmlCanvasElement`] to be used for this [`Window`](crate::window::Window). If
     /// [`None`], [`WindowBuilder::build()`] will create one.