Refine method order

xord · Apr 6, 2024 · 29d6494 · 29d6494
1 parent a282a54
commit 29d6494
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 28 deletions.
diff --git a/src/ios/window.mm b/src/ios/window.mm
@@ -142,6 +142,25 @@ - (void) bind: (Reflex::Window*) window;
 		return Bounds(b.origin.x, b.origin.y, b.size.width, b.size.height);
 	}
 
+	static UIScreen*
+	get_screen (const Window& window)
+	{
+		UIWindow* w = get_vc(&window).view.window;
+		if (@available(iOS 13.0, *))
+			return w.windowScene.screen;
+		else
+			return w.screen;
+	}
+
+	Screen
+	Window_get_screen (const Window& window)
+	{
+		Screen s;
+		UIScreen* screen = get_screen(window);
+		Screen_initialize(&s, screen ? screen : UIScreen.mainScreen);
+		return s;
+	}
+
 	static UIInterfaceOrientationMask g_orientation_mask =
 		UIInterfaceOrientationMaskAll;
 
@@ -246,25 +265,6 @@ - (void) bind: (Reflex::Window*) window;
 			flags_to_orientation_mask(flags & (Window::FLAG_PORTRAIT | Window::FLAG_LANDSCAPE)));
 	}
 
-	static UIScreen*
-	get_screen (const Window& window)
-	{
-		UIWindow* w = get_vc(&window).view.window;
-		if (@available(iOS 13.0, *))
-			return w.windowScene.screen;
-		else
-			return w.screen;
-	}
-
-	Screen
-	Window_get_screen (const Window& window)
-	{
-		Screen s;
-		UIScreen* screen = get_screen(window);
-		Screen_initialize(&s, screen ? screen : UIScreen.mainScreen);
-		return s;
-	}
-
 	float
 	Window_get_pixel_density (const Window& window)
 	{

diff --git a/src/osx/window.mm b/src/osx/window.mm
@@ -143,6 +143,15 @@ - (void) bind: (Reflex::Window*) window;
 		return Bounds(f.origin.x, f.origin.y, f.size.width, f.size.height);
 	}
 
+	Screen
+	Window_get_screen (const Window& window)
+	{
+		Screen s;
+		NSScreen* screen = get_native(&window).screen;
+		if (screen) Screen_initialize(&s, screen);
+		return s;
+	}
+
 	void
 	Window_set_flags (Window* window, uint flags)
 	{
@@ -163,15 +172,6 @@ - (void) bind: (Reflex::Window*) window;
 			[native toggleFullScreen: native];
 	}
 
-	Screen
-	Window_get_screen (const Window& window)
-	{
-		Screen s;
-		NSScreen* screen = get_native(&window).screen;
-		if (screen) Screen_initialize(&s, screen);
-		return s;
-	}
-
 	float
 	Window_get_pixel_density (const Window& window)
 	{