refactor(tray): extract mainOrFirstScreen screen fallback into function.

The logic  was duplicated across the tray account popup files.
Add a single helper in TrayPopupViewUtils.

Assisted-by: Claude Code:claude-opus-4-8
Signed-off-by: Camila Ayres <camila.ayres@nextcloud.com>

Author: camilasan

src/gui/macOS/trayaccountpopup/ncaccountactionspopup.mm

@@ -207,8 +207,7 @@ - (void)resizeToFitPreservingTopEdge:(BOOL)preserveTopEdge topEdge:(CGFloat)topE
     }
     auto screen = self.screen;
     if (!screen) {
-        NSScreen *const mainScreen = NSScreen.mainScreen;
-        screen = mainScreen ? mainScreen : NSScreen.screens.firstObject;
+        screen = OCC::Mac::TrayPopupViewUtils::mainOrFirstScreen();
     }
     if (screen) {
         frame.origin = clampedPopupOrigin(frame.origin, frame.size, screen.visibleFrame);

src/gui/macOS/trayaccountpopup/trayaccountpopup_mac.mm

@@ -20,8 +20,7 @@
 static NSScreen *nsScreenForQtScreen(QScreen *qtScreen)
 {
     if (!qtScreen) {
-        NSScreen *const mainScreen = NSScreen.mainScreen;
-        return mainScreen ? mainScreen : NSScreen.screens.firstObject;
+        return mainOrFirstScreen();
     }
 
     const auto qtScreenName = qtScreen->name().toNSString();
@@ -37,8 +36,7 @@
         return [NSScreen.screens objectAtIndex:screenIndex];
     }
 
-    NSScreen *const mainScreen = NSScreen.mainScreen;
-    return mainScreen ? mainScreen : NSScreen.screens.firstObject;
+    return mainOrFirstScreen();
 }
 
 namespace OCC {

src/gui/macOS/trayaccountpopup/trayaccountpopupviewutils.h

@@ -22,6 +22,9 @@ void addOwnedArrangedSubview(NSStackView *stack, NSView *view);
 // The subtle row highlight colour for the current (light/dark) appearance.
 NSColor *hoverColor();
 
+// Main screen, or the first screen as fallback.
+NSScreen *mainOrFirstScreen();
+
 // Clamp a popup origin toward the screen's visible frame, inset by kScreenEdgePadding.
 // A popup larger than the visible frame can still overflow its far edge.
 NSPoint clampedPopupOrigin(const NSPoint origin, const NSSize size, const NSRect visibleFrame);

src/gui/macOS/trayaccountpopup/trayaccountpopupviewutils.mm

@@ -19,6 +19,12 @@ static CGFloat clampedPopupOriginCoordinate(const CGFloat origin, const CGFloat
     return origin < minOrigin ? minOrigin : (origin > maxOrigin ? maxOrigin : origin);
 }
 
+NSScreen *mainOrFirstScreen()
+{
+    NSScreen *const mainScreen = NSScreen.mainScreen;
+    return mainScreen ? mainScreen : NSScreen.screens.firstObject;
+}
+
 NSPoint clampedPopupOrigin(const NSPoint origin, const NSSize size, const NSRect visibleFrame)
 {
     return NSMakePoint(clampedPopupOriginCoordinate(origin.x, NSMinX(visibleFrame), NSMaxX(visibleFrame), size.width),
@@ -166,7 +172,7 @@ void positionPopupFromRow(NSPanel *popup, NSView *row)
 
     auto screen = row.window.screen;
     if (!screen) {
-        screen = NSScreen.mainScreen ?: NSScreen.screens.firstObject;
+        screen = mainOrFirstScreen();
     }
     const auto visibleFrame = screen.visibleFrame;
     const auto rightEdge = NSMaxX(visibleFrame) - kScreenEdgePadding;