rename runtimectl to document/canvascontext

This commit is contained in:
Qingping Hou
2019-02-18 08:01:00 -08:00
committed by Frans de Jonge
parent adb5d5a52c
commit 1605409c60
28 changed files with 146 additions and 150 deletions

View File

@@ -4,7 +4,7 @@ local Document = require("document/document")
local Font = require("ui/font")
local Geom = require("ui/geometry")
local RenderImage = require("ui/renderimage")
local Runtimectl = require("runtimectl")
local CanvasContext = require("document/canvascontext")
local ffi = require("ffi")
local C = ffi.C
local lfs = require("libs/libkoreader-lfs")
@@ -116,7 +116,7 @@ function CreDocument:init()
self._view_mode = DCREREADER_VIEW_MODE == "scroll" and self.SCROLL_VIEW_MODE or self.PAGE_VIEW_MODE
local ok
ok, self._document = pcall(cre.newDocView, Runtimectl:getRenderWidth(), Runtimectl:getRenderHeight(), self._view_mode)
ok, self._document = pcall(cre.newDocView, CanvasContext:getWidth(), CanvasContext:getHeight(), self._view_mode)
if not ok then
error(self._document) -- will contain error message
end
@@ -163,8 +163,8 @@ function CreDocument:setupDefaultView()
self._document:setStringProperty("crengine.font.fallback.face",
G_reader_settings:readSetting("fallback_font") or self.fallback_font)
-- adjust font sizes according to dpi set in runtime
self._document:adjustFontSizes(Runtimectl:getRenderDPI())
-- adjust font sizes according to dpi set in canvas context
self._document:adjustFontSizes(CanvasContext:getDPI())
-- set top status bar font size
if G_reader_settings:readSetting("cre_header_status_font_size") then
@@ -191,7 +191,7 @@ function CreDocument:render()
-- load document before rendering
self:loadDocument()
-- set visible page count in landscape
if math.max(Runtimectl:getRenderWidth(), Runtimectl:getRenderHeight()) / Runtimectl:getRenderDPI()
if math.max(CanvasContext:getWidth(), CanvasContext:getHeight()) / CanvasContext:getDPI()
< DCREREADER_TWO_PAGE_THRESHOLD then
self:setVisiblePageCount(1)
end