refactor(uikit): screen frame

Author: Berrysoft

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

@@ -9,22 +9,15 @@ pub fn monitor_get_all() -> Result<Vec<Monitor>> {
     let mut res = vec![];
     catch(|| {
         let app = UIApplication::sharedApplication(mtm);
-        for session in app.openSessions() {
-            if let Some(scene) = session.scene()
-                && let Ok(scene) = Retained::downcast::<UIWindowScene>(scene)
-            {
+        for scene in app.connectedScenes() {
+            if let Ok(scene) = Retained::downcast::<UIWindowScene>(scene) {
                 let screen = scene.screen();
                 let bounds = screen.bounds();
                 let frame_size = from_cgsize(bounds.size);
                 let frame = Rect::new(Point::zero(), frame_size);
 
-                let dpi = screen
-                    .currentMode()
-                    .map(|mode| from_cgsize(mode.size()))
-                    .unwrap_or(Size::new(1.0, 1.0));
-
-                let native_scale = screen.nativeScale();
-                let dpi = Size::new(dpi.width / native_scale, dpi.height / native_scale);
+                let scale = screen.scale();
+                let dpi = Size::new(scale, scale);
 
                 res.push(Monitor::new(frame, frame, dpi));
             }

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

@@ -12,8 +12,8 @@ use winio_handle::{
 use winio_primitive::{Point, Size};
 
 use crate::{
-    Error, RESIZE_SLAB, Result, catch, first_ui_window_scene, from_cgpoint, from_cgrect,
-    from_cgsize, to_cgpoint, to_cgsize,
+    Error, RESIZE_SLAB, Result, catch, first_ui_window_scene, from_cgpoint, from_cgsize,
+    to_cgpoint, to_cgsize,
 };
 
 #[derive(Debug)]
@@ -80,19 +80,11 @@ impl Window {
     }
 
     pub fn loc(&self) -> Result<Point> {
-        catch(|| {
-            let frame = self.wnd.frame();
-            Ok(from_cgrect(frame).origin)
-        })
-        .flatten()
+        Ok(Point::zero())
     }
 
-    pub fn set_loc(&mut self, p: Point) -> Result<()> {
-        catch(|| {
-            let mut frame = self.wnd.frame();
-            frame.origin = to_cgpoint(p);
-            self.wnd.setFrame(frame);
-        })
+    pub fn set_loc(&mut self, _p: Point) -> Result<()> {
+        Ok(())
     }
 
     pub fn size(&self) -> Result<Size> {