about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2024-07-10 00:42:45 -0700
committerKartik K. Agaram <vc@akkartik.com>2024-07-10 00:42:45 -0700
commitdb2463b9d046419ce94005106e953ed55bc3b644 (patch)
tree848233058fd17b98ab49f17df747087a4d07db42
parent10d875fbcc6d62e594bbf4a83621cfe25e161918 (diff)
parent8f88af234a5fbb35a25c5a6ae922dbd5ffeb3dd7 (diff)
downloadtext.love-db2463b9d046419ce94005106e953ed55bc3b644.tar.gz
Merge lines.love
-rw-r--r--edit.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/edit.lua b/edit.lua
index 75ec574..729791e 100644
--- a/edit.lua
+++ b/edit.lua
@@ -376,9 +376,9 @@ end
 function edit.key_release(State, key, scancode)
 end
 
-function edit.update_font_settings(State, font_height)
+function edit.update_font_settings(State, font_height, font)
   State.font_height = font_height
-  State.font = love.graphics.newFont(State.font_height)
+  State.font = font or love.graphics.newFont(State.font_height)
   State.line_height = math.floor(font_height*1.3)
 end