Merge branch 'master' of github.com:compio-rs/winio

Author: Berrysoft

src/ui/mac/text_box.rs

@@ -1,14 +1,20 @@
 use objc2::{
-    DeclaredClass, MainThreadOnly, define_class, msg_send,
+    AnyThread, DeclaredClass, MainThreadOnly, define_class, msg_send,
     rc::{Allocated, Retained},
     runtime::ProtocolObject,
 };
-use objc2_app_kit::{NSTextAlignment, NSTextDelegate, NSTextView, NSTextViewDelegate};
-use objc2_foundation::{MainThreadMarker, NSNotification, NSObject, NSObjectProtocol, NSString};
+use objc2_app_kit::{
+    NSAttributedStringNSStringDrawing, NSFontAttributeName, NSTextAlignment, NSTextDelegate,
+    NSTextView, NSTextViewDelegate,
+};
+use objc2_foundation::{
+    MainThreadMarker, NSAttributedString, NSDictionary, NSNotification, NSObject, NSObjectProtocol,
+    NSString,
+};
 
 use crate::{
     AsWindow, HAlign, Point, Size,
-    ui::{Callback, Widget, from_nsstring},
+    ui::{Callback, Widget, from_cgsize, from_nsstring},
 };
 
 #[derive(Debug)]
@@ -59,7 +65,23 @@ impl TextBox {
     }
 
     pub fn preferred_size(&self) -> Size {
-        self.handle.preferred_size()
+        unsafe {
+            let font = self.text_view.font();
+            let text = NSAttributedString::initWithString_attributes(
+                NSAttributedString::alloc(),
+                &self.text_view.string(),
+                if let Some(font) = font {
+                    Some(NSDictionary::from_slices(
+                        &[NSFontAttributeName],
+                        &[font.as_ref()],
+                    ))
+                } else {
+                    None
+                }
+                .as_deref(),
+            );
+            from_cgsize(text.size())
+        }
     }
 
     pub fn loc(&self) -> Point {

src/ui/mac/window.rs

@@ -6,7 +6,8 @@ use objc2::{
     runtime::ProtocolObject,
 };
 use objc2_app_kit::{
-    NSBackingStoreType, NSControl, NSScreen, NSView, NSWindow, NSWindowDelegate, NSWindowStyleMask,
+    NSBackingStoreType, NSControl, NSScreen, NSView, NSWindow, NSWindowDelegate,
+    NSWindowOrderingMode, NSWindowStyleMask,
 };
 use objc2_foundation::{
     MainThreadMarker, NSNotification, NSObject, NSObjectProtocol, NSPoint, NSRect, NSSize, NSString,
@@ -44,7 +45,10 @@ impl Window {
             };
 
             if let Some(parent) = parent {
-                wnd.setParentWindow(Some(&parent.as_window().as_raw_window()));
+                parent
+                    .as_window()
+                    .as_raw_window()
+                    .addChildWindow_ordered(&wnd, NSWindowOrderingMode::Above);
             }
 
             let delegate = WindowDelegate::new(mtm);
@@ -217,8 +221,7 @@ impl Widget {
     pub fn preferred_size(&self) -> Size {
         unsafe {
             from_cgsize(
-                Retained::cast_unchecked::<NSControl>(self.view.clone())
-                    .sizeThatFits(NSSize::new(f64::MAX, f64::MAX)),
+                Retained::cast_unchecked::<NSControl>(self.view.clone()).sizeThatFits(NSSize::ZERO),
             )
         }
     }