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

Correct Frontlight status on suspend when screensaver mode is 'Leave … (#5928)

Browse Source 
Also use a var in place of a long function name
This commit is contained in:
clarkspark
2020-03-08 03:46:46 -04:00
committed by GitHub
parent da8151f84a
commit 1d58eb8b6c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/device/generic/device.lua
View File

@@ -230,8 +230,10 @@ function Device:onPowerEvent(ev)
local UIManager = require("ui/uimanager")
logger.dbg("Suspending...")
-- Mostly always suspend in Portrait/Inverted Portrait mode...
-- ... except when we just show an InfoMessage, it plays badly with Landscape mode (c.f., #4098)
if G_reader_settings:readSetting("screensaver_type") ~= "message" then
-- ... except when we just show an InfoMessage or when the screensaver
-- is disabled, as it plays badly with Landscape mode (c.f., #4098 and #5290)
local screensaver_type = G_reader_settings:readSetting("screensaver_type")
if screensaver_type ~= "message" and screensaver_type ~= "disable" then
self.orig_rotation_mode = self.screen:getRotationMode()
-- Leave Portrait & Inverted Portrait alone, that works just fine.
if bit.band(self.orig_rotation_mode, 1) == 1 then
@@ -244,9 +246,8 @@ function Device:onPowerEvent(ev)
-- On eInk, if we're using a screensaver mode that shows an image,
-- flash the screen to white first, to eliminate ghosting.
if self:hasEinkScreen() and
G_reader_settings:readSetting("screensaver_type") == "cover" or
G_reader_settings:readSetting("screensaver_type") == "random_image" or
G_reader_settings:readSetting("screensaver_type") == "image_file" then
screensaver_type == "cover" or screensaver_type == "random_image" or
screensaver_type == "image_file" then
if not G_reader_settings:isTrue("screensaver_no_background") then
self.screen:clear()
end