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

Screensaver: Unbreak screensaver_stretch_images (#7403)

Browse Source 
* Screensaver: Unbreak screensaver_stretch_images

We don't have real ternary operators in Lua, if the second argument evaluates to false, it doesn't work.
Invert the test to avoid this pitfall.
(c.f., http://lua-users.org/wiki/TernaryOperator).

Fix #7402, regression since #7371

* Free a few similar constructs (incidentally, some of 'em also tweaked in #7371 ^^).
This commit is contained in:
NiLuJe
2021-03-10 02:14:26 +01:00
committed by GitHub
parent 0674e6060a
commit 601d2fc3d2
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,7 +111,7 @@ function ReaderTypeset:onReadSettings(config)
self.smooth_scaling = config:isTrue("smooth_scaling")
else
local global = G_reader_settings:readSetting("copt_smooth_scaling")
self.smooth_scaling = (global == nil or global == 0) and false or true
self.smooth_scaling = global == 1 and true or false
end
self:toggleImageScaling(self.smooth_scaling)

4
frontend/ui/screensaver.lua
View File

@@ -518,7 +518,7 @@ function Screensaver:show()
image_disposable = true,
height = Screen:getHeight(),
width = Screen:getWidth(),
scale_factor = G_reader_settings:isTrue("screensaver_stretch_images") and nil or 0,
scale_factor = G_reader_settings:nilOrFalse("screensaver_stretch_images") and 0 or nil,
}
elseif self.screensaver_type == "bookstatus" then
local ReaderUI = require("apps/reader/readerui")
@@ -540,7 +540,7 @@ function Screensaver:show()
alpha = true,
height = Screen:getHeight(),
width = Screen:getWidth(),
scale_factor = G_reader_settings:isTrue("screensaver_stretch_images") and nil or 0,
scale_factor = G_reader_settings:nilOrFalse("screensaver_stretch_images") and 0 or nil,
}
elseif self.screensaver_type == "readingprogress" then
widget = Screensaver.getReaderProgress()

12
plugins/kosync.koplugin/main.lua
View File

@@ -694,13 +694,13 @@ function KOSync:saveSettings()
auto_sync = self.kosync_auto_sync,
pages_before_update = self.kosync_pages_before_update,
whisper_forward =
(self.kosync_whisper_forward == SYNC_STRATEGY.DEFAULT_FORWARD
and nil
or self.kosync_whisper_forward),
(self.kosync_whisper_forward ~= SYNC_STRATEGY.DEFAULT_FORWARD
and self.kosync_whisper_forward
or nil),
whisper_backward =
(self.kosync_whisper_backward == SYNC_STRATEGY.DEFAULT_BACKWARD
and nil
or self.kosync_whisper_backward),
(self.kosync_whisper_backward ~= SYNC_STRATEGY.DEFAULT_BACKWARD
and self.kosync_whisper_backward
or nil),
}
G_reader_settings:saveSetting("kosync", settings)
end