Corrected Cocoa API, and simplified screen API implementations.

beeware · May 13, 2023 · ad9b8cd · ad9b8cd
1 parent 12204f5
commit ad9b8cd
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 11 deletions.
diff --git a/cocoa/src/toga_cocoa/app.py b/cocoa/src/toga_cocoa/app.py
@@ -340,8 +340,7 @@ def main_loop(self):
         self.loop.run_forever(lifecycle=CocoaLifecycle(self.native))
 
     def get_screens(self):
-        for screen in NSScreen.screens:
-            yield ScreenImpl(native=screen)
+        return [ScreenImpl(native=screen) for screen in NSScreen.screens]
 
     def set_main_window(self, window):
         pass

diff --git a/cocoa/src/toga_cocoa/window.py b/cocoa/src/toga_cocoa/window.py
@@ -330,4 +330,4 @@ def get_current_screen(self):
                 return screen._impl
 
     def set_current_screen(self, app_screen):
-        self.native.setFrameOrigin(app_screen._impl.native.visibleFrame().origin)
+        self.native.setFrameOrigin(app_screen._impl.native.visibleFrame.origin)
diff --git a/core/src/toga/app.py b/core/src/toga/app.py
@@ -349,10 +349,7 @@ def _create_impl(self):
 
     @property
     def screens(self):
-        screens = []
-        for screen in self._impl.get_screens():
-            screens.append(screen.interface)
-        return screens
+        return [screen.interface for screen in self._impl.get_screens()]
 
     @property
     def paths(self):

diff --git a/gtk/src/toga_gtk/app.py b/gtk/src/toga_gtk/app.py
@@ -199,8 +199,7 @@ def main_loop(self):
     def get_screens(self):
         display = Gdk.Display.get_default()
         n_monitors = display.get_n_monitors()
-        for i in range(n_monitors):
-            yield ScreenImpl(native=display.get_monitor(i))
+        return [ScreenImpl(native=display.get_monitor(i)) for i in range(n_monitors)]
 
     def set_main_window(self, window):
         pass

diff --git a/winforms/src/toga_winforms/app.py b/winforms/src/toga_winforms/app.py
@@ -293,8 +293,7 @@ def exit(self):
         self.native.Exit()
 
     def get_screens(self):
-        for screen in WinForms.Screen.AllScreens:
-            yield ScreenImpl(native=screen)
+        return [ScreenImpl(native=screen) for screen in WinForms.Screen.AllScreens]
 
     def set_main_window(self, window):
         self.app_context.MainForm = window._impl.native