about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2024-07-10 00:43:51 -0700
committerKartik K. Agaram <vc@akkartik.com>2024-07-10 00:43:51 -0700
commit6f7a46edc80af5ab6794cedb312b8a7d404562fa (patch)
tree261b0ae5c8335050c397ee137fbb7ac0a80cadfa
parent58cd8015a3e268956a667b60888a834e95532079 (diff)
parentdb2463b9d046419ce94005106e953ed55bc3b644 (diff)
downloadview.love-6f7a46edc80af5ab6794cedb312b8a7d404562fa.tar.gz
Merge text.love
-rw-r--r--edit.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/edit.lua b/edit.lua
index 0e7d948..61f255e 100644
--- a/edit.lua
+++ b/edit.lua
@@ -304,9 +304,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