Rename onClick modifier to onTapGesture, fix Gtk3Backend compilation

Author: stackotter

Sources/AppKitBackend/AppKitBackend.swift

@@ -1079,36 +1079,41 @@ public final class AppKitBackend: AppBackend {
         }
     }
 
-    public func createClickTarget(wrapping child: Widget) -> Widget {
+    public func createTapGestureTarget(wrapping child: Widget) -> Widget {
         let container = NSView()
 
         container.addSubview(child)
-        child.leadingAnchor.constraint(equalTo: container.leadingAnchor).isActive = true
-        child.topAnchor.constraint(equalTo: container.topAnchor).isActive = true
+        child.leadingAnchor.constraint(equalTo: container.leadingAnchor)
+            .isActive = true
+        child.topAnchor.constraint(equalTo: container.topAnchor)
+            .isActive = true
         child.translatesAutoresizingMaskIntoConstraints = false
 
-        let clickTarget = NSCustomClickTarget()
-        container.addSubview(clickTarget)
-        clickTarget.leadingAnchor.constraint(equalTo: container.leadingAnchor).isActive = true
-        clickTarget.topAnchor.constraint(equalTo: container.topAnchor).isActive = true
-        clickTarget.trailingAnchor.constraint(equalTo: container.trailingAnchor).isActive = true
-        clickTarget.bottomAnchor.constraint(equalTo: container.bottomAnchor).isActive = true
-        clickTarget.translatesAutoresizingMaskIntoConstraints = false
+        let tapGestureTarget = NSCustomTapGestureTarget()
+        container.addSubview(tapGestureTarget)
+        tapGestureTarget.leadingAnchor.constraint(equalTo: container.leadingAnchor)
+            .isActive = true
+        tapGestureTarget.topAnchor.constraint(equalTo: container.topAnchor)
+            .isActive = true
+        tapGestureTarget.trailingAnchor.constraint(equalTo: container.trailingAnchor)
+            .isActive = true
+        tapGestureTarget.bottomAnchor.constraint(equalTo: container.bottomAnchor)
+            .isActive = true
+        tapGestureTarget.translatesAutoresizingMaskIntoConstraints = false
 
         return container
-
     }
 
-    public func updateClickTarget(
+    public func updateTapGestureTarget(
         _ container: Widget,
-        clickHandler handleClick: @escaping () -> Void
+        action: @escaping () -> Void
     ) {
-        let clickTarget = container.subviews[1] as! NSCustomClickTarget
-        clickTarget.leftClickHandler = handleClick
+        let tapGestureTarget = container.subviews[1] as! NSCustomTapGestureTarget
+        tapGestureTarget.leftClickHandler = action
     }
 }
 
-final class NSCustomClickTarget: NSView {
+final class NSCustomTapGestureTarget: NSView {
     var leftClickHandler: (() -> Void)?
 
     override func mouseDown(with event: NSEvent) {

Sources/Gtk3Backend/Gtk3Backend.swift

@@ -26,7 +26,9 @@ public final class Gtk3Backend: AppBackend {
     public let defaultTableRowContentHeight = 20
     public let defaultTableCellVerticalPadding = 4
     public let defaultPaddingAmount = 10
+    public let requiresToggleSwitchSpacer = false
     public let scrollBarWidth = 0
+    public let defaultToggleStyle = ToggleStyle.button
 
     var gtkApp: Application
 
@@ -116,6 +118,11 @@ public final class Gtk3Backend: AppBackend {
         return SIMD2(size.width, size.height)
     }
 
+    public func isWindowProgrammaticallyResizable(_ window: Window) -> Bool {
+        // TODO: Detect whether window is fullscreen
+        return true
+    }
+
     public func setSize(ofWindow window: Window, to newSize: SIMD2<Int>) {
         let child = window.child! as! CustomRootWidget
         child.preemptAllocatedSize(
@@ -217,7 +224,16 @@ public final class Gtk3Backend: AppBackend {
 
     public func openExternalURL(_ url: URL) throws {
         // Used instead of gtk_uri_launcher_launch to maintain <4.10 compatibility
-        gtk_show_uri(nil, url.absoluteString, guint(GDK_CURRENT_TIME))
+        var error: UnsafeMutablePointer<GError>? = nil
+        gtk_show_uri(nil, url.absoluteString, guint(GDK_CURRENT_TIME), &error)
+
+        if let error {
+            throw Gtk3Error(
+                code: Int(error.pointee.code),
+                domain: Int(error.pointee.domain),
+                message: String(cString: error.pointee.message)
+            )
+        }
     }
 
     class ThreadActionContext {
@@ -898,18 +914,18 @@ public final class Gtk3Backend: AppBackend {
         gtk_native_dialog_show(chooser.gobjectPointer.cast())
     }
 
-    public func createClickTarget(wrapping child: Widget) -> Widget {
+    public func createTapGestureTarget(wrapping child: Widget) -> Widget {
         let eventBox = Gtk3.EventBox()
         eventBox.setChild(to: child)
         eventBox.aboveChild = true
         return eventBox
     }
 
-    public func updateClickTarget(
-        _ clickTarget: Widget,
-        clickHandler handleClick: @escaping () -> Void
+    public func updateTapGestureTarget(
+        _ tapGestureTarget: Widget,
+        action: @escaping () -> Void
     ) {
-        clickTarget.onButtonPress = { _, buttonEvent in
+        tapGestureTarget.onButtonPress = { _, buttonEvent in
             let eventType = buttonEvent.type
             guard
                 eventType == GDK_BUTTON_PRESS
@@ -918,7 +934,7 @@ public final class Gtk3Backend: AppBackend {
             else {
                 return
             }
-            handleClick()
+            action()
         }
     }
 
@@ -987,3 +1003,13 @@ extension UnsafeMutablePointer {
         return UnsafeMutablePointer<T>(mutating: pointer)
     }
 }
+
+struct Gtk3Error: LocalizedError {
+    var code: Int
+    var domain: Int
+    var message: String
+
+    var errorDescription: String? {
+        "gerror: code=\(code), domain=\(domain), message=\(message)"
+    }
+}

Sources/GtkBackend/GtkBackend.swift

@@ -938,22 +938,22 @@ public final class GtkBackend: AppBackend {
         gtk_native_dialog_show(chooser.gobjectPointer.cast())
     }
 
-    public func createClickTarget(wrapping child: Widget) -> Widget {
+    public func createTapGestureTarget(wrapping child: Widget) -> Widget {
         let gesture = Gtk.GestureClick()
         child.addEventController(gesture)
         return child
     }
 
-    public func updateClickTarget(
-        _ clickTarget: Widget,
-        clickHandler handleClick: @escaping () -> Void
+    public func updateTapGestureTarget(
+        _ tapGestureTarget: Widget,
+        action: @escaping () -> Void
     ) {
-        let gesture = clickTarget.eventControllers[0] as! Gtk.GestureClick
+        let gesture = tapGestureTarget.eventControllers[0] as! Gtk.GestureClick
         gesture.pressed = { _, nPress, _, _ in
             guard nPress == 1 else {
                 return
             }
-            handleClick()
+            action()
         }
     }
 

Sources/SwiftCrossUI/Backend/AppBackend.swift

@@ -479,15 +479,15 @@ public protocol AppBackend {
         resultHandler handleResult: @escaping (DialogResult<URL>) -> Void
     )
 
-    /// Wraps a view in a container that can receive click events. Some
-    /// backends may not have to wrap the child, in which case they have the
-    /// freedom to just return the child as is.
-    func createClickTarget(wrapping child: Widget) -> Widget
-    /// Update the click target with a new click handler. Replaces the old
-    /// click handler.
-    func updateClickTarget(
-        _ clickTarget: Widget,
-        clickHandler handleClick: @escaping () -> Void
+    /// Wraps a view in a container that can receive tap gestures. Some
+    /// backends may not have to wrap the child, in which case they may
+    /// just return the child as is.
+    func createTapGestureTarget(wrapping child: Widget) -> Widget
+    /// Update the tap gesture target with a new action. Replaces the old
+    /// action.
+    func updateTapGestureTarget(
+        _ tapGestureTarget: Widget,
+        action: @escaping () -> Void
     )
 }
 
@@ -787,12 +787,12 @@ extension AppBackend {
         todo()
     }
 
-    public func createClickTarget(wrapping child: Widget) -> Widget {
+    public func createTapGestureTarget(wrapping child: Widget) -> Widget {
         todo()
     }
-    public func updateClickTarget(
+    public func updateTapGestureTarget(
         _ clickTarget: Widget,
-        clickHandler handleClick: @escaping () -> Void
+        action: @escaping () -> Void
     ) {
         todo()
     }

Sources/SwiftCrossUI/Modifiers/OnClickModifier.swift renamed to Sources/SwiftCrossUI/Modifiers/OnTapGestureModifier.swift

@@ -1,12 +1,20 @@
 extension View {
+    /// Adds an action to perform when the user taps or clicks this view.
+    ///
+    /// Any tappable elements within the view will no longer be tappable.
+    public func onTapGesture(perform action: @escaping () -> Void) -> some View {
+        OnTapGestureModifier(body: TupleView1(self), action: action)
+    }
+
     /// Adds an action to run when this view is clicked. Any clickable elements
     /// within the view will no longer be clickable.
+    @available(*, deprecated, message: "Renamed to onTapGesture")
     public func onClick(perform action: @escaping () -> Void) -> some View {
-        OnClickModifier(body: TupleView1(self), action: action)
+        onTapGesture(perform: action)
     }
 }
 
-struct OnClickModifier<Content: View>: TypeSafeView {
+struct OnTapGestureModifier<Content: View>: TypeSafeView {
     typealias Children = TupleView1<Content>.Children
 
     var body: TupleView1<Content>
@@ -28,7 +36,7 @@ struct OnClickModifier<Content: View>: TypeSafeView {
         _ children: Children,
         backend: Backend
     ) -> Backend.Widget {
-        backend.createClickTarget(wrapping: children.child0.widget.into())
+        backend.createTapGestureTarget(wrapping: children.child0.widget.into())
     }
 
     func update<Backend: AppBackend>(
@@ -47,7 +55,7 @@ struct OnClickModifier<Content: View>: TypeSafeView {
         )
         if !dryRun {
             backend.setSize(of: widget, to: childResult.size.size)
-            backend.updateClickTarget(widget, clickHandler: action)
+            backend.updateTapGestureTarget(widget, action: action)
         }
         return childResult
     }

Sources/UIKitBackend/UIKitBackend+Control.swift

@@ -103,9 +103,9 @@ final class TextFieldWidget: WrapperWidget<UITextField>, UITextFieldDelegate {
     }
 #endif
 
-final class ClickableWidget: ContainerWidget {
+final class TappableWidget: ContainerWidget {
     private var gestureRecognizer: UITapGestureRecognizer!
-    var onClick: (() -> Void)?
+    var onTap: (() -> Void)?
 
     override init(child: some WidgetProtocol) {
         super.init(child: child)
@@ -117,7 +117,7 @@ final class ClickableWidget: ContainerWidget {
 
     @objc
     func viewTouched() {
-        onClick?()
+        onTap?()
     }
 }
 
@@ -230,16 +230,16 @@ extension UIKitBackend {
         wrapper.setOn(state)
     }
 
-    public func createClickTarget(wrapping child: Widget) -> Widget {
-        ClickableWidget(child: child)
+    public func createTapGestureTarget(wrapping child: Widget) -> Widget {
+        TappableWidget(child: child)
     }
 
-    public func updateClickTarget(
-        _ clickTarget: Widget,
-        clickHandler handleClick: @escaping () -> Void
+    public func updateTapGestureTarget(
+        _ tapGestureTarget: Widget,
+        action: @escaping () -> Void
     ) {
-        let wrapper = clickTarget as! ClickableWidget
-        wrapper.onClick = handleClick
+        let wrapper = tapGestureTarget as! TappableWidget
+        wrapper.onTap = action
     }
 
     #if os(iOS)

Sources/UIKitBackend/UIViewRepresentable.swift

@@ -46,7 +46,6 @@ where Content == Never {
     ///
     /// The default implementation uses `uiView.intrinsicContentSize` and `uiView.systemLayoutSizeFitting(_:)`
     /// to determine the return value.
-    @MainActor
     func determineViewSize(
         for proposal: SIMD2<Int>, uiView: UIViewType,
         context: UIViewRepresentableContext<Coordinator>

Sources/WinUIBackend/WinUIBackend.swift

@@ -998,35 +998,35 @@ public final class WinUIBackend: AppBackend {
     // ) {
     // }
 
-    public func createClickTarget(wrapping child: Widget) -> Widget {
-        let clickTarget = ClickTarget()
-        addChild(child, to: clickTarget)
-        clickTarget.child = child
+    public func createTapGestureTarget(wrapping child: Widget) -> Widget {
+        let tapGestureTarget = TapGestureTarget()
+        addChild(child, to: tapGestureTarget)
+        tapGestureTarget.child = child
 
         // Set a background so that the click target's entire area gets hit
         // tested. The background we set is transparent so that it doesn't
         // change the visual appearance of the view.
         let brush = SolidColorBrush()
         brush.color = UWP.Color(a: 0, r: 0, g: 0, b: 0)
-        clickTarget.background = brush
+        tapGestureTarget.background = brush
 
-        clickTarget.pointerPressed.addHandler { [weak clickTarget] _, _ in
-            guard let clickTarget else {
+        tapGestureTarget.pointerPressed.addHandler { [weak tapGestureTarget] _, _ in
+            guard let tapGestureTarget else {
                 return
             }
-            clickTarget.clickHandler?()
+            tapGestureTarget.clickHandler?()
         }
-        return clickTarget
+        return tapGestureTarget
     }
 
-    public func updateClickTarget(
-        _ clickTarget: Widget,
-        clickHandler handleClick: @escaping () -> Void
+    public func updateTapGestureTarget(
+        _ tapGestureTarget: Widget,
+        action: @escaping () -> Void
     ) {
-        let clickTarget = clickTarget as! ClickTarget
-        clickTarget.clickHandler = handleClick
-        clickTarget.width = clickTarget.child!.width
-        clickTarget.height = clickTarget.child!.height
+        let tapGestureTarget = tapGestureTarget as! TapGestureTarget
+        tapGestureTarget.clickHandler = action
+        tapGestureTarget.width = tapGestureTarget.child!.width
+        tapGestureTarget.height = tapGestureTarget.child!.height
     }
 
     // public func createTable(rows: Int, columns: Int) -> Widget {
@@ -1159,7 +1159,7 @@ final class CustomSplitView: SplitView {
     var sidebarResizeHandler: (() -> Void)?
 }
 
-final class ClickTarget: WinUI.Canvas {
+final class TapGestureTarget: WinUI.Canvas {
     var clickHandler: (() -> Void)?
     var child: WinUI.FrameworkElement?
 }