Implement temporary _buttonWidth modifier for Buttons and Menus

Author: stackotter

Sources/AppKitBackend/AppKitBackend.swift

@@ -420,7 +420,10 @@ public final class AppKitBackend: AppBackend {
         environment: EnvironmentValues
     ) {
         let button = button as! NSButton
-        button.attributedTitle = Self.attributedString(for: label, in: environment)
+        button.attributedTitle = Self.attributedString(
+            for: label,
+            in: environment.with(\.multilineTextAlignment, .center)
+        )
         button.bezelStyle = .regularSquare
         button.appearance = environment.colorScheme.nsAppearance
         button.onAction = { _ in

Sources/SwiftCrossUI/Backend/AppBackend.swift

@@ -288,7 +288,7 @@ public protocol AppBackend {
     /// Creates a labelled button with an action triggered on click. Predominantly used
     /// by ``Button``.
     func createButton() -> Widget
-    /// Sets a button's label and action. The action replaces any existing actions..
+    /// Sets a button's label and action. The action replaces any existing actions.
     func updateButton(
         _ button: Widget,
         label: String,

Sources/SwiftCrossUI/Views/Button.swift

@@ -4,6 +4,8 @@ public struct Button: ElementaryView, View {
     var label: String
     /// The action to be performed when the button is clicked.
     var action: () -> Void
+    /// The button's forced width if provided.
+    var width: Int?
 
     /// Creates a button that displays a custom label.
     public init(_ label: String, action: @escaping () -> Void = {}) {
@@ -32,7 +34,25 @@ public struct Button: ElementaryView, View {
         //   refresh), but the reason Gtk 3 doesn't like it is that the window gets set smaller
         //   than its content I think.
         //   See: https://github.com/stackotter/swift-cross-ui/blob/27f50579c52e79323c3c368512d37e95af576c25/Sources/SwiftCrossUI/Scenes/WindowGroupNode.swift#L140
-        backend.updateButton(widget, label: label, action: action, environment: environment)
-        return ViewSize(fixedSize: backend.naturalSize(of: widget))
+        backend.updateButton(
+            widget,
+            label: label,
+            action: action,
+            environment: environment
+        )
+        let naturalSize = backend.naturalSize(of: widget)
+        let size = SIMD2(
+            width ?? naturalSize.x,
+            naturalSize.y
+        )
+        backend.setSize(of: widget, to: size)
+        return ViewSize(fixedSize: size)
+    }
+
+    /// A temporary button width solution until arbitrary labels are supported.
+    public func _buttonWidth(_ width: Int?) -> Button {
+        var button = self
+        button.width = width
+        return button
     }
 }

Sources/SwiftCrossUI/Views/Menu.swift

@@ -2,6 +2,8 @@ public struct Menu: TypeSafeView {
     public var label: String
     public var items: [MenuItem]
 
+    var buttonWidth: Int?
+
     public var body = EmptyView()
 
     public init(_ label: String, @MenuItemsBuilder items: () -> [MenuItem]) {
@@ -65,10 +67,10 @@ public struct Menu: TypeSafeView {
     ) -> ViewSize {
         // TODO: Store popped menu in view graph node children so that we can
         //   continue updating it even once it's open.
-        let size = backend.naturalSize(of: widget)
+        var size = backend.naturalSize(of: widget)
+        size.x = buttonWidth ?? size.x
 
         let content = resolve().content
-
         backend.updateButton(
             widget,
             label: label,
@@ -86,9 +88,18 @@ public struct Menu: TypeSafeView {
             },
             environment: environment
         )
+        backend.setSize(of: widget, to: size)
+
         children.updateMenuIfShown(content: content, environment: environment, backend: backend)
         return ViewSize(fixedSize: size)
     }
+
+    /// A temporary button width solution until arbitrary labels are supported.
+    public func _buttonWidth(_ width: Int?) -> Menu {
+        var menu = self
+        menu.buttonWidth = width
+        return menu
+    }
 }
 
 class MenuStorage: ViewGraphNodeChildren {