fix(uikit): layout on show

Author: Berrysoft

mac_catalyst.mk

@@ -16,7 +16,7 @@ APP_BUNDLE = ${BUILD_DIR}/${APP_NAME}.app
 APP_EXEC = ${APP_BUNDLE}/Contents/MacOS/${EXAMPLE}
 INFO_PLIST = winio-ui-ui-kit/Info.plist
 
-.PHONY: all build bundle run debug clean
+.PHONY: all build bundle run open debug clean
 
 all: bundle
 
@@ -32,6 +32,9 @@ bundle: build ${INFO_PLIST}
 run: bundle
 	${APP_EXEC}
 
+open: bundle
+	open ${APP_BUNDLE}
+
 debug: bundle
 	lldb -o run -- ${APP_EXEC}
 

winio-ui-ui-kit/src/runtime.rs

@@ -17,10 +17,9 @@ use objc2_ui_kit::{
     UIWindowSceneDelegate, UIWindowSceneGeometry,
 };
 use slab::Slab;
-use winio_callback::Callback;
-use winio_primitive::Size;
+use winio_callback::{Callback, Runnable};
 
-use crate::{Error, Result, from_cgsize};
+use crate::{Error, Result};
 
 pub struct App {
     mtm: MainThreadMarker,
@@ -80,7 +79,24 @@ unsafe fn dispatcher_wake_by_ref(_: *const ()) {
 unsafe fn dispatcher_drop(_: *const ()) {}
 
 thread_local! {
-    pub(crate) static RESIZE_SLAB: RefCell<Slab<Rc<Callback<Size>>>> = const { RefCell::new(Slab::new()) };
+    pub(crate) static RESIZE_SLAB: RefCell<Slab<Rc<Callback>>> = const { RefCell::new(Slab::new()) };
+    pub(crate) static MOVE_SLAB: RefCell<Slab<Rc<Callback>>> = const { RefCell::new(Slab::new()) };
+}
+
+fn signal_resize<R: Runnable>() {
+    RESIZE_SLAB.with_borrow(|s| {
+        for (_, callback) in s.iter() {
+            callback.signal::<R>(());
+        }
+    });
+}
+
+fn signal_move<R: Runnable>() {
+    MOVE_SLAB.with_borrow(|s| {
+        for (_, callback) in s.iter() {
+            callback.signal::<R>(());
+        }
+    });
 }
 
 #[derive(Debug)]
@@ -134,6 +150,12 @@ define_class! {
         ) {
             winio_pollable::run_current_task();
         }
+
+        #[unsafe(method(sceneDidBecomeActive:))]
+        fn sceneDidBecomeActive(&self, scene: &UIScene) {
+            signal_resize::<()>();
+            winio_pollable::run_current_task();
+        }
     }
 
     #[allow(non_snake_case)]
@@ -142,16 +164,17 @@ define_class! {
         fn windowScene_didUpdateEffectiveGeometry(
             &self,
             window_scene: &UIWindowScene,
-            previous_effective_geometry: &UIWindowSceneGeometry,
+            previous_effective_geometry: Option<&UIWindowSceneGeometry>,
         ) {
             let geometry = window_scene.effectiveGeometry();
             let bounds = geometry.coordinateSpace(self.mtm()).bounds();
-            let size = from_cgsize(bounds.size);
-            RESIZE_SLAB.with_borrow(|s| {
-                for (_, callback) in s.iter() {
-                    callback.signal::<()>(size);
-                }
-            });
+            let previous_bounds = previous_effective_geometry.map(|g| g.coordinateSpace(self.mtm()).bounds());
+            if Some(bounds.size) != previous_bounds.map(|b| b.size) {
+                signal_resize::<()>();
+            }
+            if Some(bounds.origin) != previous_bounds.map(|b| b.origin) {
+                signal_move::<()>();
+            }
             winio_pollable::run_current_task();
         }
     }

winio-ui-ui-kit/src/ui/window.rs

@@ -2,25 +2,28 @@ use std::rc::Rc;
 
 use inherit_methods_macro::inherit_methods;
 use objc2::{MainThreadOnly, rc::Retained};
-use objc2_foundation::{MainThreadMarker, NSArray, NSSize};
+use objc2_foundation::{MainThreadMarker, NSArray, NSSize, NSString};
 use objc2_ui_kit::{NSLayoutConstraint, UIView, UIViewController, UIWindow};
 use winio_callback::Callback;
 use winio_handle::{
     AsContainer, AsWidget, AsWindow, BorrowedContainer, BorrowedWidget, BorrowedWindow,
 };
 use winio_primitive::{Point, Size};
+use winio_ui_apple_common::from_nsstring;
 
 use crate::{
-    Error, RESIZE_SLAB, Result, catch, first_ui_window_scene, from_cgpoint, from_cgsize,
+    Error, MOVE_SLAB, RESIZE_SLAB, Result, catch, first_ui_window_scene, from_cgpoint, from_cgsize,
     to_cgpoint, to_cgsize,
 };
 
 #[derive(Debug)]
 pub struct Window {
     wnd: Retained<UIWindow>,
     content_view: Retained<UIView>,
-    did_resize: Rc<Callback<Size>>,
+    did_resize: Rc<Callback>,
+    did_move: Rc<Callback>,
     resize_index: usize,
+    move_index: usize,
 }
 
 impl Window {
@@ -35,7 +38,9 @@ impl Window {
             let controller = UIViewController::new(mtm);
 
             let did_resize = Rc::new(Callback::new());
-            let index = RESIZE_SLAB.with_borrow_mut(|s| s.insert(did_resize.clone()));
+            let resize_index = RESIZE_SLAB.with_borrow_mut(|s| s.insert(did_resize.clone()));
+            let did_move = Rc::new(Callback::new());
+            let move_index = MOVE_SLAB.with_borrow_mut(|s| s.insert(did_move.clone()));
 
             wnd.setRootViewController(Some(&controller));
             wnd.makeKeyWindow();
@@ -65,7 +70,9 @@ impl Window {
                 wnd,
                 content_view,
                 did_resize,
-                resize_index: index,
+                resize_index,
+                did_move,
+                move_index,
             })
         })
         .flatten()
@@ -103,19 +110,30 @@ impl Window {
     }
 
     pub fn text(&self) -> Result<String> {
-        Ok(String::new())
+        catch(|| {
+            self.wnd
+                .windowScene()
+                .map(|s| s.title())
+                .as_deref()
+                .map(from_nsstring)
+                .unwrap_or_default()
+        })
     }
 
-    pub fn set_text(&mut self, _s: impl AsRef<str>) -> Result<()> {
-        Ok(())
+    pub fn set_text(&mut self, s: impl AsRef<str>) -> Result<()> {
+        catch(|| {
+            if let Some(scene) = self.wnd.windowScene() {
+                scene.setTitle(Some(&NSString::from_str(s.as_ref())));
+            }
+        })
     }
 
     pub async fn wait_size(&self) {
         self.did_resize.wait().await;
     }
 
     pub async fn wait_move(&self) {
-        std::future::pending().await
+        self.did_move.wait().await;
     }
 
     pub async fn wait_close(&self) {
@@ -130,6 +148,7 @@ impl Window {
 impl Drop for Window {
     fn drop(&mut self) {
         RESIZE_SLAB.with_borrow_mut(|s| s.remove(self.resize_index));
+        MOVE_SLAB.with_borrow_mut(|s| s.remove(self.move_index));
     }
 }