Fix window sizing issue, fix view hiding, bring window to front on URL

Author: stackotter

Sources/AppKitBackend/AppKitBackend.swift

@@ -107,6 +107,10 @@ public final class AppKitBackend: AppBackend {
         window.makeKeyAndOrderFront(nil)
     }
 
+    public func activate(window: Window) {
+        window.makeKeyAndOrderFront(nil)
+    }
+
     private static func renderMenuItems(_ items: [ResolvedMenu.Item]) -> [NSMenuItem] {
         items.map { item in
             switch item {

Sources/Gtk/Widgets/Window.swift

@@ -79,4 +79,8 @@ open class Window: Widget {
     public func getChild() -> Widget? {
         return child
     }
+
+    public func present() {
+        gtk_window_present(castedPointer())
+    }
 }

Sources/Gtk3/Widgets/Window.swift

@@ -57,6 +57,10 @@ open class Window: Bin {
         }
     }
 
+    public func present() {
+        gtk_window_present(castedPointer())
+    }
+
     public func setMinimumSize(to minimumSize: Size) {
         gtk_widget_set_size_request(
             castedPointer(),

Sources/Gtk3Backend/Gtk3Backend.swift

@@ -211,6 +211,10 @@ public final class Gtk3Backend: AppBackend {
         window.showAll()
     }
 
+    public func activate(window: Window) {
+        window.present()
+    }
+
     class ThreadActionContext {
         var action: () -> Void
 

Sources/GtkBackend/GtkBackend.swift

@@ -147,6 +147,10 @@ public final class GtkBackend: AppBackend {
         window.show()
     }
 
+    public func activate(window: Window) {
+        window.present()
+    }
+
     private func renderMenu(
         _ menu: ResolvedMenu,
         actionMap: any GActionMap,

Sources/SwiftCrossUI/Backend/AppBackend.swift

@@ -129,6 +129,10 @@ public protocol AppBackend {
     /// for some backends). Predominantly used by window-based ``Scene``
     /// implementations after propagating updates.
     func show(window: Window)
+    /// Brings a window to the front if possible. Called when the window
+    /// receives an external URL or file to handle from the desktop environment.
+    /// May be used in other circumstances eventually.
+    func activate(window: Window)
 
     /// Sets the application's global menu. Some backends may make use of the host
     /// platform's global menu bar (such as macOS's menu bar), and others may render their

Sources/SwiftCrossUI/Environment/EnvironmentValues.swift

@@ -41,6 +41,16 @@ public struct EnvironmentValues {
     /// a bottom-up update chain up which resize events can propagate.
     var onResize: (_ newSize: ViewSize) -> Void
 
+    /// Brings the current window forward, not guaranteed to always bring
+    /// the window to the top (due to focus stealing prevention).
+    func bringWindowForward() {
+        func activate<Backend: AppBackend>(with backend: Backend) {
+            backend.activate(window: window as! Backend.Window)
+        }
+        activate(with: backend)
+        print("Activated")
+    }
+
     /// The backend's representation of the window that the current view is
     /// in, if any. This is a very internal detail that should never get
     /// exposed to users.

Sources/SwiftCrossUI/LayoutSystem.swift

@@ -58,7 +58,7 @@ public enum LayoutSystem {
                 environment: environment,
                 dryRun: true
             )
-            isHidden[i] = result.participatesInStackLayouts
+            isHidden[i] = !result.participatesInStackLayouts
         }
 
         // My thanks go to this great article for investigating and explaining

Sources/SwiftCrossUI/Modifiers/OnOpenURLModifier.swift

@@ -2,11 +2,15 @@ import Foundation
 
 extension View {
     public func onOpenURL(perform action: @escaping (URL) -> Void) -> some View {
-        PreferenceModifier(self) { preferences in
+        PreferenceModifier(self) { preferences, environment in
             var newPreferences = preferences
             newPreferences.onOpenURL = { url in
                 action(url)
-                preferences.onOpenURL?(url)
+                if let innerHandler = preferences.onOpenURL {
+                    innerHandler(url)
+                } else {
+                    environment.bringWindowForward()
+                }
             }
             return newPreferences
         }

Sources/SwiftCrossUI/Modifiers/PreferenceModifier.swift

@@ -1,6 +1,9 @@
 extension View {
-    public func preference<V>(key: WritableKeyPath<PreferenceValues, V>, value: V) -> some View {
-        PreferenceModifier(self) { preferences in
+    public func preference<V>(
+        key: WritableKeyPath<PreferenceValues, V>,
+        value: V
+    ) -> some View {
+        PreferenceModifier(self) { preferences, _ in
             var preferences = preferences
             preferences[keyPath: key] = value
             return preferences
@@ -10,11 +13,11 @@ extension View {
 
 struct PreferenceModifier<Child: View>: View {
     var body: TupleView1<Child>
-    var modification: (PreferenceValues) -> PreferenceValues
+    var modification: (PreferenceValues, EnvironmentValues) -> PreferenceValues
 
     init(
         _ child: Child,
-        modification: @escaping (PreferenceValues) -> PreferenceValues
+        modification: @escaping (PreferenceValues, EnvironmentValues) -> PreferenceValues
     ) {
         self.body = TupleView1(child)
         self.modification = modification
@@ -36,7 +39,7 @@ struct PreferenceModifier<Child: View>: View {
             backend: backend,
             dryRun: dryRun
         )
-        result.preferences = modification(result.preferences)
+        result.preferences = modification(result.preferences, environment)
         return result
     }
 }