Fixed sheet rendering with GtkBackend on Linux

Author: MiaKoring

Sources/AppKitBackend/AppKitBackend.swift

@@ -1711,19 +1711,21 @@ public final class AppKitBackend: AppBackend {
 
     public func updateSheet(
         _ sheet: NSCustomSheet,
+        size: SIMD2<Int>,
         onDismiss: @escaping () -> Void
     ) {
+        sheet.contentView?.frame.size = .init(width: size.x, height: size.y)
         sheet.onDismiss = onDismiss
     }
 
-    public func sizeOf(_ sheet: NSCustomSheet) -> SIMD2<Int> {
+    public func size(ofSheet sheet: NSCustomSheet) -> SIMD2<Int> {
         guard let size = sheet.contentView?.frame.size else {
             return SIMD2(x: 0, y: 0)
         }
         return SIMD2(x: Int(size.width), y: Int(size.height))
     }
 
-    public func showSheet(_ sheet: NSCustomSheet, window: NSCustomWindow?) {
+    public func showSheet(_ sheet: NSCustomSheet, window: NSCustomWindow) {
         guard let window else {
             print("warning: Cannot show sheet without a parent window")
             return

Sources/GtkBackend/GtkBackend.swift

@@ -1592,9 +1592,15 @@ public final class GtkBackend: AppBackend {
         return sheet
     }
 
-    public func updateSheet(_ sheet: Gtk.Window, onDismiss: @escaping () -> Void) {
+    public func updateSheet(
+        _ sheet: Gtk.Window,
+        size: SIMD2<Int>,
+        onDismiss: @escaping () -> Void
+    ) {
         let key: OpaquePointer = OpaquePointer(sheet.widgetPointer)
 
+        sheet.size = Size(width: size.x, height: size.y)
+        
         // Add a slight border to not be just a flat corner
         sheet.css.set(property: .border(color: SwiftCrossUI.Color.gray.gtkColor, width: 1))
 
@@ -1629,10 +1635,10 @@ public final class GtkBackend: AppBackend {
         }
     }
 
-    public func showSheet(_ sheet: Gtk.Window, window: ApplicationWindow?) {
+    public func showSheet(_ sheet: Gtk.Window, window: ApplicationWindow) {
         sheet.isModal = true
         sheet.isDecorated = false
-        sheet.setTransient(for: window ?? windows[0])
+        sheet.setTransient(for: window)
         sheet.present()
     }
 
@@ -1646,7 +1652,7 @@ public final class GtkBackend: AppBackend {
         connectedCloseHandlers.remove(key)
     }
 
-    public func sizeOf(_ sheet: Gtk.Window) -> SIMD2<Int> {
+    public func size(ofSheet sheet: Gtk.Window) -> SIMD2<Int> {
         return SIMD2(x: sheet.size.width, y: sheet.size.height)
     }
 

Sources/SwiftCrossUI/Backend/AppBackend.swift

@@ -612,6 +612,7 @@ public protocol AppBackend: Sendable {
     /// Updates the content and appearance of a sheet.
     func updateSheet(
         _ sheet: Sheet,
+        size: SIMD2<Int>,
         onDismiss: @escaping () -> Void
     )
 
@@ -626,15 +627,15 @@ public protocol AppBackend: Sendable {
     /// app modal, a standalone window, or a modal for a window of its choosing.
     func showSheet(
         _ sheet: Sheet,
-        window: Window?
+        window: Window
     )
 
     /// Dismisses a sheet programmatically.
     /// Gets used by the ``View/sheet`` modifier to close a sheet.
     func dismissSheet(_ sheet: Sheet, window: Window)
 
     /// Get the dimensions of a sheet
-    func sizeOf(_ sheet: Sheet) -> SIMD2<Int>
+    func size(ofSheet sheet: Sheet) -> SIMD2<Int>
 
     /// Sets the corner radius for a sheet presentation.
     ///
@@ -1266,20 +1267,21 @@ extension AppBackend {
 
     public func updateSheet(
         _ sheet: Sheet,
+        size: SIMD2<Int>,
         onDismiss: @escaping () -> Void
     ) {
         todo()
     }
 
-    public func sizeOf(
-        sheet: Sheet
+    public func size(
+        ofSheet sheet: Sheet
     ) -> SIMD2<Int> {
         todo()
     }
 
     public func showSheet(
         _ sheet: Sheet,
-        window: Window?
+        window: Window
     ) {
         todo()
     }

Sources/SwiftCrossUI/Views/Modifiers/SheetModifier.swift

@@ -81,16 +81,17 @@ struct SheetModifier<Content: View, SheetContent: View>: TypeSafeView {
                 isPresented.wrappedValue = false
             })
             let sheetEnvironment = environment.with(\.dismiss, dismissAction)
-
+            
             let result = children.sheetContentNode!.update(
                 with: sheetContent(),
-                proposedSize: backend.sizeOf(sheet),
+                proposedSize: SIMD2(x: 10_000, y: 0),
                 environment: sheetEnvironment,
                 dryRun: false
             )
 
             backend.updateSheet(
                 sheet,
+                size: result.size.size,
                 onDismiss: { handleDismiss(children: children) }
             )
 
@@ -122,7 +123,7 @@ struct SheetModifier<Content: View, SheetContent: View>: TypeSafeView {
 
             backend.showSheet(
                 sheet,
-                window: .some(environment.window! as! Backend.Window)
+                window: environment.window! as! Backend.Window
             )
             children.sheet = sheet
         } else if !isPresented.wrappedValue && children.sheet != nil {