averello/koreader-mirror
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-12-13 20:36:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't rotate BookStatus & ReadingProgress in screensavers. (#6286)

Browse Source 
They're full-screen, and they work fine in Landscape.

re: #5724

* Fix multiline indents in the Kindle c/p ;p
This commit is contained in:
NiLuJe
2020-06-21 16:27:43 +02:00
committed by GitHub
parent 699ee3efc1
commit ff1e50c5c0
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -235,9 +235,12 @@ function Device:onPowerEvent(ev)
logger.dbg("Suspending...")
-- Mostly always suspend in Portrait/Inverted Portrait mode...
-- ... 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)
-- is disabled, as it plays badly with Landscape mode (c.f., #4098 and #5290).
-- We also exclude full-screen widgets that work fine in Landscape mode,
-- like ReadingProgress and BookStatus (c.f., #5724)
local screensaver_type = G_reader_settings:readSetting("screensaver_type")
if screensaver_type ~= "message" and screensaver_type ~= "disable" then
if screensaver_type ~= "message" and screensaver_type ~= "disable" and
screensaver_type ~= "readingprogress" and screensaver_type ~= "bookstatus" 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

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

@@ -169,9 +169,12 @@ function Kindle:intoScreenSaver()
-- NOTE: Pilefered from Device:onPowerEvent @ frontend/device/generic/device.lua
-- Mostly always suspend in Portrait/Inverted Portrait mode...
-- ... 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)
-- is disabled, as it plays badly with Landscape mode (c.f., #4098 and #5290).
-- We also exclude full-screen widgets that work fine in Landscape mode,
-- like ReadingProgress and BookStatus (c.f., #5724)
local screensaver_type = G_reader_settings:readSetting("screensaver_type")
if screensaver_type ~= "message" and screensaver_type ~= "disable" then
if screensaver_type ~= "message" and screensaver_type ~= "disable" and
screensaver_type ~= "readingprogress" and screensaver_type ~= "bookstatus" 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
@@ -184,8 +187,8 @@ function Kindle:intoScreenSaver()
-- 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
screensaver_type == "cover" or screensaver_type == "random_image" or
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