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

Merge pull request #1368 from hwhw/master

Browse Source 
read global default value for using embedded stylesheets
This commit is contained in:
Frans de Jonge
2014-12-19 16:23:50 +01:00
parent 13183ab45e f789913702
commit 8e9f2b27f7
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
frontend/apps/reader/modules/readertypeset.lua
View File

@@ -27,13 +27,22 @@ function ReaderTypeset:onReadSettings(config)
self.css = self.ui.document.default_css
end
-- default to enable embedded css
self.embedded_css = config:readSetting("embedded_css")
if self.embedded_css == nil then self.embedded_css = true end
if self.embedded_css == nil then
-- default to enable embedded css
-- note that it's a bit confusing here:
-- global settins store 0/1, while document settings store false/true
-- we leave it that way for now to maintain backwards compatibility
local global = G_reader_settings:readSetting("copt_embedded_css")
self.embedded_css = (global == nil or global == 1) and true or false
end
self.ui.document:setEmbeddedStyleSheet(self.embedded_css and 1 or 0)
-- set page margins
self:onSetPageMargins(config:readSetting("copt_page_margins") or DCREREADER_CONFIG_MARGIN_SIZES_MEDIUM)
self:onSetPageMargins(
config:readSetting("copt_page_margins") or
G_reader_settings:readSetting("copt_page_margins") or
DCREREADER_CONFIG_MARGIN_SIZES_MEDIUM)
-- default to enable floating punctuation
-- the floating punctuation should not be boolean value for the following