Feature - Terminal: Allow setting separate font from editor (onivim#1390

) * Wire up configuration for terminal font family/size/smoothing * Fix up integration tests * Wire up terminal font size * Merge master * Switch to named params * Pick up harfbuzz with memory leak fix * Service_Font.t -> Service_Font.font * Formatting * Pick up additional memory leak fix * Bring in latest reason-harfbuzz
BosEriko · Mar 1, 2020 · 98c9730 · 98c9730
1 parent b9253a1
commit 98c9730
Show file tree

Hide file tree

Showing 40 changed files with 328 additions and 214 deletions.
diff --git a/bench.esy.lock/index.json b/bench.esy.lock/index.json
diff --git a/bench.esy.lock/opam/printbox.0.4/opam → bench.esy.lock/opam/printbox.0.5/opam b/bench.esy.lock/opam/printbox.0.4/opam → bench.esy.lock/opam/printbox.0.5/opam
diff --git a/integrationtest.esy.lock/opam/zed.2.0.5/opam → bench.esy.lock/opam/zed.2.0.6/opam b/integrationtest.esy.lock/opam/zed.2.0.5/opam → bench.esy.lock/opam/zed.2.0.6/opam
diff --git a/bench/lib/Helpers.re b/bench/lib/Helpers.re
@@ -28,7 +28,7 @@ let simpleState = {
 let simpleState =
   Reducer.reduce(
     simpleState,
-    Actions.Font(
+    Actions.EditorFont(
       Service_Font.FontLoaded({
         fontFile:
           Revery.Environment.executingDirectory ++ "FiraCode-Regular.ttf",

diff --git a/bench/lib/ReducerBench.re b/bench/lib/ReducerBench.re
@@ -31,7 +31,7 @@ let changeEditorFont = () => {
   let _ =
     Reducer.reduce(
       state,
-      Actions.Font(Service_Font.FontLoaded(Service_Font.default)),
+      Actions.EditorFont(Service_Font.FontLoaded(Service_Font.default)),
     );
   ();
 };

diff --git a/esy.lock/index.json b/esy.lock/index.json
diff --git a/...ationtest.esy.lock/opam/printbox.0.4/opam → esy.lock/opam/printbox.0.5/opam b/...ationtest.esy.lock/opam/printbox.0.4/opam → esy.lock/opam/printbox.0.5/opam
diff --git a/bench.esy.lock/opam/zed.2.0.5/opam → esy.lock/opam/zed.2.0.6/opam b/bench.esy.lock/opam/zed.2.0.5/opam → esy.lock/opam/zed.2.0.6/opam