trunk: resume before the Reload experiment

Empty marker on the last pre-Reload change. Keep the Reload experiment on reload (3801914), its first change on reload-start (200a1fc), and the unfinished performance investigation on reload-perf-wip.

2 files changed, 6 insertions, 4 deletions

diff --git a/src/macos/Sources/AppDelegate.swift b/src/macos/Sources/AppDelegate.swift
index 2d411873..eb499f1b 100644
--- a/src/macos/Sources/AppDelegate.swift
+++ b/src/macos/Sources/AppDelegate.swift
@@ -585,8 +585,9 @@ final class AppDelegate: NSObject, NSApplicationDelegate, PardesViewDelegate {
         // is already waiting by the time the tick returns. The view re-measures
         // and calls back through pardesViewDidResize, so the grid the core is
         // holding follows the cell that just changed size.
-        if let wanted = pardes_font_take() {
-            view.adoptFont(path: String(cString: wanted))
+        var fontSize: UInt16 = 0
+        if let wanted = pardes_font_take(&fontSize) {
+            view.adoptFont(path: String(cString: wanted), sizeHundredths: fontSize)
         }
 
         if pardes_should_quit() {
diff --git a/src/macos/Sources/PardesView.swift b/src/macos/Sources/PardesView.swift
index f9afa7b1..5c5bc8ba 100644
--- a/src/macos/Sources/PardesView.swift
+++ b/src/macos/Sources/PardesView.swift
@@ -761,8 +761,9 @@ final class PardesView: NSView {
     }
 
     /// The file `Font <name>` resolved to, straight from the core.
-    func adoptFont(path: String) {
-        wear(size: fontSize, path: path, resolvesRequest: true)
+    func adoptFont(path: String, sizeHundredths: UInt16) {
+        let size = sizeHundredths == 0 ? fontSize : CGFloat(sizeHundredths) / 100
+        wear(size: size, path: path, resolvesRequest: true)
     }
 
     /// Cmd+ and Cmd-. Whole points, because the cell is rounded to whole