From 418aa1e5d64218b4d52d904435bc03ad0a398efa Mon Sep 17 00:00:00 2001 From: Frans de Jonge Date: Sat, 24 Aug 2019 11:11:30 +0200 Subject: [PATCH] Cache fontlist --- frontend/fontlist.lua | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/frontend/fontlist.lua b/frontend/fontlist.lua index bb4b0c20c..d1c6f0e08 100644 --- a/frontend/fontlist.lua +++ b/frontend/fontlist.lua @@ -2,6 +2,7 @@ local CanvasContext = require("document/canvascontext") local FontList = { fontdir = "./fonts", + fontlist = {}, } --[[ @@ -94,14 +95,14 @@ local function _readList(target, dir) end function FontList:getFontList() - local fontlist = {} - _readList(fontlist, self.fontdir) + if #self.fontlist > 0 then return self.fontlist end + _readList(self.fontlist, self.fontdir) -- multiple paths should be joined with semicolon for dir in string.gmatch(getExternalFontDir() or "", "([^;]+)") do - _readList(fontlist, dir) + _readList(self.fontlist, dir) end - table.sort(fontlist) - return fontlist + table.sort(self.fontlist) + return self.fontlist end return FontList