Fix buttons and toggles

Author: bbrk24

Sources/AppKitBackend/AppKitBackend.swift

@@ -18,6 +18,8 @@ public final class AppKitBackend: AppBackend {
     public let defaultTableRowContentHeight = 20
     public let defaultTableCellVerticalPadding = 4
     public let defaultPaddingAmount = 10
+    public let requiresToggleSwitchSpacer = false
+    public let defaultToggleStyle = ToggleStyle.button
 
     public var scrollBarWidth: Int {
         // We assume that all scrollers have their controlSize set to `.regular` by default.

Sources/GtkBackend/GtkBackend.swift

@@ -27,6 +27,8 @@ public final class GtkBackend: AppBackend {
     public let defaultTableCellVerticalPadding = 4
     public let defaultPaddingAmount = 10
     public let scrollBarWidth = 0
+    public let requiresToggleSwitchSpacer = false
+    public let defaultToggleStyle = ToggleStyle.button
 
     var gtkApp: Application
 

Sources/SwiftCrossUI/Backend/AppBackend.swift

@@ -67,6 +67,10 @@ public protocol AppBackend {
     /// ensure that the configured root environment change handler gets called so
     /// that SwiftCrossUI can update the app's layout accordingly.
     var scrollBarWidth: Int { get }
+    /// If `true`, a toggle in the ``ToggleStyle/switch`` style grows to fill its parent container.
+    var requiresToggleSwitchSpacer: Bool { get }
+    /// The default style for toggles.
+    var defaultToggleStyle: ToggleStyle { get }
 
     /// Often in UI frameworks (such as Gtk), code is run in a callback
     /// after starting the app, and hence this generic root window creation

Sources/SwiftCrossUI/Views/Toggle.swift

@@ -1,4 +1,6 @@
 public struct Toggle: View {
+    @Environment(\.backend) var backend
+
     /// The style of toggle shown.
     var selectedToggleStyle: ToggleStyle
     /// The label to be shown on or beside the toggle.
@@ -8,7 +10,7 @@ public struct Toggle: View {
 
     /// Creates a toggle that displays a custom label.
     public init(_ label: String, active: Binding<Bool>) {
-        self.selectedToggleStyle = .button
+        self.selectedToggleStyle = backend.defaultToggleStyle
         self.label = label
         self.active = active
     }
@@ -18,6 +20,11 @@ public struct Toggle: View {
             case .switch:
                 HStack {
                     Text(label)
+
+                    if backend.requiresToggleSwitchSpacer {
+                        Spacer()
+                    }
+
                     ToggleSwitch(active: active)
                 }
             case .button:

Sources/UIKitBackend/UIKitBackend+Control.swift

@@ -17,7 +17,13 @@ internal final class ButtonWidget: WrapperWidget<UIButton> {
     }
 
     init() {
-        super.init(child: UIButton())
+        let type: UIButton.ButtonType
+        #if os(tvOS)
+            type = .system
+        #else
+            type = .custom
+        #endif
+        super.init(child: UIButton(type: type))
         child.addTarget(self, action: #selector(buttonTapped), for: .touchUpInside)
     }
 }
@@ -216,7 +222,8 @@ extension UIKitBackend {
     ) {
         let buttonWidget = button as! ButtonWidget
         buttonWidget.child.setAttributedTitle(
-            UIKitBackend.attributedString(text: label, environment: environment),
+            UIKitBackend.attributedString(
+                text: label, environment: environment, defaultForegroundColor: .link),
             for: .normal
         )
         buttonWidget.onTap = action

Sources/UIKitBackend/UIKitBackend+Passive.swift

@@ -11,7 +11,8 @@ import UIKit
 extension UIKitBackend {
     internal static func attributedString(
         text: String,
-        environment: EnvironmentValues
+        environment: EnvironmentValues,
+        defaultForegroundColor: UIColor = .label
     ) -> NSAttributedString {
         let paragraphStyle = NSMutableParagraphStyle()
         paragraphStyle.alignment =
@@ -29,7 +30,7 @@ extension UIKitBackend {
             string: text,
             attributes: [
                 .font: environment.font.uiFont,
-                .foregroundColor: UIColor(color: environment.suggestedForegroundColor),
+                .foregroundColor: environment.foregroundColor?.uiColor ?? defaultForegroundColor,
                 .paragraphStyle: paragraphStyle,
             ]
         )

Sources/UIKitBackend/UIKitBackend.swift

@@ -20,6 +20,8 @@ internal var hasReturnedAWindow = false
 public final class UIKitBackend: AppBackend {
     public let scrollBarWidth = 0
     public let defaultPaddingAmount = 15
+    public let requiresToggleSwitchSpacer = true
+    public let defaultToggleStyle = ToggleStyle.switch
 
     // TODO: When tables are supported, update these
     public let defaultTableRowContentHeight = -1
@@ -63,8 +65,6 @@ public final class UIKitBackend: AppBackend {
                 break
         }
 
-        environment.foregroundColor = Color(UIColor.label)
-
         return environment
     }
 

Sources/WinUIBackend/WinUIBackend.swift

@@ -35,6 +35,8 @@ public struct WinUIBackend: AppBackend {
     public let defaultTableRowContentHeight = 20
     public let defaultTableCellVerticalPadding = 4
     public let defaultPaddingAmount = 10
+    public let requiresToggleSwitchSpacer = false
+    public let defaultToggleStyle = ToggleStyle.button
 
     public var scrollBarWidth: Int {
         12