renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Misc: Get rid of the legacy defaults.lua globals (#9546)

Browse Source 
* This removes support for the following deprecated constants: `DTAP_ZONE_FLIPPING`, `DTAP_ZONE_BOOKMARK`, `DCREREADER_CONFIG_DEFAULT_FONT_GAMMA`
* The "Advanced settings" panel now highlights modified values in bold (think about:config in Firefox ;)).
* LuaData: Isolate global table lookup shenanigans, and fix a few issues in unused-in-prod codepaths.
* CodeStyle: Require module locals for Lua/C modules, too.
* ScreenSaver: Actually garbage collect our widget on close (ScreenSaver itself is not an instantiated object).
* DateTimeWidget: Code cleanups to ensure child widgets can be GC'ed.
This commit is contained in:
NiLuJe
2022-09-28 01:10:50 +02:00
committed by GitHub
parent 46f729c248
commit 62059f8d68
74 changed files with 1030 additions and 1050 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
frontend/document/credocument.lua
View File

@@ -9,6 +9,7 @@ local Screen = require("device").screen
local buffer = require("string.buffer")
local ffi = require("ffi")
local C = ffi.C
local cre -- Delayed loading
local lfs = require("libs/libkoreader-lfs")
local logger = require("logger")
local lru = require("ffi/lru")
@@ -107,7 +108,7 @@ end
function CreDocument:engineInit()
if not engine_initialized then
require "libs/libkoreader-cre"
cre = require("libs/libkoreader-cre")
-- initialize cache
self:cacheInit()
@@ -116,9 +117,9 @@ function CreDocument:engineInit()
-- we need to initialize the CRE font list
local fonts = FontList:getFontList()
for _k, _v in ipairs(fonts) do
if not _v:find("/urw/") and not _v:find("/nerdfonts/symbols.ttf") then
local ok, err = pcall(cre.registerFont, _v)
for k, v in ipairs(fonts) do
if not v:find("/urw/") and not v:find("/nerdfonts/symbols.ttf") then
local ok, err = pcall(cre.registerFont, v)
if not ok then
logger.err("failed to register crengine font:", err)
end
@@ -138,6 +139,8 @@ function CreDocument:engineInit()
engine_initialized = true
end
return cre
end
function CreDocument:init()
@@ -164,7 +167,7 @@ function CreDocument:init()
end
-- This mode must be the same as the default one set as ReaderView.view_mode
self._view_mode = DCREREADER_VIEW_MODE == "scroll" and self.SCROLL_VIEW_MODE or self.PAGE_VIEW_MODE
self._view_mode = G_defaults:readSetting("DCREREADER_VIEW_MODE") == "scroll" and self.SCROLL_VIEW_MODE or self.PAGE_VIEW_MODE
local ok
ok, self._document = pcall(cre.newDocView, CanvasContext:getWidth(), CanvasContext:getHeight(), self._view_mode)
@@ -290,7 +293,7 @@ function CreDocument:render()
-- This is now configurable and done by ReaderRolling:
-- -- set visible page count in landscape
-- if math.max(CanvasContext:getWidth(), CanvasContext:getHeight()) / CanvasContext:getDPI()
-- < DCREREADER_TWO_PAGE_THRESHOLD then
-- < G_defaults:readSetting("DCREREADER_TWO_PAGE_THRESHOLD") then
-- self:setVisiblePageCount(1)
-- end
logger.dbg("CreDocument: rendering document...")