Fix AppKitBackend post-rebase and revert CounterApp

Author: stackotter

Examples/Sources/CounterExample/CounterApp.swift

@@ -13,18 +13,16 @@ struct CounterApp: App {
     var body: some Scene {
         WindowGroup("CounterExample: \(count)") {
             #hotReloadable {
-                VStack(alignment: .leading, spacing: 1) {
-                    ForEach(Font.TextStyle.allCases) { style in
-                        Text("This is \(style)")
-                            .font(.system(style))
+                HStack(spacing: 20) {
+                    Button("-") {
+                        count -= 1
+                    }
+                    Text("Count: \(count)")
+                    Button("+") {
+                        count += 1
                     }
                 }
-                // VStack(alignment: .leading, spacing: 1) {
-                //     ForEach(Font.Weight.allCases) { weight in
-                //         Text("This is \(weight) text")
-                //             .fontWeight(weight)
-                //     }
-                // }
+                .padding()
             }
         }
         .defaultSize(width: 400, height: 200)

Sources/AppKitBackend/AppKitBackend.swift

@@ -749,8 +749,9 @@ public final class AppKitBackend: AppBackend {
         textField.isEnabled = environment.isEnabled
         textField.placeholderString = placeholder
         textField.appearance = environment.colorScheme.nsAppearance
-        if textField.font != Self.font(for: environment) {
-            textField.font = Self.font(for: environment)
+        let resolvedFont = environment.resolvedFont
+        if textField.font != Self.font(for: resolvedFont) {
+            textField.font = Self.font(for: resolvedFont)
         }
         textField.onEdit = { textField in
             onChange(textField.stringValue)
@@ -803,8 +804,9 @@ public final class AppKitBackend: AppBackend {
         textEditor.onEdit = { textView in
             onChange(self.getContent(ofTextEditor: textView))
         }
-        if textEditor.font != Self.font(for: environment) {
-            textEditor.font = Self.font(for: environment)
+        let resolvedFont = environment.resolvedFont
+        if textEditor.font != Self.font(for: resolvedFont) {
+            textEditor.font = Self.font(for: resolvedFont)
         }
         textEditor.appearance = environment.colorScheme.nsAppearance
         textEditor.isEditable = environment.isEnabled